diff options
author | 2016-09-07 14:49:50 +0000 | |
---|---|---|
committer | 2016-09-07 14:49:50 +0000 | |
commit | 227afb8285b8f178987a7d6eb1d28a74201a5d1b (patch) | |
tree | 2501ab95b10e2958f93f6db7eba5fba66c136dd2 /testcases/vnf/vIMS/vIMS.py | |
parent | 800d0ed2c883a51122b7fa1aa4d9d86405ae5416 (diff) | |
parent | f3381f49cc72fded67c1febe78b27e18ec396878 (diff) |
Merge "remove imported FUNCTEST_REPO object"
Diffstat (limited to 'testcases/vnf/vIMS/vIMS.py')
-rwxr-xr-x | testcases/vnf/vIMS/vIMS.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/testcases/vnf/vIMS/vIMS.py b/testcases/vnf/vIMS/vIMS.py index b72e4cd8..c9b1c9ce 100755 --- a/testcases/vnf/vIMS/vIMS.py +++ b/testcases/vnf/vIMS/vIMS.py @@ -19,15 +19,14 @@ import subprocess import time 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 functest.utils.functest_utils import FUNCTEST_REPO as REPO_PATH from neutronclient.v2_0 import client as ntclient +import functest.utils.functest_logger as ft_logger +import functest.utils.functest_utils as functest_utils +import functest.utils.openstack_utils as os_utils from clearwater import clearwater from orchestrator import orchestrator @@ -51,7 +50,7 @@ logger = ft_logger.Logger("vIMS").getLogger() functest_yaml = functest_utils.get_functest_yaml() # Cloudify parameters -VIMS_DIR = (REPO_PATH + '/' + +VIMS_DIR = (functest_utils.FUNCTEST_REPO + '/' + functest_yaml.get("general").get("directories").get("dir_vIMS")) VIMS_DATA_DIR = functest_yaml.get("general").get( "directories").get("dir_vIMS_data") + "/" |