X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fopnfv_tests%2Fopenstack%2Fsnaps%2Fsnaps_test_runner.py;h=e8a421595451b8d06d5c06a634ff5f34334c30a8;hb=ec97f28675daea3b3221c196764c58c3c9bd65d4;hp=044a0bb04c5da019f9aa1f1c8a234906a5823eaf;hpb=2bd6e7d12040659b5be66d6d9a0df55838446379;p=functest.git

diff --git a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
index 044a0bb04..e8a421595 100644
--- a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
@@ -1,33 +1,48 @@
-# 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
 
-from functest.utils import functest_logger as ft_logger
-from functest.core.pytest_suite_runner import PyTestSuiteRunner
+import logging
+
+from functest.core import unit
 from functest.opnfv_tests.openstack.snaps import snaps_utils
 from functest.utils import functest_utils
+from functest.utils.constants import CONST
 
 from snaps.openstack import create_flavor
+from snaps.openstack.tests import openstack_tests
 
 
-class SnapsTestRunner(PyTestSuiteRunner):
+class SnapsTestRunner(unit.Suite):
     """
-    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 Tests
     """
-    def __init__(self, case_name=''):
-        super(SnapsTestRunner, self).__init__(case_name)
+    def __init__(self, **kwargs):
+        super(SnapsTestRunner, self).__init__(**kwargs)
+        self.logger = logging.getLogger(__name__)
+
+        if 'os_creds' in kwargs:
+            self.os_creds = kwargs['os_creds']
+        else:
+            self.os_creds = openstack_tests.get_credentials(
+                os_env_file=CONST.__getattribute__('openstack_creds'),
+                proxy_settings_str=None, ssh_proxy_cmd=None)
+
+        if 'ext_net_name' in kwargs:
+            self.ext_net_name = kwargs['ext_net_name']
+        else:
+            self.ext_net_name = snaps_utils.get_ext_net_name(self.os_creds)
 
-        self.ext_net_name = snaps_utils.get_ext_net_name()
-        self.logger = ft_logger.Logger(self.project_name).getLogger()
+        self.use_fip = CONST.__getattribute__('snaps_use_floating_ips')
+        self.use_keystone = CONST.__getattribute__('snaps_use_keystone')
         scenario = functest_utils.get_scenario()
 
-        self.flavor_metadata = create_flavor.MEM_PAGE_SIZE_ANY
+        self.flavor_metadata = None
         if 'ovs' in scenario or 'fdio' in scenario:
             self.flavor_metadata = create_flavor.MEM_PAGE_SIZE_LARGE
 
-        self.logger.info("Using flavor metatdata '%s'" % self.flavor_metadata)
+        self.logger.info("Using flavor metadata '%s'", self.flavor_metadata)