Merge "Update unit test related to vyos_vrouter"

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

diff --git a/functest/opnfv_tests/openstack/snaps/health_check.py b/functest/opnfv_tests/openstack/snaps/health_check.py
index 6b3cfdd..1b8d053 100644 (file)
--- a/functest/opnfv_tests/openstack/snaps/health_check.py
+++ b/functest/opnfv_tests/openstack/snaps/health_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,9 +8,8 @@
 
 import unittest
 
-from functest.opnfv_tests.openstack.snaps.snaps_test_runner import \
-    SnapsTestRunner
-from functest.utils.constants import CONST
+from functest.opnfv_tests.openstack.snaps.snaps_test_runner import (
+    SnapsTestRunner)
 
 from snaps.openstack.tests.os_source_file_test import OSIntegrationTestCase
 from snaps.openstack.tests.create_instance_tests import SimpleHealthCheck
@@ -21,18 +21,24 @@ class HealthCheck(SnapsTestRunner):
     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, case_name="snaps_health_check"):
-        super(HealthCheck, self).__init__(case_name)
+    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()
 
-        image_custom_config = None
-        if hasattr(CONST, 'snaps_health_check'):
-            image_custom_config = CONST.snaps_health_check
-
+    def run(self, **kwargs):
+        """
+        Builds the test suite then calls super.run()
+        :param kwargs: the arguments to pass on
+        :return:
+        """
         self.suite.addTest(
             OSIntegrationTestCase.parameterize(
-                SimpleHealthCheck, CONST.openstack_creds, self.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))
+                image_metadata=self.image_metadata))
+        return super(self.__class__, self).run()