diff options
author | 2016-09-01 08:30:09 +0000 | |
---|---|---|
committer | 2016-09-01 08:30:09 +0000 | |
commit | c94a1c01e46b21f0139a8b1419f26c8b9f867a41 (patch) | |
tree | 0b1c11a9d286aefd1c015dac90d5acea94206678 /testcases/vnf | |
parent | 5fbdcb8d13e63cec2614a9703f0b3f640f05aa49 (diff) | |
parent | f4d0a05011e961a363c6d99522684ecdeb959716 (diff) |
Merge "unify functest_yaml obtain process"
Diffstat (limited to 'testcases/vnf')
-rwxr-xr-x | testcases/vnf/vIMS/vIMS.py | 17 | ||||
-rwxr-xr-x | testcases/vnf/vRNC/parser.py | 7 |
2 files changed, 8 insertions, 16 deletions
diff --git a/testcases/vnf/vIMS/vIMS.py b/testcases/vnf/vIMS/vIMS.py index bf534f68..634a1795 100755 --- a/testcases/vnf/vIMS/vIMS.py +++ b/testcases/vnf/vIMS/vIMS.py @@ -11,28 +11,25 @@ # http://www.apache.org/licenses/LICENSE-2.0 ######################################################################## -import argparse import datetime import json import os import pprint -import requests import subprocess import time -import yaml +import argparse +import functest.utils.functest_logger as ft_logger +import functest.utils.functest_utils as functest_utils +import functest.utils.openstack_utils as os_utils import keystoneclient.v2_0.client as ksclient import novaclient.client as nvclient +import requests from neutronclient.v2_0 import client as ntclient from clearwater import clearwater from orchestrator import orchestrator -import functest.utils.functest_logger as ft_logger -import functest.utils.functest_utils as functest_utils -import functest.utils.openstack_utils as os_utils - - pp = pprint.PrettyPrinter(indent=4) @@ -54,9 +51,7 @@ if not os.path.exists(REPO_PATH): logger.error("Functest repository directory not found '%s'" % REPO_PATH) exit(-1) -with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: - functest_yaml = yaml.safe_load(f) -f.close() +functest_yaml = functest_utils.get_functest_yaml() # Cloudify parameters VIMS_DIR = (REPO_PATH + diff --git a/testcases/vnf/vRNC/parser.py b/testcases/vnf/vRNC/parser.py index a895ef8d..37e84d87 100755 --- a/testcases/vnf/vRNC/parser.py +++ b/testcases/vnf/vRNC/parser.py @@ -14,11 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import os import time -import yaml -import argparse +import argparse import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as functest_utils @@ -28,8 +26,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') PARSER_REPO = dirs.get('dir_repo_parser') |