From 43cff53a4970d161e547c73a97bfbd33a1149d49 Mon Sep 17 00:00:00 2001 From: "Sridhar K. N. Rao" Date: Mon, 19 Jul 2021 17:56:44 +0530 Subject: Changes from ViNePerf This patch adds changes to support using rapid to run tests only. 1. Fix format.yaml path. Add format.yaml as datafile in setup.cfg 2. Do not call generate lua if starting prox is not required. 3. Move logs to results directory - if present 4. Machines should not be used in del, if not created. Fix syntax error. Signed-off-by: Sridhar K. N. Rao Change-Id: I580716573d0be2a8da02035f4d180e81b63b3fc8 --- .../helper-scripts/rapid/rapid_machine.py | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'VNFs/DPPD-PROX/helper-scripts/rapid/rapid_machine.py') diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_machine.py b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_machine.py index c4b7247f..e46e46ef 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_machine.py +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_machine.py @@ -197,18 +197,18 @@ class RapidMachine(object): self.remap_all_cpus() _, prox_config_file_name = os.path.split(self. machine_params['config_file']) - self.generate_lua() - self._client.scp_put(self.machine_params['config_file'], '{}/{}'. - format(self.rundir, prox_config_file_name)) - if ((not self.configonly) and - self.machine_params['prox_launch_exit']): - cmd = 'sudo {}/prox {} -t -o cli -f {}/{}'.format(self.rundir, - autostart, self.rundir, prox_config_file_name) - RapidLog.debug("Starting PROX on {}: {}".format(self.name, - cmd)) - result = self._client.run_cmd(cmd) - RapidLog.debug("Finished PROX on {}: {}".format(self.name, - cmd)) + if self.machine_params['prox_launch_exit']: + self.generate_lua() + self._client.scp_put(self.machine_params['config_file'], '{}/{}'. + format(self.rundir, prox_config_file_name)) + if not self.configonly: + cmd = 'sudo {}/prox {} -t -o cli -f {}/{}'.format(self.rundir, + autostart, self.rundir, prox_config_file_name) + RapidLog.debug("Starting PROX on {}: {}".format(self.name, + cmd)) + result = self._client.run_cmd(cmd) + RapidLog.debug("Finished PROX on {}: {}".format(self.name, + cmd)) def close_prox(self): if (not self.configonly) and self.machine_params[ -- cgit 1.2.3-korg