X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fopnfv_tests%2Fopenstack%2Fsnaps%2Fapi_check.py;h=d4204bff1f034bde27275686a27f5ca8b8b6a07f;hb=refs%2Fchanges%2F61%2F58961%2F4;hp=dea1ca75936dabf92f1141435ed2e9ec43936552;hpb=881edc3942e42ccd9088ed9718600c90b0a04e20;p=functest.git

diff --git a/functest/opnfv_tests/openstack/snaps/api_check.py b/functest/opnfv_tests/openstack/snaps/api_check.py
index dea1ca759..d4204bff1 100644
--- a/functest/opnfv_tests/openstack/snaps/api_check.py
+++ b/functest/opnfv_tests/openstack/snaps/api_check.py
@@ -1,17 +1,20 @@
-# Copyright (c) 2015 All rights reserved
+#!/usr/bin/env python
+
+# Copyright (c) 2017 Cable Television Laboratories, Inc. and others.
+#
 # This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 
-import unittest
+"""api_check test case implementation"""
 
-from snaps import test_suite_builder
+import unittest
 
+from functest.opnfv_tests.openstack.snaps import snaps_suite_builder
 from functest.opnfv_tests.openstack.snaps.snaps_test_runner import \
     SnapsTestRunner
-from functest.utils.constants import CONST
 
 
 class ApiCheck(SnapsTestRunner):
@@ -20,13 +23,28 @@ class ApiCheck(SnapsTestRunner):
     that exercise many of the OpenStack APIs within Keystone, Glance, Neutron,
     and Nova
     """
-    def __init__(self, case_name="api_check"):
-        super(ApiCheck, self).__init__(case_name)
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = "api_check"
+        super(ApiCheck, self).__init__(**kwargs)
 
         self.suite = unittest.TestSuite()
 
-        test_suite_builder.add_openstack_api_tests(
-            self.suite,
-            CONST.openstack_creds,
-            self.ext_net_name,
-            use_keystone=CONST.snaps_use_keystone)
+    def run(self, **kwargs):
+        """
+        Builds the test suite then calls super.run()
+        :param kwargs: the arguments to pass on
+        :return:
+        """
+        snaps_suite_builder.add_openstack_client_tests(
+            suite=self.suite,
+            os_creds=self.os_creds,
+            ext_net_name=self.ext_net_name,
+            use_keystone=self.use_keystone)
+        snaps_suite_builder.add_openstack_api_tests(
+            suite=self.suite,
+            os_creds=self.os_creds,
+            ext_net_name=self.ext_net_name,
+            use_keystone=self.use_keystone,
+            image_metadata=self.image_metadata)
+        return super(ApiCheck, self).run()