summaryrefslogtreecommitdiffstats
path: root/cli/commands/cli_os.py
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-09-08 16:40:34 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-08 16:40:34 +0000
commit9d19d1ff0bf7a5aada78bfc86cae831bcec86cc9 (patch)
tree9f107cc19478ff179ec148e48e58fafde651f53b /cli/commands/cli_os.py
parent4bd8e5f735562c38ad90c411f74f642c6e3ec73f (diff)
parent55d301a2622ff5b63d431b9272caa68224d53843 (diff)
Merge "make use of functest_utils.get_parameter_from_yaml"
Diffstat (limited to 'cli/commands/cli_os.py')
-rw-r--r--cli/commands/cli_os.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/cli/commands/cli_os.py b/cli/commands/cli_os.py
index fc027d5fe..4324ae44d 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: