From b582e4a5be0bcc3521cc239a31f681a11f4504db Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Thu, 1 Sep 2016 10:19:58 +0800 Subject: stop hardcoded FUNCTEST_REPO path everywhere functest repo is used by almost every testcase, each place we get it like: REPOS_DIR = os.getenv('repos_dir') FUNCTEST_REPO = ("%s/functest" % REPOS_DIR) provide a common interface in functest_util.py JIRA: FUNCTEST-453 Change-Id: Ie0635dacc761ed2d05b7e606530368844f32ebaf Signed-off-by: SerenaFeng (cherry picked from commit 470f573a3ac2eb1783efec6da01a3bee33360c65) --- testcases/vnf/vIMS/vIMS.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'testcases/vnf/vIMS') diff --git a/testcases/vnf/vIMS/vIMS.py b/testcases/vnf/vIMS/vIMS.py index 7a96c94e1..ffcd09b84 100755 --- a/testcases/vnf/vIMS/vIMS.py +++ b/testcases/vnf/vIMS/vIMS.py @@ -25,6 +25,7 @@ import functest.utils.openstack_utils as os_utils import keystoneclient.v2_0.client as ksclient import novaclient.client as nvclient import requests +from functest.utils.functest_utils import FUNCTEST_REPO as REPO_PATH from neutronclient.v2_0 import client as ntclient from clearwater import clearwater @@ -46,15 +47,11 @@ args = parser.parse_args() """ logging configuration """ logger = ft_logger.Logger("vIMS").getLogger() -REPO_PATH = os.environ['repos_dir'] + '/functest/' -if not os.path.exists(REPO_PATH): - logger.error("Functest repository directory not found '%s'" % REPO_PATH) - exit(-1) functest_yaml = functest_utils.get_functest_yaml() # Cloudify parameters -VIMS_DIR = (REPO_PATH + +VIMS_DIR = (REPO_PATH + '/' + functest_yaml.get("general").get("directories").get("dir_vIMS")) VIMS_DATA_DIR = functest_yaml.get("general").get( "directories").get("dir_vIMS_data") + "/" -- cgit 1.2.3-korg