summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Provoost <luc.provoost@intel.com>2020-08-20 18:03:11 +0200
committerLuc Provoost <luc.provoost@intel.com>2020-08-20 18:06:00 +0200
commitba394f91bd74cd2f0dac04dfbcece5b3cb461f3e (patch)
tree884a89638e0176b28d2a3f52948841bd79381071
parent7610183ab984f1ffb362f0ffff95ba3b7efe4dd1 (diff)
Allow latency thresholds for TST009 testing
Even if the latency thresholds were defined in the TST009 test files, the values were ignored and replaced by 'inf', whcih means the thresholds were not taken into account to define a successful step. If the thresholds are not defined in the test files, they are still set to 'inf'. Change-Id: I9559f05fb6066ab8759900abe3eb53ff4662e510 Signed-off-by: Luc Provoost <luc.provoost@intel.com>
-rw-r--r--VNFs/DPPD-PROX/helper-scripts/rapid/rapid_flowsizetest.py3
-rw-r--r--VNFs/DPPD-PROX/helper-scripts/rapid/rapid_parser.py4
2 files changed, 4 insertions, 3 deletions
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_flowsizetest.py b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_flowsizetest.py
index c90630e..e540508 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_flowsizetest.py
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_flowsizetest.py
@@ -49,9 +49,6 @@ class FlowSizeTest(RapidTest):
self.test['TST009_S']= []
for m in range(0, self.test['TST009_n']):
self.test['TST009_S'].append((m+1) * self.test['stepsize'])
- self.test['lat_avg_threshold'] = inf
- self.test['lat_perc_threshold'] = inf
- self.test['lat_max_threshold'] = inf
elif self.test['test'] == 'fixed_rate':
for key in['drop_rate_threshold','lat_avg_threshold',
'lat_perc_threshold','lat_max_threshold']:
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_parser.py b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_parser.py
index 5c79c2c..d0a579b 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_parser.py
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_parser.py
@@ -81,6 +81,10 @@ class RapidConfigParser(object):
if test['test'] in ['flowsizetest','TST009test']:
if 'drop_rate_threshold' not in test.keys():
test['drop_rate_threshold'] = 0
+ latency_thresholds = ['lat_avg_threshold','lat_perc_threshold','lat_max_threshold']
+ for threshold in latency_thresholds:
+ if threshold not in test.keys():
+ test[threshold] = 'inf'
test_params['tests'] = tests
if test_params['required_number_of_test_machines'] > test_params[
'total_number_of_machines']: