diff options
| author |   Volodymyr Mytnyk <volodymyrx.mytnyk@intel.com> | 2018-12-11 10:21:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-12-11 10:21:10 +0000 |
| commit | edb66ef37f9d89a783f3eda15d82d6fcebd7598e (patch) | |
| tree | 90ceaba0e1bd59777b0f2ec412cb148adfdf9cf5 /yardstick/network_services/vnf_generic/vnf/sample_vnf.py | |
| parent | 379cf1993914bb3aa1e0ce51e8d7d55422f1fc33 (diff) | |
| parent | 9e3f6bd7080c1b39b51047a97a9f0907d8658d05 (diff) | |
Merge "Add option to allow user to pass vpe_script"
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 ebe3ff774..8833b88f2 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, |