From 40460e0dd7395a0a95b7ee52119a796cd3d500ab Mon Sep 17 00:00:00 2001 From: George Paraskevopoulos Date: Wed, 11 Jan 2017 15:49:57 +0200 Subject: Get Fuel environment id from configuration JIRA: SFC-65 Get the id of the fuel environment from config.yaml instead of an environmental variable Change-Id: I39e61200986b407ae19cc9f7c1384c34c8410c8b Signed-off-by: George Paraskevopoulos --- sfc/lib/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sfc/lib/utils.py') diff --git a/sfc/lib/utils.py b/sfc/lib/utils.py index 00f98985..1140e5b0 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: -- cgit 1.2.3-korg