ramp generator traffic & prox.log copy

[samplevnf.git] / VNFs / DPPD-PROX / helper-scripts / rapid / rapid_parser.py

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_parser.py b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_parser.py
index bdf2703..289d836 100644 (file)
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_parser.py
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_parser.py
@@ -45,6 +45,10 @@ class RapidConfigParser(object):
             test_params['lat_percentile'] = 0.99
         RapidLog.info('Latency percentile at {:.0f}%'.format(
             test_params['lat_percentile']*100))
+        if testconfig.has_option('TestParameters', 'ipv6'):
+            test_params['ipv6'] = testconfig.getboolean('TestParameters','ipv6')
+        else:
+            test_params['ipv6'] = False
         config = configparser.RawConfigParser()
         config.read(test_params['environment_file'])
         test_params['vim_type'] = config.get('Varia', 'vim')
@@ -62,14 +66,13 @@ class RapidConfigParser(object):
                 if option in ['imix','imixs','flows']:
                     test[option] = ast.literal_eval(testconfig.get(section,
                         option))
-#                    test[option] = [int(i) for i in test[option]]
                 elif option in ['maxframespersecondallingress','stepsize',
                         'flowsize']:
                     test[option] = int(testconfig.get(section, option))
                 elif option in ['startspeed', 'step', 'drop_rate_threshold',
                         'lat_avg_threshold','lat_perc_threshold',
                         'lat_max_threshold','accuracy','maxr','maxz',
-                        'pass_threshold']:
+                        'pass_threshold','ramp_step']:
                     test[option] = float(testconfig.get(section, option))
                 else:
                     test[option] = testconfig.get(section, option)
@@ -78,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']: