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/features/promise.py | |
parent | 5fbdcb8d13e63cec2614a9703f0b3f640f05aa49 (diff) | |
parent | f4d0a05011e961a363c6d99522684ecdeb959716 (diff) |
Merge "unify functest_yaml obtain process"
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 27186550e..47e360ca3 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') |