summaryrefslogtreecommitdiffstats
path: root/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_generator_machine.py
diff options
context:
space:
mode:
authorLuc Provoost <luc.provoost@intel.com>2021-01-27 17:18:31 +0100
committerLuc Provoost <luc.provoost@intel.com>2021-01-27 17:26:50 +0100
commit75198fcb02fcb5aa5fbfee92e9df6e4f8b25792b (patch)
tree336a8ba2930035776a26eba5b0e3286dd1eb6026 /VNFs/DPPD-PROX/helper-scripts/rapid/rapid_generator_machine.py
parentcee5ad40ee80a34b30242657e1670a02263f4f87 (diff)
creation of tests and configs subdirectories
All test files are now in the tests directory. All PROX config files moved to the configs directory. When specifying a test on the runrapid.py command line, you should now also mention the directory: e.g. --test tests/basicrapid.test In these test files, you need now to also include the configs subdirectory when specifying the prox configuration that needs to be used. The --map parameter has also changed. It can still take the file name of the map file, that specifies which PROX instance to use during a test. On top of that, you can now also specify a list of indices of the machines to be used during a test: e.g. --map [1,3]. Change-Id: I887cba59834dd8c903a22bc80959b10da2775398 Signed-off-by: Luc Provoost <luc.provoost@intel.com>
Diffstat (limited to 'VNFs/DPPD-PROX/helper-scripts/rapid/rapid_generator_machine.py')
-rw-r--r--VNFs/DPPD-PROX/helper-scripts/rapid/rapid_generator_machine.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_generator_machine.py b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_generator_machine.py
index 99cb361e..eb611bf6 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_generator_machine.py
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_generator_machine.py
@@ -81,7 +81,7 @@ class RapidGeneratorMachine(RapidMachine):
return (self.machine_params['gencores'] +
self.machine_params['latcores'])
- def generate_lua(self, vim):
+ def generate_lua(self, vim, prox_config_file):
appendix = 'gencores="%s"\n'% ','.join(map(str,
self.machine_params['gencores']))
appendix = appendix + 'latcores="%s"\n'% ','.join(map(str,
@@ -103,7 +103,7 @@ class RapidGeneratorMachine(RapidMachine):
'heartbeat="%s"\n'% self.machine_params['heartbeat'])
else:
appendix = appendix + 'heartbeat="60"\n'
- super().generate_lua(vim, appendix)
+ super().generate_lua(vim, prox_config_file, appendix)
def start_prox(self):
# Start the generator with the -e option so that the cores don't