diff options
| author |   SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-08-31 10:22:33 +0800 |
|---|---|---|
| committer | SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-08-31 23:20:19 +0800 |
| commit | f4d0a05011e961a363c6d99522684ecdeb959716 (patch) | |
| tree | 4fe3d75e31cb3f9e56bffe37cb98e79ea9851c87 /cli/commands | |
| parent | fe5d0f8628b8e0defdfc6e3b0e4556b46311a2f9 (diff) | |
unify functest_yaml obtain process
functest_yaml is needed in almost all of the testcases, the obtain process is the same:
with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:
functest_yaml = yaml.safe_load(f)
f.close()
abstract a method to unify the process, and provide the interface
JIRA: FUNCTEST-447
Change-Id: I96a9a9962d7b466f10bbd3b5ab2495957524e22a
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'cli/commands')
| -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 722c700cd..a3b7ad31e 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 d1b248297..498f08132 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 7797e9be6..ea86a79ff 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") |