Merge "Update unit test related to vyos_vrouter"

[functest.git] / functest / opnfv_tests / openstack / snaps / api_check.py

diff --git a/functest/opnfv_tests/openstack/snaps/api_check.py b/functest/opnfv_tests/openstack/snaps/api_check.py
index ad77d9b..e708b4d 100644 (file)
--- a/functest/opnfv_tests/openstack/snaps/api_check.py
+++ b/functest/opnfv_tests/openstack/snaps/api_check.py
@@ -1,4 +1,5 @@
-# Copyright (c) 2015 All rights reserved
+# 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
@@ -7,11 +8,9 @@
 
 import unittest
 
-from snaps import test_suite_builder
-
+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,14 +19,23 @@ class ApiCheck(SnapsTestRunner):
     that exercise many of the OpenStack APIs within Keystone, Glance, Neutron,
     and Nova
     """
-    def __init__(self):
-        super(ApiCheck, self).__init__()
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = "api_check"
+        super(ApiCheck, self).__init__(**kwargs)
 
         self.suite = unittest.TestSuite()
-        self.case_name = "api_check"
 
-        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_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(self.__class__, self).run()