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 /testcases/OpenStack/vPing | |
| 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/OpenStack/vPing')
| -rw-r--r-- | testcases/OpenStack/vPing/vping_util.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/testcases/OpenStack/vPing/vping_util.py b/testcases/OpenStack/vPing/vping_util.py index 3f4adae73..8e9ce23ec 100644 --- a/testcases/OpenStack/vPing/vping_util.py +++ b/testcases/OpenStack/vPing/vping_util.py @@ -1,6 +1,6 @@ import os -import re import pprint +import re import sys import time @@ -8,13 +8,10 @@ import functest.utils.functest_utils as ft_utils import functest.utils.openstack_utils as os_utils import paramiko from scp import SCPClient -import yaml REPO_PATH = os.environ['repos_dir'] + '/functest/' -with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: - functest_yaml = yaml.safe_load(f) -f.close() +functest_yaml = ft_utils.get_functest_yaml() NAME_VM_1 = functest_yaml.get("vping").get("vm_name_1") NAME_VM_2 = functest_yaml.get("vping").get("vm_name_2") |