From 9e3f6bd7080c1b39b51047a97a9f0907d8658d05 Mon Sep 17 00:00:00 2001 From: John O Loughlin Date: Thu, 15 Nov 2018 11:19:37 +0000 Subject: Add option to allow user to pass vpe_script Add option to allow user to pass their own vpe_script vpe_script will be auto-generated by default. To use your own config file use the 'script' parameter in the config file vnf_config: { file: './vpe_config/vpe_config_2_ports', action_bulk_file: './vpe_config/action_bulk_512.txt', full_tm_profile_file: './vpe_config/full_tm_profile_10G.cfg', script_file: './vpe_config/vpe_script_sample } JIRA: YARDSTICK-1525 Change-Id: Ie23e5705f4c0475e858be73b8a504a7df8898828 Signed-off-by: John O Loughlin --- yardstick/network_services/vnf_generic/vnf/sample_vnf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'yardstick/network_services/vnf_generic/vnf/sample_vnf.py') diff --git a/yardstick/network_services/vnf_generic/vnf/sample_vnf.py b/yardstick/network_services/vnf_generic/vnf/sample_vnf.py index 673344f4e..1cb5cdd8f 100644 --- a/yardstick/network_services/vnf_generic/vnf/sample_vnf.py +++ b/yardstick/network_services/vnf_generic/vnf/sample_vnf.py @@ -180,7 +180,7 @@ class DpdkVnfSetupEnvHelper(SetupEnvHelper): """No actions/rules (flows) by default""" return None - def _build_pipeline_kwargs(self, cfg_file=None): + def _build_pipeline_kwargs(self, cfg_file=None, script=None): tool_path = self.ssh_helper.provision_tool(tool_file=self.APP_NAME) # count the number of actual ports in the list of pairs # remove duplicate ports @@ -201,7 +201,7 @@ class DpdkVnfSetupEnvHelper(SetupEnvHelper): self.pipeline_kwargs = { 'cfg_file': cfg_file if cfg_file else self.CFG_CONFIG, - 'script': self.CFG_SCRIPT, + 'script': script if script else self.CFG_SCRIPT, 'port_mask_hex': ports_mask_hex, 'tool_path': tool_path, 'hwlb': hwlb, -- cgit 1.2.3-korg