diff options
| author |   SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-09-01 10:19:58 +0800 |
|---|---|---|
| committer |   Morgan Richomme <morgan.richomme@orange.com> | 2016-09-02 08:10:45 +0000 |
| commit | b582e4a5be0bcc3521cc239a31f681a11f4504db (patch) | |
| tree | b36928805f35e2d2d55c3e3057db6ebf10a89001 /testcases/vnf/vIMS/vIMS.py | |
| parent | f62e61cb31e3a39026c4f0bbdb6d6b4a1aebc2f3 (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>
(cherry picked from commit 470f573a3ac2eb1783efec6da01a3bee33360c65)
Diffstat (limited to 'testcases/vnf/vIMS/vIMS.py')
| -rwxr-xr-x | testcases/vnf/vIMS/vIMS.py | 7 |
1 files changed, 2 insertions, 5 deletions
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") + "/" |