X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fopnfv_tests%2Fopenstack%2Fsnaps%2Fsnaps_test_runner.py;h=4de443718a1e6f827c3f9a211967dfcafadd0caf;hb=58dd7174657c66254ae4c511850ac7d49b1dd98f;hp=bfdcd8626e880ba6983f93b98f677a727923471a;hpb=90d34ecea4e5eaa90db2092b831ece909d9c1477;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 bfdcd8626..4de443718 100644
--- a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.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,44 +8,44 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 
+"""configuration params to run snaps tests"""
+
 import logging
 
 from functest.core import unit
 from functest.opnfv_tests.openstack.snaps import snaps_utils
-from functest.utils.constants import CONST
+from functest.utils import config
+from functest.utils import env
 
 from snaps.openstack import create_flavor
-from snaps.openstack.tests import openstack_tests
 
 
 class SnapsTestRunner(unit.Suite):
+    # pylint: disable=too-many-instance-attributes
     """
     This test executes the SNAPS Python Tests
     """
+
     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:
-            creds_override = None
-            if hasattr(CONST, 'snaps_os_creds_override'):
-                creds_override = CONST.__getattribute__(
-                    'snaps_os_creds_override')
-            self.os_creds = openstack_tests.get_credentials(
-                os_env_file=CONST.__getattribute__('openstack_creds'),
-                proxy_settings_str=None, ssh_proxy_cmd=None,
-                overrides=creds_override)
+        self.os_creds = kwargs.get('os_creds') or snaps_utils.get_credentials()
 
         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.use_fip = CONST.__getattribute__('snaps_use_floating_ips')
-        self.use_keystone = CONST.__getattribute__('snaps_use_keystone')
-        scenario = CONST.__getattribute__('DEPLOY_SCENARIO')
+        self.netconf_override = None
+        if hasattr(config.CONF, 'snaps_network_config'):
+            self.netconf_override = getattr(
+                config.CONF, 'snaps_network_config')
+
+        self.use_fip = (
+            getattr(config.CONF, 'snaps_use_floating_ips') == 'True')
+        self.use_keystone = (
+            getattr(config.CONF, 'snaps_use_keystone') == 'True')
+        scenario = env.get('DEPLOY_SCENARIO')
 
         self.flavor_metadata = None
         if 'ovs' in scenario or 'fdio' in scenario:
@@ -52,5 +54,5 @@ class SnapsTestRunner(unit.Suite):
         self.logger.info("Using flavor metadata '%s'", self.flavor_metadata)
 
         self.image_metadata = None
-        if hasattr(CONST, 'snaps_images'):
-            self.image_metadata = CONST.__getattribute__('snaps_images')
+        if hasattr(config.CONF, 'snaps_images'):
+            self.image_metadata = getattr(config.CONF, 'snaps_images')