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 864bca5..d9f95e9 100644 (file)
--- a/functest/opnfv_tests/openstack/snaps/smoke.py
+++ b/functest/opnfv_tests/openstack/snaps/smoke.py
@@ -21,29 +21,29 @@ class SnapsSmoke(SnapsTestRunner):
     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.case_name = "snaps_smoke"
-        use_fip = CONST.snaps_use_floating_ips
 
-        # The snaps smoke test uses the same config as the
-        # snaps_health_check suite, so reuse it here
-        image_custom_config = None
-        if hasattr(CONST, 'snaps_health_check'):
-            image_custom_config = CONST.snaps_health_check
+        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
-        if use_fip:
-            snaps_dir = CONST.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(
-            self.suite,
-            CONST.openstack_creds,
-            self.ext_net_name,
-            use_keystone=CONST.snaps_use_keystone,
-            image_metadata=image_custom_config,
-            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)