diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2016-09-01 08:30:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-01 08:30:09 +0000 |
| commit | c94a1c01e46b21f0139a8b1419f26c8b9f867a41 (patch) | |
| tree | 0b1c11a9d286aefd1c015dac90d5acea94206678 /testcases/OpenStack/vPing | |
| parent | 5fbdcb8d13e63cec2614a9703f0b3f640f05aa49 (diff) | |
| parent | f4d0a05011e961a363c6d99522684ecdeb959716 (diff) | |
Merge "unify functest_yaml obtain process"
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 9c35c230a..bdd118118 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") |