Merge "traffic: Configurable traffic details"

1 files changed, 56 insertions, 24 deletions

diff --git a/conf/integration/01_testcases.conf b/conf/integration/01_testcases.conf
index ff05186b..504b4458 100644
--- a/conf/integration/01_testcases.conf
+++ b/conf/integration/01_testcases.conf
@@ -25,15 +25,15 @@ SUPPORTED_TUNNELING_PROTO = ['vxlan', 'gre', 'geneve']
 #
 # Required for OP2P tests
 # "Tunnel Type": ["vxlan"|"gre"|"geneve"]   # Tunnel Type defines tunneling protocol to use.
-#                                   # It can be overridden by cli option tunnel_type.
+#                                   # It can be overridden by cli option TUNNEL_TYPE.
 #                                   # Values:
 #                                   #    "vxlan" - iteration of destination MAC address
 #                                   #    "gre" - iteration of destination IP address
 #                                   #    "geneve" - iteration of destination UDP port
 #                                   # Default value is "vxlan".
 #
-# biDirectional testing for OP2P is not yet supported.
-# biDirectional must be set to False.
+# bidirectional testing for OP2P is not yet supported.
+# TRAFFIC['bidir'] must be set to 'False'.
 #
 # "TestSteps": []                   # Definition of integration test steps.
 #                                   # In case that this list is defined, then
@@ -320,55 +320,75 @@ STEP_VSWITCH_2PHY_6VM_FINIT = [
 INTEGRATION_TESTS = [
     {
         "Name": "overlay_p2p_mod_tput",
-        "Traffic Type": "rfc2544_throughput",
         "Deployment": "ptunp",
-        "biDirectional": 'True',
         "Tunnel Type": "vxlan",
         "Description": ("Tunneling Throughput RFC2544 Test."
                        "The encap and decap are performed inside the "
                        "virtual switch itself in each direction to avoid "
                        "the need of ingress overlay traffic."),
-        "Parameters": {'TRAFFICGEN_IXNET_TCL_SCRIPT' : 'ixnetrfc2544v2.tcl'},
+        "Parameters": {
+            "TRAFFICGEN_IXNET_TCL_SCRIPT" : "ixnetrfc2544v2.tcl",
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2544_throughput",
+                "bidir" : "False",
+            },
+        },
     },
     {
         "Name": "overlay_p2p_tput",
-        "Traffic Type": "rfc2544_throughput",
         "Deployment": "op2p",
-        "biDirectional": 'False',
         "Tunnel Type": SUPPORTED_TUNNELING_PROTO[0],
         "Tunnel Operation": "encapsulation",
         "Description": "Overlay Encapsulation Throughput RFC2544 Test",
-        "Parameters": {'TRAFFICGEN_IXNET_TCL_SCRIPT' : 'ixnetrfc2544v2.tcl'},
+        "Parameters": {
+            "TRAFFICGEN_IXNET_TCL_SCRIPT" : "ixnetrfc2544v2.tcl",
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2544_throughput",
+                "bidir" : "False",
+            },
+        },
     },
     {
         "Name": "overlay_p2p_cont",
-        "Traffic Type": "rfc2544_continuous",
         "Deployment": "op2p",
-        "biDirectional": 'False',
         "Tunnel Type": SUPPORTED_TUNNELING_PROTO[0],
         "Tunnel Operation": "encapsulation",
         "Description": "Overlay Encapsulation RFC2544 Continuous Stream",
-        "Parameters": {'TRAFFICGEN_IXNET_TCL_SCRIPT' : 'ixnetrfc2544v2.tcl'},
+        "Parameters": {
+            "TRAFFICGEN_IXNET_TCL_SCRIPT" : "ixnetrfc2544v2.tcl",
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2544_continuous",
+                "bidir" : "False",
+            },
+        },
     },
     {
         "Name": "overlay_p2p_decap_tput",
-        "Traffic Type": "rfc2544_throughput",
         "Deployment": "op2p",
-        "biDirectional": 'False',
         "Tunnel Type": SUPPORTED_TUNNELING_PROTO[0],
         "Tunnel Operation": "decapsulation",
         "Description": "Overlay Decapsulation Throughput RFC2544 Test",
-        "Parameters": {'TRAFFICGEN_IXNET_TCL_SCRIPT' : 'ixnetrfc2544v2.tcl'},
+        "Parameters": {
+            "TRAFFICGEN_IXNET_TCL_SCRIPT" : "ixnetrfc2544v2.tcl",
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2544_throughput",
+                "bidir" : "False",
+            },
+        },
     },
     {
         "Name": "overlay_p2p_decap_cont",
-        "Traffic Type": "rfc2544_continuous",
         "Deployment": "op2p",
-        "biDirectional": 'False',
         "Tunnel Type": SUPPORTED_TUNNELING_PROTO[0],
         "Tunnel Operation": "decapsulation",
         "Description": "Overlay Decapsulation RFC2544 Continuous Stream",
-        "Parameters": {'TRAFFICGEN_IXNET_TCL_SCRIPT' : 'ixnetrfc2544v2.tcl'},
+        "Parameters": {
+            "TRAFFICGEN_IXNET_TCL_SCRIPT" : "ixnetrfc2544v2.tcl",
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2544_continuous",
+                "bidir" : "False",
+            },
+        },
     },
     {
         "Name": "vswitch_add_del_bridge",
@@ -758,8 +778,12 @@ INTEGRATION_TESTS = [
         "Name": "2pvp_udp_dest_flows",
         "Description": "RFC2544 Continuous TC with 2 Parallel VMs, flows on UDP Dest Port",
         "Deployment": "clean",
-        "Stream Type": "L4",
-        "MultiStream": 2,
+        "Parameters" : {
+            "TRAFFIC" : {
+                "multistream" : 2,
+                "stream_type" : "L4",
+            },
+        },
         "TestSteps": STEP_VSWITCH_2PHY_2VM_INIT +
             STEP_VSWITCH_2_PARALLEL_VM_FLOWS_INIT + [
             # Start 2 VMs
@@ -781,8 +805,12 @@ INTEGRATION_TESTS = [
         "Name": "4pvp_udp_dest_flows",
         "Description": "RFC2544 Continuous TC with 4 Parallel VMs, flows on UDP Dest Port",
         "Deployment": "clean",
-        "Stream Type": "L4",
-        "MultiStream": 4,
+        "Parameters" : {
+            "TRAFFIC" : {
+                "multistream" : 4,
+                "stream_type" : "L4",
+            },
+        },
         "TestSteps": STEP_VSWITCH_2PHY_4VM_INIT +
             STEP_VSWITCH_4_PARALLEL_VM_FLOWS_INIT + [
             # Start 4 VMs
@@ -808,8 +836,12 @@ INTEGRATION_TESTS = [
         "Name": "6pvp_udp_dest_flows",
         "Description": "RFC2544 Continuous TC with 6 Parallel VMs, flows on UDP Dest Port",
         "Deployment": "clean",
-        "Stream Type": "L4",
-        "MultiStream": 6,
+        "Parameters" : {
+            "TRAFFIC" : {
+                "multistream" : 6,
+                "stream_type" : "L4",
+            },
+        },
         "TestSteps": STEP_VSWITCH_2PHY_6VM_INIT +
             STEP_VSWITCH_6_PARALLEL_VM_FLOWS_INIT + [
             # Start VMs