diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-07-17 18:00:37 +0200 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-07-30 02:22:38 +0200 |
commit | 1eb9273dd8843a282e1e2840fb136db0c2ab69f6 (patch) | |
tree | 92873383989173f9339546acdd83999e57625602 /functest/opnfv_tests/vnf/router/vrouter_base.py | |
parent | 86497fd200578650160fdcada935cfc631343800 (diff) |
Leverage vyos_vrouter on Cloudify
It also stop rebooting the VMs.
Change-Id: Ib0f9e1aac1dd8505378b0688930eb41a590a11f1
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit e2fe0591bcfc462a91c028a857d967f4b9832bbe)
Diffstat (limited to 'functest/opnfv_tests/vnf/router/vrouter_base.py')
-rw-r--r-- | functest/opnfv_tests/vnf/router/vrouter_base.py | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/functest/opnfv_tests/vnf/router/vrouter_base.py b/functest/opnfv_tests/vnf/router/vrouter_base.py index 8818032da..fe3058f01 100644 --- a/functest/opnfv_tests/vnf/router/vrouter_base.py +++ b/functest/opnfv_tests/vnf/router/vrouter_base.py @@ -19,30 +19,24 @@ import time import pkg_resources -import functest.core.vnf as vnf from functest.utils import config from functest.opnfv_tests.vnf.router.test_controller import function_test_exec -from functest.opnfv_tests.vnf.router.utilvnf import Utilvnf __author__ = "Shuya Nakama <shuya.nakama@okinawaopenlabs.org>" -REBOOT_WAIT = 30 - -class VrouterOnBoardingBase(vnf.VnfOnBoarding): +class VrouterOnBoardingBase(object): """vrouter testing base class""" - def __init__(self, **kwargs): + def __init__(self, case_name, util, util_info): self.logger = logging.getLogger(__name__) - super(VrouterOnBoardingBase, self).__init__(**kwargs) self.case_dir = pkg_resources.resource_filename( 'functest', 'opnfv_tests/vnf/router') self.data_dir = getattr(config.CONF, 'dir_router_data') - self.result_dir = os.path.join(getattr(config.CONF, 'dir_results'), - self.case_name) - self.util = Utilvnf() - self.util_info = {} - + self.result_dir = os.path.join( + getattr(config.CONF, 'dir_results'), case_name) + self.util = util + self.util_info = util_info self.vnf_list = [] if not os.path.exists(self.data_dir): @@ -65,9 +59,9 @@ class VrouterOnBoardingBase(vnf.VnfOnBoarding): test_list = function_test["test_list"] target_vnf_name = function_test["target_vnf_name"] for test_info in test_list: - self.logger.info(test_info["protocol"] + " " + - test_info["test_kind"] + - " test.") + self.logger.info( + "%s %s test.", test_info["protocol"], + test_info["test_kind"]) (result, result_data) = self.function_test_vrouter( target_vnf_name, test_info) test_result_data_list.append(result_data) @@ -89,10 +83,6 @@ class VrouterOnBoardingBase(vnf.VnfOnBoarding): vnf_info_list = self.get_vnf_info_list(target_vnf_name) self.vnf_list = vnf_info_list - self.logger.debug("request vnf's reboot.") - self.util.request_vnf_reboot(vnf_info_list) - time.sleep(REBOOT_WAIT) - target_vnf = self.util.get_target_vnf(vnf_info_list) reference_vnf_list = self.util.get_reference_vnf_list(vnf_info_list) @@ -117,6 +107,7 @@ class VrouterOnBoardingBase(vnf.VnfOnBoarding): return result, test_result_data def get_vnf_info_list(self, target_vnf_name): - # pylint: disable=unused-argument,no-self-use - vnf_info_list = [] - return vnf_info_list + return self.util.get_vnf_info_list( + self.util_info["cfy_manager_ip"], + self.util_info["deployment_name"], + target_vnf_name) |