diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-09-08 16:40:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-08 16:40:34 +0000 |
| commit | 9d19d1ff0bf7a5aada78bfc86cae831bcec86cc9 (patch) | |
| tree | 9f107cc19478ff179ec148e48e58fafde651f53b /cli | |
| parent | 4bd8e5f735562c38ad90c411f74f642c6e3ec73f (diff) | |
| parent | 55d301a2622ff5b63d431b9272caa68224d53843 (diff) | |
Merge "make use of functest_utils.get_parameter_from_yaml"
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/commands/cli_os.py | 9 | ||||
| -rw-r--r-- | cli/commands/cli_testcase.py | 5 | ||||
| -rw-r--r-- | cli/commands/cli_tier.py | 5 |
3 files changed, 8 insertions, 11 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: diff --git a/cli/commands/cli_testcase.py b/cli/commands/cli_testcase.py index 5cfe99881..510d740ba 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 ee45d8438..aa0541981 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 |