aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-02-22 16:36:55 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-02-22 16:36:55 +0000
commitd701e9737f83ff29faba830df426b5a75c9746b1 (patch)
tree8e6299dcd2cfcd3d773cc523cb1c5a387d0d9681 /functest/opnfv_tests
parent01b28068c727b54c34d5b20e3baad4c4e31d7761 (diff)
parentfdbfe10922d09ee3dad407b10be0205082dddce3 (diff)
Merge "Use constants for Functest config file"
Diffstat (limited to 'functest/opnfv_tests')
-rw-r--r--functest/opnfv_tests/openstack/snaps/snaps_utils.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/functest/opnfv_tests/openstack/snaps/snaps_utils.py b/functest/opnfv_tests/openstack/snaps/snaps_utils.py
index 4b1c9352..fc03ee9b 100644
--- a/functest/opnfv_tests/openstack/snaps/snaps_utils.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_utils.py
@@ -9,7 +9,7 @@
"""Some common utils wrapping snaps functions """
-from functest.utils.constants import CONST
+from functest.utils import constants
from functest.utils import env
from snaps.openstack.tests import openstack_tests
@@ -52,10 +52,9 @@ def get_credentials(proxy_settings_str=None, ssh_proxy_cmd=None):
:return: an instance of snaps OSCreds object
"""
creds_override = None
- if hasattr(CONST, 'snaps_os_creds_override'):
- creds_override = getattr(CONST, 'snaps_os_creds_override')
+ if hasattr(constants.CONST, 'snaps_os_creds_override'):
+ creds_override = getattr(constants.CONST, 'snaps_os_creds_override')
os_creds = openstack_tests.get_credentials(
- os_env_file=getattr(CONST, 'env_file'),
- proxy_settings_str=proxy_settings_str, ssh_proxy_cmd=ssh_proxy_cmd,
- overrides=creds_override)
+ os_env_file=constants.ENV_FILE, proxy_settings_str=proxy_settings_str,
+ ssh_proxy_cmd=ssh_proxy_cmd, overrides=creds_override)
return os_creds