From 4a803db9fa32c42559306da22beaab437d664fdc Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Wed, 31 Aug 2016 10:22:33 +0800 Subject: 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 (cherry picked from commit f4d0a05011e961a363c6d99522684ecdeb959716) --- testcases/vnf/vIMS/vIMS.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'testcases/vnf/vIMS') diff --git a/testcases/vnf/vIMS/vIMS.py b/testcases/vnf/vIMS/vIMS.py index 66911c1d8..7a96c94e1 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 + -- cgit 1.2.3-korg