Merge "1) Cleanup floating IPs that are assigned through Juju Deployment. 2) Add...

[functest.git] / functest / opnfv_tests / openstack / snaps / snaps_utils.py

diff --git a/functest/opnfv_tests/openstack/snaps/snaps_utils.py b/functest/opnfv_tests/openstack/snaps/snaps_utils.py
index fc03ee9..21d1dd6 100644 (file)
--- a/functest/opnfv_tests/openstack/snaps/snaps_utils.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_utils.py
@@ -7,14 +7,16 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 
-"""Some common utils wrapping snaps functions """
+"""Some common utils wrapping snaps functions"""
 
+from snaps.openstack.tests import openstack_tests
+from snaps.openstack.utils import neutron_utils
+from snaps.openstack.utils import nova_utils
+
+from functest.utils import config
 from functest.utils import constants
 from functest.utils import env
 
-from snaps.openstack.tests import openstack_tests
-from snaps.openstack.utils import neutron_utils, nova_utils
-
 
 def get_ext_net_name(os_creds):
     """
@@ -52,8 +54,8 @@ def get_credentials(proxy_settings_str=None, ssh_proxy_cmd=None):
     :return: an instance of snaps OSCreds object
     """
     creds_override = None
-    if hasattr(constants.CONST, 'snaps_os_creds_override'):
-        creds_override = getattr(constants.CONST, 'snaps_os_creds_override')
+    if hasattr(config.CONF, 'snaps_os_creds_override'):
+        creds_override = getattr(config.CONF, 'snaps_os_creds_override')
     os_creds = openstack_tests.get_credentials(
         os_env_file=constants.ENV_FILE, proxy_settings_str=proxy_settings_str,
         ssh_proxy_cmd=ssh_proxy_cmd, overrides=creds_override)