Merge "Use CONST to retrieve db_url rather than getter function"

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

diff --git a/functest/opnfv_tests/openstack/snaps/smoke.py b/functest/opnfv_tests/openstack/snaps/smoke.py
index 691f813..d9f95e9 100644 (file)
--- a/functest/opnfv_tests/openstack/snaps/smoke.py
+++ b/functest/opnfv_tests/openstack/snaps/smoke.py
@@ -5,37 +5,45 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 

-import functest.utils.functest_utils as ft_utils
-from functest.core.pytest_suite_runner import PyTestSuiteRunner
-from functest.opnfv_tests.openstack.snaps import snaps_utils
-from snaps import test_suite_builder
-import unittest

 import os
 import os

+import unittest

 
 

+from snaps import test_suite_builder

 
 

-class SnapsSmoke(PyTestSuiteRunner):
+from functest.opnfv_tests.openstack.snaps.snaps_test_runner import \
+    SnapsTestRunner
+from functest.utils.constants import CONST
+
+
+class SnapsSmoke(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(SnapsSmoke, self).__init__()
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = "snaps_smoke"
+        super(SnapsSmoke, self).__init__(**kwargs)

 
         self.suite = unittest.TestSuite()
 
         self.suite = unittest.TestSuite()

-        self.case_name = "snaps_smoke"
-        creds_file = ft_utils.get_functest_config('general.openstack.creds')
-        use_key = ft_utils.get_functest_config('snaps.use_keystone')
-        use_fip = ft_utils.get_functest_config('snaps.use_floating_ips')
-        ext_net_name = snaps_utils.get_ext_net_name()
+
+        image_config = None
+        if hasattr(CONST, 'snaps_images_cirros'):
+            image_config = CONST.__getattribute__('snaps_images_cirros')

 
         # Tests requiring floating IPs leverage files contained within the
         # SNAPS repository and are found relative to that path
 
         # Tests requiring floating IPs leverage files contained within the
         # SNAPS repository and are found relative to that path

-        if use_fip:
-            snaps_dir = ft_utils.get_functest_config(
-                'general.dir.dir_repo_snaps') + '/snaps'
+        if self.use_fip:
+            snaps_dir = os.path.join(CONST.__getattribute__('dir_repo_snaps'),
+                                     'snaps')

             os.chdir(snaps_dir)
 
         test_suite_builder.add_openstack_integration_tests(
             os.chdir(snaps_dir)
 
         test_suite_builder.add_openstack_integration_tests(

-            self.suite, creds_file, ext_net_name, use_keystone=use_key,
-            use_floating_ips=use_fip)
+            suite=self.suite,
+            os_creds=self.os_creds,
+            ext_net_name=self.ext_net_name,
+            use_keystone=self.use_keystone,
+            flavor_metadata=self.flavor_metadata,
+            image_metadata=image_config,
+            use_floating_ips=self.use_fip)