diff options
author | 2016-08-31 10:22:33 +0800 | |
---|---|---|
committer | 2016-08-31 23:20:19 +0800 | |
commit | f4d0a05011e961a363c6d99522684ecdeb959716 (patch) | |
tree | 4fe3d75e31cb3f9e56bffe37cb98e79ea9851c87 /testcases/features/promise.py | |
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 'testcases/features/promise.py')
-rwxr-xr-x | testcases/features/promise.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/testcases/features/promise.py b/testcases/features/promise.py index 3728adfe..3f58dcee 100755 --- a/testcases/features/promise.py +++ b/testcases/features/promise.py @@ -9,20 +9,18 @@ # # Maintainer : jose.lausuch@ericsson.com # -import argparse import json import os import subprocess import time +import argparse import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as functest_utils import functest.utils.openstack_utils as openstack_utils import keystoneclient.v2_0.client as ksclient -from neutronclient.v2_0 import client as ntclient import novaclient.client as nvclient -import yaml - +from neutronclient.v2_0 import client as ntclient parser = argparse.ArgumentParser() @@ -32,8 +30,7 @@ parser.add_argument("-r", "--report", action="store_true") args = parser.parse_args() -with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: - functest_yaml = yaml.safe_load(f) +functest_yaml = functest_utils.get_functest_yaml() dirs = functest_yaml.get('general').get('directories') PROMISE_REPO = dirs.get('dir_repo_promise') |