diff options
| author |   John O Loughlin <john.oloughlin@intel.com> | 2018-10-24 15:36:36 +0100 |
|---|---|---|
| committer | John O'Loughlin <john.oloughlin@intel.com> | 2018-11-14 15:12:37 +0000 |
| commit | c2a8982e943aff22945884fa3f7c9218a1dd5e0c (patch) | |
| tree | a0200a83f5bde32dc04dd743e3947fa3b3df9384 /yardstick/network_services/vnf_generic/vnf/sample_vnf.py | |
| parent | 74d047ead13b106cba007c089c111bfca51e8dac (diff) | |
Add option to pass config file to vPE
Yardstick should not generate config files for vPE.
The current autogenerated configfile is incorrect.
Therefore this patch is removing the auto-generation functionality.
JIRA: YARDSTICK-1473
Change-Id: I9d909fcd0ac517d5ccdefb024c89b6bf979ef9c0
Signed-off-by: John O Loughlin <john.oloughlin@intel.com>
Diffstat (limited to 'yardstick/network_services/vnf_generic/vnf/sample_vnf.py')
| -rw-r--r-- | yardstick/network_services/vnf_generic/vnf/sample_vnf.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/yardstick/network_services/vnf_generic/vnf/sample_vnf.py b/yardstick/network_services/vnf_generic/vnf/sample_vnf.py index b2c5a98bc..673344f4e 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): + def _build_pipeline_kwargs(self, cfg_file=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 @@ -200,7 +200,7 @@ class DpdkVnfSetupEnvHelper(SetupEnvHelper): hwlb = ' --hwlb %s' % worker_threads self.pipeline_kwargs = { - 'cfg_file': self.CFG_CONFIG, + 'cfg_file': cfg_file if cfg_file else self.CFG_CONFIG, 'script': self.CFG_SCRIPT, 'port_mask_hex': ports_mask_hex, 'tool_path': tool_path, |