fix: IPV6 packet generation, packet loss reporting

[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 bebc748..5c79c2c 100644 (file)
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_parser.py
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_parser.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 ##
-## Copyright (c) 2010-2020 Intel Corporation
+## Copyright (c) 2020 Intel Corporation
 ##
 ## Licensed under the Apache License, Version 2.0 (the "License");
 ## you may not use this file except in compliance with the License.
@@ -33,25 +33,29 @@ class RapidConfigParser(object):
     def parse_config(test_params):
         testconfig = configparser.RawConfigParser()
         testconfig.read(test_params['test_file'])
-        test_params['required_number_of_test_machines'] = int(testconfig.get('TestParameters', 'total_number_of_test_machines'))
-        test_params['number_of_tests'] = int(testconfig.get('TestParameters', 'number_of_tests'))
+        test_params['required_number_of_test_machines'] = int(testconfig.get(
+            'TestParameters', 'total_number_of_test_machines'))
+        test_params['number_of_tests'] = int(testconfig.get('TestParameters',
+            'number_of_tests'))
         test_params['TestName'] = testconfig.get('TestParameters', 'name')
         if testconfig.has_option('TestParameters', 'lat_percentile'):
-            test_params['lat_percentile'] = old_div(float(testconfig.get('TestParameters', 'lat_percentile')),100.0)
+            test_params['lat_percentile'] = old_div(float(
+                testconfig.get('TestParameters', 'lat_percentile')),100.0)
         else:
             test_params['lat_percentile'] = 0.99
-        RapidLog.info('Latency percentile measured at {:.0f}%'.format(test_params['lat_percentile']*100))
+        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')
         test_params['key'] = config.get('ssh', 'key')
         test_params['user'] = config.get('ssh', 'user')
-        test_params['total_number_of_machines'] = int(config.get('rapid', 'total_number_of_machines'))
-        if config.has_option('TestParameters', 'pushgateway'):
-            test_params['pushgateway'] = config.get('TestParameters', 'pushgateway')
-            RapidLog.info('Measurements will be pushed to %s'%test_params['pushgateway'])
-        else:
-            test_params['pushgateway'] = None
+        test_params['total_number_of_machines'] = int(config.get('rapid',
+            'total_number_of_machines'))
         tests = []
         test = {}
         for test_index in range(1, test_params['number_of_tests']+1):
@@ -59,12 +63,16 @@ class RapidConfigParser(object):
             section = 'test%d'%test_index
             options = testconfig.options(section)
             for option in options:
-                if option in ['packetsizes','flows']:
-                    test[option] = ast.literal_eval(testconfig.get(section, option))
-                    test[option] = [int(i) for i in test[option]]
-                elif option in ['maxframespersecondallingress','stepsize']:
+                if option in ['imix','imixs','flows']:
+                    test[option] = ast.literal_eval(testconfig.get(section,
+                        option))
+                elif option in ['maxframespersecondallingress','stepsize',
+                        'flowsize']:
                     test[option] = int(testconfig.get(section, option))
-                elif option in ['startspeed','drop_rate_threshold','lat_avg_threshold','lat_perc_threshold','lat_max_threshold','accuracy','maxr','maxz','pass_threshold']:
+                elif option in ['startspeed', 'step', 'drop_rate_threshold',
+                        'lat_avg_threshold','lat_perc_threshold',
+                        'lat_max_threshold','accuracy','maxr','maxz',
+                        'pass_threshold']:
                     test[option] = float(testconfig.get(section, option))
                 else:
                     test[option] = testconfig.get(section, option)
@@ -74,7 +82,8 @@ class RapidConfigParser(object):
                 if 'drop_rate_threshold' not in test.keys():
                     test['drop_rate_threshold'] = 0
         test_params['tests'] = tests
-        if test_params['required_number_of_test_machines'] > test_params['total_number_of_machines']:
+        if test_params['required_number_of_test_machines'] > test_params[
+                'total_number_of_machines']:
             RapidLog.exception("Not enough VMs for this test: %d needed and only %d available" % (required_number_of_test_machines,total_number_of_machines))
             raise Exception("Not enough VMs for this test: %d needed and only %d available" % (required_number_of_test_machines,total_number_of_machines))
         machine_map = configparser.RawConfigParser()
@@ -83,14 +92,19 @@ class RapidConfigParser(object):
         machine = {}
         for test_machine in range(1, test_params['required_number_of_test_machines']+1):
             machine.clear()
-            if not(testconfig.has_option('TestM%d'%test_machine, 'prox_socket') and not testconfig.getboolean('TestM%d'%test_machine, 'prox_socket')):
+            if not(testconfig.has_option('TestM%d'%test_machine, 'prox_socket')
+                    and not testconfig.getboolean('TestM%d'%test_machine,
+                        'prox_socket')):
                 section = 'TestM%d'%test_machine
                 options = testconfig.options(section)
                 for option in options:
                     if option in ['prox_socket','prox_launch_exit','monitor']:
                         machine[option] = testconfig.getboolean(section, option)
                     elif option in ['cores', 'gencores','latcores']:
-                        machine[option] = ast.literal_eval(testconfig.get(section, option))
+                        machine[option] = ast.literal_eval(testconfig.get(
+                            section, option))
+                    elif option in ['bucket_size_exp']:
+                        machine[option] = int(testconfig.get(section, option))
                     else:
                         machine[option] = testconfig.get(section, option)
                     for key in ['prox_socket','prox_launch_exit']:
@@ -98,7 +112,8 @@ class RapidConfigParser(object):
                            machine[key] = True
                 if 'monitor' not in machine.keys():
                     machine['monitor'] = True
-                index = int(machine_map.get('TestM%d'%test_machine, 'machine_index'))
+                index = int(machine_map.get('TestM%d'%test_machine,
+                    'machine_index'))
                 section = 'M%d'%index
                 options = config.options(section)
                 for option in options:
@@ -126,7 +141,7 @@ class RapidConfigParser(object):
                 while True:
                     gw_ip_key = 'dp_ip{}'.format(index)
                     if gw_ip_key in machines[int(machine['gw_vm'])-1].keys():
-                        gw_ip = machines[int(machine['dest_vm'])-1][gw_ip_key]
+                        gw_ip = machines[int(machine['gw_vm'])-1][gw_ip_key]
                         gw_ips.append(gw_ip)
                         index += 1
                     else: