diff options
Diffstat (limited to 'functest/opnfv_tests/sdn/onos')
| -rw-r--r-- | functest/opnfv_tests/sdn/onos/onos.py | 5 | ||||
| -rw-r--r-- | functest/opnfv_tests/sdn/onos/teston/adapters/foundation.py | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/functest/opnfv_tests/sdn/onos/onos.py b/functest/opnfv_tests/sdn/onos/onos.py index adcb4166..08ba4da3 100644 --- a/functest/opnfv_tests/sdn/onos/onos.py +++ b/functest/opnfv_tests/sdn/onos/onos.py @@ -9,6 +9,7 @@ import logging import os +import pkg_resources import re import subprocess import shutil @@ -27,8 +28,8 @@ class OnosBase(testcase.TestCase): onos_sfc_image_path = os.path.join( CONST.__getattribute__('dir_functest_images'), CONST.__getattribute__('onos_sfc_image_file_name')) - onos_sfc_path = os.path.join(CONST.__getattribute__('dir_repo_functest'), - CONST.__getattribute__('dir_onos_sfc')) + onos_sfc_path = pkg_resources.resource_filename( + 'functest', 'opnfv_tests/sdn/onos/sfc') installer_type = CONST.__getattribute__('INSTALLER_TYPE') logger = logging.getLogger(__name__) diff --git a/functest/opnfv_tests/sdn/onos/teston/adapters/foundation.py b/functest/opnfv_tests/sdn/onos/teston/adapters/foundation.py index f9eee7af..aed98ee4 100644 --- a/functest/opnfv_tests/sdn/onos/teston/adapters/foundation.py +++ b/functest/opnfv_tests/sdn/onos/teston/adapters/foundation.py @@ -18,7 +18,6 @@ import re import time from functest.utils.constants import CONST -import functest.utils.functest_utils as ft_utils class Foundation(object): @@ -55,7 +54,7 @@ class Foundation(object): """ Get Default Parameters value """ - self.Result_DB = ft_utils.get_db_url() + self.Result_DB = CONST.__getattribute__("results_test_db_url") self.masterusername = CONST.__getattribute__('ONOS_onosbench_username') self.masterpassword = CONST.__getattribute__('ONOS_onosbench_password') self.agentusername = CONST.__getattribute__('ONOS_onoscli_username') |