diff options
Diffstat (limited to 'functest/opnfv_tests/vnf')
| -rw-r--r-- | functest/opnfv_tests/vnf/ims/clearwater_ims_base.py | 7 | ||||
| -rwxr-xr-x | functest/opnfv_tests/vnf/ims/orchestra_ims.py | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py index a645dfb2..c1a35be3 100644 --- a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py +++ b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py @@ -9,6 +9,7 @@ import json import logging import os +import pkg_resources import shutil import requests @@ -27,10 +28,8 @@ class ClearwaterOnBoardingBase(vnf.VnfOnBoarding): def __init__(self, **kwargs): self.logger = logging.getLogger(__name__) super(ClearwaterOnBoardingBase, self).__init__(**kwargs) - self.case_dir = os.path.join( - CONST.__getattribute__('dir_functest_test'), - 'vnf', - 'ims') + self.case_dir = pkg_resources.resource_filename( + 'functest', 'opnfv_tests/vnf/ims') self.data_dir = CONST.__getattribute__('dir_ims_data') self.result_dir = os.path.join(CONST.__getattribute__('dir_results'), self.case_name) diff --git a/functest/opnfv_tests/vnf/ims/orchestra_ims.py b/functest/opnfv_tests/vnf/ims/orchestra_ims.py index a5d2a922..207d6a67 100755 --- a/functest/opnfv_tests/vnf/ims/orchestra_ims.py +++ b/functest/opnfv_tests/vnf/ims/orchestra_ims.py @@ -10,6 +10,7 @@ import json import logging import os +import pkg_resources import socket import sys import time @@ -76,9 +77,8 @@ class ImsVnf(vnf.VnfOnBoarding): self.ob_port = "8080" self.ob_ip = "localhost" self.ob_instance_id = "" - self.case_dir = os.path.join( - CONST.__getattribute__('dir_functest_test'), - 'vnf/ims/') + self.case_dir = pkg_resources.resource_filename( + 'functest', 'opnfv_tests/vnf/ims/') self.data_dir = CONST.__getattribute__('dir_ims_data') self.test_dir = CONST.__getattribute__('dir_repo_vims_test') self.ob_projectid = "" |