diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-06-18 23:43:51 +0200 |
---|---|---|
committer | jose.lausuch <jose.lausuch@ericsson.com> | 2017-06-20 15:12:04 +0200 |
commit | 997a42438f2253aa9fe640c1cbdd8ea461901948 (patch) | |
tree | 2c72fe095e3770282547635b4ce387b9a2dae571 /functest/opnfv_tests/vnf | |
parent | 0914c7e7011b7ba3ed9eeae7f6c3605afb711640 (diff) |
Remove all references to /home/opnfv/repos/functest
It also removes relative (and incomplete) references which could be
defined in modules instead of this global configuration.
Change-Id: Ie20dc3547e49b6224aa8100cd380d37b87ece5a9
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
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 = "" |