summaryrefslogtreecommitdiffstats
path: root/cli/commands
diff options
context:
space:
mode:
authorSerenaFeng <feng.xiaowei@zte.com.cn>2016-08-31 11:07:40 +0800
committerMorgan Richomme <morgan.richomme@orange.com>2016-08-31 12:13:51 +0000
commitb9769fd308b7a92ccb90a3b9171cfd429c865910 (patch)
tree4069067aa01b6b974df9087431d32efe7bdb3a80 /cli/commands
parent34947aa5d4ea991f20c94c5216a2f6a01cbfa37f (diff)
unify testcases.yaml obtain process
hardcoded "''FUNCTEST_REPO + "/ci/testcases.yaml"''' appears wherever testcases.yaml is needed, abstract a method to provide unified interface JIRA: FUNCTEST-449 Change-Id: Ida8e3d90926d3e2245883a29f577ecb121bd5d6c Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn> (cherry picked from commit f5afb93a4a2ed9547757655c1405ef27fabed11b)
Diffstat (limited to 'cli/commands')
-rw-r--r--cli/commands/cli_testcase.py4
-rw-r--r--cli/commands/cli_tier.py4
2 files changed, 2 insertions, 6 deletions
diff --git a/cli/commands/cli_testcase.py b/cli/commands/cli_testcase.py
index abf67d193..d1b248297 100644
--- a/cli/commands/cli_testcase.py
+++ b/cli/commands/cli_testcase.py
@@ -21,8 +21,6 @@ import yaml
with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:
functest_yaml = yaml.safe_load(f)
-REPOS_DIR = os.getenv('repos_dir')
-FUNCTEST_REPO = ("%s/functest/" % REPOS_DIR)
FUNCTEST_CONF_DIR = functest_yaml.get("general").get(
"directories").get("dir_functest_conf")
ENV_FILE = FUNCTEST_CONF_DIR + "/env_active"
@@ -33,7 +31,7 @@ class CliTestcase:
def __init__(self):
CI_INSTALLER_TYPE = os.getenv('INSTALLER_TYPE')
CI_SCENARIO = os.getenv('DEPLOY_SCENARIO')
- testcases = FUNCTEST_REPO + "/ci/testcases.yaml"
+ testcases = ft_utils.get_testcases_file()
self.tiers = tb.TierBuilder(CI_INSTALLER_TYPE, CI_SCENARIO, testcases)
def list(self):
diff --git a/cli/commands/cli_tier.py b/cli/commands/cli_tier.py
index 8e031cce9..7797e9be6 100644
--- a/cli/commands/cli_tier.py
+++ b/cli/commands/cli_tier.py
@@ -20,8 +20,6 @@ import yaml
with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:
functest_yaml = yaml.safe_load(f)
-REPOS_DIR = os.getenv('repos_dir')
-FUNCTEST_REPO = ("%s/functest/" % REPOS_DIR)
FUNCTEST_CONF_DIR = functest_yaml.get("general").get(
"directories").get("dir_functest_conf")
ENV_FILE = FUNCTEST_CONF_DIR + "/env_active"
@@ -32,7 +30,7 @@ class CliTier:
def __init__(self):
CI_INSTALLER_TYPE = os.getenv('INSTALLER_TYPE')
CI_SCENARIO = os.getenv('DEPLOY_SCENARIO')
- testcases = FUNCTEST_REPO + "/ci/testcases.yaml"
+ testcases = ft_utils.get_testcases_file()
self.tiers = tb.TierBuilder(CI_INSTALLER_TYPE, CI_SCENARIO, testcases)
def list(self):