X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fopnfv_tests%2Fopenstack%2Fsnaps%2Fhealth_check.py;h=8a88ac6b8d32fae7c0898b835baed3919060d819;hb=58dd7174657c66254ae4c511850ac7d49b1dd98f;hp=245f50525679f9230c507c6fde9ff292e4b510c9;hpb=32ccb8926fd7057fed83f68e9035bd13577bf58a;p=functest.git

diff --git a/functest/opnfv_tests/openstack/snaps/health_check.py b/functest/opnfv_tests/openstack/snaps/health_check.py
index 245f50525..8a88ac6b8 100644
--- a/functest/opnfv_tests/openstack/snaps/health_check.py
+++ b/functest/opnfv_tests/openstack/snaps/health_check.py
@@ -1,15 +1,19 @@
-# 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
 
+"""snaps_health_check test case implementation"""
+
 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
@@ -23,18 +27,23 @@ class HealthCheck(SnapsTestRunner):
     """
     def __init__(self, **kwargs):
         if "case_name" not in kwargs:
-            kwargs["case_name"] = "snaps_health_check"
+            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,
+                netconf_override=self.netconf_override))
+        return super(HealthCheck, self).run()