X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fopnfv_tests%2Fopenstack%2Fsnaps%2Fconnection_check.py;h=494f74b49ed32f88fdc6fc299f39d111c066012f;hb=9cd065bd3ce2544ced1ace605da0d77c1b59cb3b;hp=42e38d67c907eb7f327d0afc73a4f1bb54a4d5c7;hpb=1ac822083026d42ebe5f1a96e4eb0d34eed613c8;p=functest.git

diff --git a/functest/opnfv_tests/openstack/snaps/connection_check.py b/functest/opnfv_tests/openstack/snaps/connection_check.py
index 42e38d67c..494f74b49 100644
--- a/functest/opnfv_tests/openstack/snaps/connection_check.py
+++ b/functest/opnfv_tests/openstack/snaps/connection_check.py
@@ -1,31 +1,41 @@
-# 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
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 
-import functest.utils.functest_utils as ft_utils
-from functest.core.pytest_suite_runner import PyTestSuiteRunner
-from functest.opnfv_tests.openstack.snaps import snaps_utils
-from snaps import test_suite_builder
 import unittest
 
+from snaps import test_suite_builder
+
+from functest.opnfv_tests.openstack.snaps.snaps_test_runner import \
+    SnapsTestRunner
+
 
-class ConnectionCheck(PyTestSuiteRunner):
+class ConnectionCheck(SnapsTestRunner):
     """
     This test executes the Python Tests included with the SNAPS libraries
     that simply obtain the different OpenStack clients and may perform
     simple queries
     """
-    def __init__(self):
-        super(ConnectionCheck, self).__init__()
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = "connection_check"
+        super(ConnectionCheck, self).__init__(**kwargs)
 
         self.suite = unittest.TestSuite()
-        creds_file = ft_utils.get_functest_config('general.openstack.creds')
-        use_key = ft_utils.get_functest_config('snaps.use_keystone')
-        ext_net_name = snaps_utils.get_ext_net_name()
 
-        test_suite_builder.add_openstack_client_tests(self.suite, creds_file,
-                                                      ext_net_name,
-                                                      use_keystone=use_key)
+    def run(self, **kwargs):
+        """
+        Builds the test suite then calls super.run()
+        :param kwargs: the arguments to pass on
+        :return:
+        """
+        test_suite_builder.add_openstack_client_tests(
+            suite=self.suite,
+            os_creds=self.os_creds,
+            ext_net_name=self.ext_net_name,
+            use_keystone=self.use_keystone)
+        return super(self.__class__, self).run()