summaryrefslogtreecommitdiffstats
path: root/testcases/OpenStack/vPing
diff options
context:
space:
mode:
authorSerenaFeng <feng.xiaowei@zte.com.cn>2016-08-31 10:22:33 +0800
committerJose Lausuch <jose.lausuch@ericsson.com>2016-09-02 07:54:09 +0000
commit4a803db9fa32c42559306da22beaab437d664fdc (patch)
tree0984ed984f3397f4f0a695353c069d472efbc389 /testcases/OpenStack/vPing
parentcc315c6534d27c24fe543b33e2ac9f66cda83d38 (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> (cherry picked from commit f4d0a05011e961a363c6d99522684ecdeb959716)
Diffstat (limited to 'testcases/OpenStack/vPing')
-rw-r--r--testcases/OpenStack/vPing/vping_util.py7
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")