Protect VMTP vs cidr conflicts

[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 c19bf39..3a9c821 100644 (file)
--- a/functest/opnfv_tests/openstack/snaps/health_check.py
+++ b/functest/opnfv_tests/openstack/snaps/health_check.py
@@ -1,39 +1,49 @@
-# 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
 

+"""snaps_health_check test case implementation"""
+

 import unittest
 
 import unittest
 

-from snaps.openstack.tests.os_source_file_test import OSIntegrationTestCase

 from snaps.openstack.tests.create_instance_tests import SimpleHealthCheck
 from snaps.openstack.tests.create_instance_tests import SimpleHealthCheck

+from snaps.openstack.tests.os_source_file_test import OSIntegrationTestCase

 
 

-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.snaps_test_runner import (
+    SnapsTestRunner)

 
 
 
 

-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
     """
     """
     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.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_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(
         self.suite.addTest(
             OSIntegrationTestCase.parameterize(

-                SimpleHealthCheck, CONST.openstack_creds, ext_net_name,
-                use_keystone=CONST.snaps_use_keystone,
-                image_metadata=image_custom_config))
+                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=self.image_metadata,
+                netconf_override=self.netconf_override))
+        return super(HealthCheck, self).run()