aboutsummaryrefslogtreecommitdiffstats
path: root/cli
diff options
context:
space:
mode:
authorSerenaFeng <feng.xiaowei@zte.com.cn>2016-09-07 22:13:42 +0800
committerSerenaFeng <feng.xiaowei@zte.com.cn>2016-09-08 10:45:45 +0800
commit55d301a2622ff5b63d431b9272caa68224d53843 (patch)
treeb540f05ba3ed45e15260ee7131ce90dc93af753d /cli
parent227afb8285b8f178987a7d6eb1d28a74201a5d1b (diff)
make use of functest_utils.get_parameter_from_yaml
JIRA: FUNCTEST-463 Change-Id: I1d54a65c5bfa2542f2fd3a2e408967641e6e4ac9 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'cli')
-rw-r--r--cli/commands/cli_os.py9
-rw-r--r--cli/commands/cli_testcase.py5
-rw-r--r--cli/commands/cli_tier.py5
3 files changed, 8 insertions, 11 deletions
diff --git a/cli/commands/cli_os.py b/cli/commands/cli_os.py
index fc027d5f..4324ae44 100644
--- a/cli/commands/cli_os.py
+++ b/cli/commands/cli_os.py
@@ -16,13 +16,12 @@ import functest.utils.functest_utils as ft_utils
import functest.utils.openstack_clean as os_clean
import functest.utils.openstack_snapshot as os_snapshot
-functest_yaml = ft_utils.get_functest_yaml()
-FUNCTEST_CONF_DIR = functest_yaml.get("general").get(
- "directories").get("dir_functest_conf")
+FUNCTEST_CONF_DIR = \
+ ft_utils.get_functest_config('general.directories.dir_functest_conf')
RC_FILE = os.getenv('creds')
-OS_SNAPSHOT_FILE = ft_utils.get_parameter_from_yaml(
- "general.openstack.snapshot_file")
+OS_SNAPSHOT_FILE = \
+ ft_utils.get_functest_config("general.openstack.snapshot_file")
class CliOpenStack:
diff --git a/cli/commands/cli_testcase.py b/cli/commands/cli_testcase.py
index 5cfe9988..510d740b 100644
--- a/cli/commands/cli_testcase.py
+++ b/cli/commands/cli_testcase.py
@@ -17,10 +17,9 @@ import functest.ci.tier_builder as tb
import functest.utils.functest_utils as ft_utils
import functest.utils.functest_vacation as vacation
-functest_yaml = ft_utils.get_functest_yaml()
-FUNCTEST_CONF_DIR = functest_yaml.get("general").get(
- "directories").get("dir_functest_conf")
+FUNCTEST_CONF_DIR = \
+ ft_utils.get_functest_config('general.directories.dir_functest_conf')
ENV_FILE = FUNCTEST_CONF_DIR + "/env_active"
FUNCTEST_REPO = ft_utils.FUNCTEST_REPO
diff --git a/cli/commands/cli_tier.py b/cli/commands/cli_tier.py
index ee45d843..aa054198 100644
--- a/cli/commands/cli_tier.py
+++ b/cli/commands/cli_tier.py
@@ -16,10 +16,9 @@ import click
import functest.ci.tier_builder as tb
import functest.utils.functest_utils as ft_utils
-functest_yaml = ft_utils.get_functest_yaml()
-FUNCTEST_CONF_DIR = functest_yaml.get("general").get(
- "directories").get("dir_functest_conf")
+FUNCTEST_CONF_DIR = \
+ ft_utils.get_functest_config('general.directories.dir_functest_conf')
ENV_FILE = FUNCTEST_CONF_DIR + "/env_active"
FUNCTEST_REPO = ft_utils.FUNCTEST_REPO