diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2016-09-01 08:30:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-01 08:30:09 +0000 |
| commit | c94a1c01e46b21f0139a8b1419f26c8b9f867a41 (patch) | |
| tree | 0b1c11a9d286aefd1c015dac90d5acea94206678 /cli | |
| parent | 5fbdcb8d13e63cec2614a9703f0b3f640f05aa49 (diff) | |
| parent | f4d0a05011e961a363c6d99522684ecdeb959716 (diff) | |
Merge "unify functest_yaml obtain process"
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/commands/cli_os.py | 6 | ||||
| -rw-r--r-- | cli/commands/cli_testcase.py | 5 | ||||
| -rw-r--r-- | cli/commands/cli_tier.py | 5 |
3 files changed, 4 insertions, 12 deletions
diff --git a/cli/commands/cli_os.py b/cli/commands/cli_os.py index 722c700c..a3b7ad31 100644 --- a/cli/commands/cli_os.py +++ b/cli/commands/cli_os.py @@ -9,15 +9,13 @@ import os + import click import functest.utils.functest_utils as ft_utils import functest.utils.openstack_clean as os_clean import functest.utils.openstack_snapshot as os_snapshot -import yaml - -with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: - functest_yaml = yaml.safe_load(f) +functest_yaml = ft_utils.get_functest_yaml() REPOS_DIR = os.getenv('repos_dir') FUNCTEST_REPO = ("%s/functest/" % REPOS_DIR) diff --git a/cli/commands/cli_testcase.py b/cli/commands/cli_testcase.py index d1b24829..498f0813 100644 --- a/cli/commands/cli_testcase.py +++ b/cli/commands/cli_testcase.py @@ -15,11 +15,8 @@ import click import functest.ci.tier_builder as tb import functest.utils.functest_utils as ft_utils import functest.utils.functest_vacation as vacation -import yaml - -with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: - functest_yaml = yaml.safe_load(f) +functest_yaml = ft_utils.get_functest_yaml() FUNCTEST_CONF_DIR = functest_yaml.get("general").get( "directories").get("dir_functest_conf") diff --git a/cli/commands/cli_tier.py b/cli/commands/cli_tier.py index 7797e9be..ea86a79f 100644 --- a/cli/commands/cli_tier.py +++ b/cli/commands/cli_tier.py @@ -14,11 +14,8 @@ import os import click import functest.ci.tier_builder as tb import functest.utils.functest_utils as ft_utils -import yaml - -with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: - functest_yaml = yaml.safe_load(f) +functest_yaml = ft_utils.get_functest_yaml() FUNCTEST_CONF_DIR = functest_yaml.get("general").get( "directories").get("dir_functest_conf") |