aboutsummaryrefslogtreecommitdiffstats
path: root/sfc/lib/utils.py
diff options
context:
space:
mode:
authorManuel Buil <manuelbuil87@gmail.com>2017-01-17 10:01:14 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-01-17 10:01:14 +0000
commited1c664e33fc5ae330c914eb1ec625e1fc0232e9 (patch)
tree96996998af118b2687a0a80025cbe52783db9c50 /sfc/lib/utils.py
parent98b562be579fdfe9fe7e006b832a78338a0fba43 (diff)
parent40460e0dd7395a0a95b7ee52119a796cd3d500ab (diff)
Merge "Get Fuel environment id from configuration"
Diffstat (limited to 'sfc/lib/utils.py')
-rw-r--r--sfc/lib/utils.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/sfc/lib/utils.py b/sfc/lib/utils.py
index 8ed5e15b..f4412abf 100644
--- a/sfc/lib/utils.py
+++ b/sfc/lib/utils.py
@@ -18,6 +18,7 @@ import functest.utils.functest_logger as ft_logger
import functest.utils.functest_utils as ft_utils
import functest.utils.openstack_utils as os_utils
import opnfv.utils.SSHUtils as ssh_utils
+import sfc.lib.config as sfc_config
logger = ft_logger.Logger("sfc_test_utils").getLogger()
@@ -87,7 +88,7 @@ def run_cmd_remote(ip, cmd, username="root", passwd="opnfv"):
def get_openstack_node_ips(role):
"""Get OpenStack Nodes IP Address"""
- fuel_env = os.environ.get("FUEL_ENV")
+ fuel_env = sfc_config.CommonConfig().fuel_environment
if fuel_env is not None:
cmd = "fuel2 node list -f json -e %s" % fuel_env
else: