Merge "Use functest repo variable"

[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 4e94460..8a88ac6 100644 (file)
--- a/functest/opnfv_tests/openstack/snaps/health_check.py
+++ b/functest/opnfv_tests/openstack/snaps/health_check.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 # Copyright (c) 2017 Cable Television Laboratories, Inc. and others.
 #
 # This program and the accompanying materials
@@ -6,11 +8,12 @@
 #
 # 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
@@ -35,15 +38,12 @@ class HealthCheck(SnapsTestRunner):
         :param kwargs: the arguments to pass on
         :return:
         """
-        image_custom_config = None
-
-        if hasattr(CONST, 'snaps_images_cirros'):
-            image_custom_config = CONST.__getattribute__('snaps_images_cirros')
         self.suite.addTest(
             OSIntegrationTestCase.parameterize(
                 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))
-        return super(self.__class__, self).run()
+                image_metadata=self.image_metadata,
+                netconf_override=self.netconf_override))
+        return super(HealthCheck, self).run()