summaryrefslogtreecommitdiffstats
path: root/testcases/vnf/vIMS
diff options
context:
space:
mode:
authorSerenaFeng <feng.xiaowei@zte.com.cn>2016-09-01 10:19:58 +0800
committerSerenaFeng <feng.xiaowei@zte.com.cn>2016-09-01 16:44:18 +0800
commit470f573a3ac2eb1783efec6da01a3bee33360c65 (patch)
tree859f4bbd7afc35ce2a8ca33b0bc570f7f32c5724 /testcases/vnf/vIMS
parentc94a1c01e46b21f0139a8b1419f26c8b9f867a41 (diff)
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 <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'testcases/vnf/vIMS')
-rwxr-xr-xtestcases/vnf/vIMS/vIMS.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/testcases/vnf/vIMS/vIMS.py b/testcases/vnf/vIMS/vIMS.py
index 634a17952..b72e4cd81 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") + "/"