X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=functest%2Fopnfv_tests%2Fopenstack%2Fsnaps%2Fhealth_check.py;h=0daddcdd2b9a25cfa3da5e5b301cce70d7520365;hb=ec4514f240836129d5f3c25b4708d73a65b9cb60;hp=993c1000ca8a444b0168f995388a8ac6a9ad7656;hpb=1dcc72506983bc166e0f63e2405f6a81a17a6e75;p=functest.git

diff --git a/functest/opnfv_tests/openstack/snaps/health_check.py b/functest/opnfv_tests/openstack/snaps/health_check.py
index 993c1000c..0daddcdd2 100644
--- a/functest/opnfv_tests/openstack/snaps/health_check.py
+++ b/functest/opnfv_tests/openstack/snaps/health_check.py
@@ -7,28 +7,35 @@
 
 import unittest
 
+from functest.opnfv_tests.openstack.snaps.snaps_test_runner import \
+    SnapsTestRunner
+from functest.utils.constants import CONST
+
 from snaps.openstack.tests.os_source_file_test import OSIntegrationTestCase
 from snaps.openstack.tests.create_instance_tests import SimpleHealthCheck
 
-from functest.core.pytest_suite_runner import PyTestSuiteRunner
-from functest.opnfv_tests.openstack.snaps import snaps_utils
-from functest.utils.constants import CONST
 
-
-class HealthCheck(PyTestSuiteRunner):
+class HealthCheck(SnapsTestRunner):
     """
     This test executes the SNAPS Python Test case SimpleHealthCheck which
     creates a VM with a single port with an IPv4 address that is assigned by
     DHCP. This test then validates the expected IP with the actual
     """
-    def __init__(self):
-        super(HealthCheck, self).__init__()
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = "snaps_images_cirros"
+        super(HealthCheck, self).__init__(**kwargs)
 
         self.suite = unittest.TestSuite()
-        self.case_name = "snaps_health_check"
-        ext_net_name = snaps_utils.get_ext_net_name()
 
+        image_custom_config = None
+
+        if hasattr(CONST, 'snaps_images_cirros'):
+            image_custom_config = CONST.__getattribute__('snaps_images_cirros')
         self.suite.addTest(
             OSIntegrationTestCase.parameterize(
-                SimpleHealthCheck, CONST.openstack_creds, ext_net_name,
-                use_keystone=CONST.snaps_use_keystone))
+                SimpleHealthCheck, 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_custom_config))