From f4d0a05011e961a363c6d99522684ecdeb959716 Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Wed, 31 Aug 2016 10:22:33 +0800 Subject: 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 --- cli/commands/cli_os.py | 6 ++---- cli/commands/cli_testcase.py | 5 +---- cli/commands/cli_tier.py | 5 +---- 3 files changed, 4 insertions(+), 12 deletions(-) (limited to 'cli/commands') 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") -- cgit 1.2.3-korg