Implement connection_check via shade too

[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 17d05b9..d4204bf 100644 (file)
--- a/functest/opnfv_tests/openstack/snaps/api_check.py
+++ b/functest/opnfv_tests/openstack/snaps/api_check.py
@@ -1,34 +1,50 @@
-# 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
 
 # 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.core.pytest_suite_runner import PyTestSuiteRunner
-from functest.opnfv_tests.openstack.snaps import snaps_utils
-from functest.utils.constants import CONST
+from functest.opnfv_tests.openstack.snaps import snaps_suite_builder
+from functest.opnfv_tests.openstack.snaps.snaps_test_runner import \
+    SnapsTestRunner

 
 
 
 

-class ApiCheck(PyTestSuiteRunner):
+class ApiCheck(SnapsTestRunner):

     """
     This test executes the Python Tests included with the SNAPS libraries
     that exercise many of the OpenStack APIs within Keystone, Glance, Neutron,
     and Nova
     """
     """
     This test executes the Python Tests included with the SNAPS libraries
     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.suite = unittest.TestSuite()

-        self.case_name = "api_check"
-        ext_net_name = snaps_utils.get_ext_net_name()
-
-        test_suite_builder.add_openstack_api_tests(
-            self.suite,
-            CONST.openstack_creds,
-            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()