Merge "traffic: Configurable traffic details"

1 files changed, 84 insertions, 88 deletions

diff --git a/conf/01_testcases.conf b/conf/01_testcases.conf
index a8d7a136..bdaeb4da 100755
--- a/conf/01_testcases.conf
+++ b/conf/01_testcases.conf
@@ -19,60 +19,12 @@
 #
 # "Name": "phy2phy_burst",         # A human-readable string identifying the
 #                                  # test.
-# "Traffic Type": "rfc2544_throughput",
-#                                  # One of the supported traffic types.
-#                                  # It can be overridden by cli option traffic_type.
 # "Deployment": "p2p",             # One of the supported deployment scenarios.
 # "Description": "Lorem ipsum..."  # Optional. A human-readable string
 #                                  # describing the test.
 # "Frame Modification": "vlan"     # One of the supported frame modifications:
 #                                  # vlan, mpls, mac, dscp, ttl, ip_addr,
 #                                  # ip_port.
-# "biDirectional": ["True"|"False"]
-#                                  # Specifies if generated traffic will be
-#                                  # full-duplex (True) or half-duplex (False)
-#                                  # It can be overridden by cli option bidirectional.
-#                                  # Default value is "False". Must be of type
-#                                  # string.
-# "MultiStream": 0-65535           # Optional. Defines number of flows simulated
-#                                  # by traffic generator. Value 0 disables
-#                                  # MultiStream feature
-#                                  # It can be overridden by cli option multistream.
-# "Stream Type": ["L2"|"L3"|"L4"]  # Optional. Stream Type is an extension
-#                                  # of the "MultiStream" feature. If MultiStream
-#                                  # is disabled, then Stream Type will be ignored.
-#                                  # Stream Type defines ISO OSI network layer
-#                                  # used for simulation of multiple streams.
-#                                  # It can be overridden by cli option stream_type.
-#                                  # Values:
-#                                  #    "L2" - iteration of destination MAC address
-#                                  #    "L3" - iteration of destination IP address
-#                                  #    "L4" - iteration of destination port
-#                                  #           of selected transport protocol
-#                                  # Default value is "L4".
-# "Pre-installed Flows": ["Yes"|"No"]
-#                                  # Optional. Pre-installed Flows is an extension
-#                                  # of the "MultiStream" feature. If MultiStream
-#                                  # is disabled, then Pre-installed Flows will be
-#                                  # ignored. It defines if stream specific flows
-#                                  # will be inserted into OVS or not.
-#                                  # It can be overridden by cli option
-#                                  # pre-installed_flows
-#                                  # Values:
-#                                  #    "Yes" - flows will be inserted into OVS
-#                                  #    "No"  - flows won't be inserted into OVS
-#                                  # Default value is "No".
-# "Flow Type": ["port"|"IP"]       # Optional. Defines flows complexity. In case
-#                                  # it isn't specified, then "port" will be used.
-#                                  # Values:
-#                                  #    "port" - flow is defined by ingress ports
-#                                  #    "IP"   - flow is defined by ingress ports
-#                                  #             and src and dst IP addresses
-# "iLoad": 0-100                   # Optional. Defines desired percentage
-#                                  # of frame rate used during continuous stream
-#                                  # tests. Can be overridden by cli option
-#                                  # iload.
-#                                  # Default value is 100.
 # "Load": dictionary               # Optional. Configures background load
 #                                  # during testcase execution.
 #   Description of "Load" dictionary keys, their meanings and available values:
@@ -115,7 +67,7 @@
 #                                  # stated in configuration files or value
 #                                  # specified on command line through --trafficgen
 #                                  # parameter.
-# "Parameters" : {'TRAFFICGEN_PKT_SIZES' : (512,)}
+# "Parameters" : {'TRAFFICGEN_PKT_SIZES' : (512,)},
 #                                  # Dictionary with testcase specific configuration
 #                                  # environment. Specified parameters will be modified
 #                                  # before the test execution and their original values will
@@ -129,128 +81,172 @@
 PERFORMANCE_TESTS = [
     {
         "Name": "phy2phy_tput",
-        "Traffic Type": "rfc2544_throughput",
         "Deployment": "p2p",
-        "biDirectional": "True",
         "Description": "LTD.Throughput.RFC2544.PacketLossRatio",
+        "Parameters" : {
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2544_throughput",
+            },
+        },
     },
     {
         "Name": "phy2phy_forwarding",
-        "Traffic Type": "rfc2889",
         "Deployment": "p2p",
-        "biDirectional": "True",
         "Description": "LTD.Forwarding.RFC2889.MaxForwardingRate",
+        "Parameters" : {
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2889",
+            },
+        },
     },
     {
         "Name": "back2back",
-        "Traffic Type": "rfc2544_back2back",
         "Deployment": "p2p",
-        "biDirectional": "True",
         "Description": "LTD.Throughput.RFC2544.BackToBackFrames",
+        "Parameters" : {
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2544_back2back",
+            },
+        },
     },
     {
         "Name": "phy2phy_tput_mod_vlan",
-        "Traffic Type": "rfc2544_throughput",
         "Deployment": "p2p",
         "Frame Modification": "vlan",
-        "biDirectional": "False",
-        "Description": "LTD.Throughput.RFC2544.PacketLossRatioFrameModification"
+        "Description": "LTD.Throughput.RFC2544.PacketLossRatioFrameModification",
+        "Parameters" : {
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2544_throughput",
+            },
+        },
     },
     {
         "Name": "phy2phy_cont",
-        "Traffic Type": "rfc2544_continuous",
         "Deployment": "p2p",
         "Description": "Phy2Phy Continuous Stream",
-        "biDirectional": "True",
-        "iLoad": "100",
+        "Parameters" : {
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2544_continuous",
+                "frame_rate" : 100,
+            },
+        },
     },
     {
         "Name": "pvp_cont",
-        "Traffic Type": "rfc2544_continuous",
         "Deployment": "pvp",
         "Description": "PVP Continuous Stream",
-        "biDirectional": "True",
-        "iLoad": "100",
+        "Parameters" : {
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2544_continuous",
+                "frame_rate" : 100,
+            },
+        },
     },
     {
         "Name": "pvvp_cont",
-        "Traffic Type": "rfc2544_continuous",
         "Deployment": "pvvp",
         "Description": "PVVP Continuous Stream",
-        "biDirectional": "True",
-        "iLoad": "100",
+        "Parameters" : {
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2544_continuous",
+                "frame_rate" : 100,
+            },
+        },
     },
     {
         "Name": "pvpv_cont",
-        "Traffic Type": "rfc2544_continuous",
         "Deployment": "pvpv",
         "Description": "Two VMs in parallel with Continuous Stream",
-        "biDirectional": "True",
-        "iLoad": "100",
+        "Parameters" : {
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2544_continuous",
+                "frame_rate" : 100,
+            },
+        },
     },
     {
         "Name": "phy2phy_scalability",
-        "Traffic Type": "rfc2544_throughput",
         "Deployment": "p2p",
-        "biDirectional": "True",
         "Description": "LTD.Scalability.Flows.RFC2544.0PacketLoss",
-        "MultiStream": "8000",
+        "Parameters" : {
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2544_throughput",
+                "multistream" : "8000",
+            },
+        },
     },
     {
         "Name": "pvp_tput",
-        "Traffic Type": "rfc2544_throughput",
         "Deployment": "pvp",
         "Description": "LTD.Throughput.RFC2544.PacketLossRatio",
-        "biDirectional": "True",
+        "Parameters" : {
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2544_throughput",
+            },
+        },
     },
     {
         "Name": "pvp_back2back",
-        "Traffic Type": "rfc2544_back2back",
         "Deployment": "pvp",
         "Description": "LTD.Throughput.RFC2544.BackToBackFrames",
-        "biDirectional": "True",
+        "Parameters" : {
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2544_back2back",
+            },
+        },
     },
     {
         "Name": "pvvp_tput",
-        "Traffic Type": "rfc2544_throughput",
         "Collector": "cpu",
         "Deployment": "pvvp",
         "Description": "LTD.Throughput.RFC2544.PacketLossRatio",
-        "biDirectional": "True",
+        "Parameters" : {
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2544_throughput",
+            },
+        },
     },
     {
         "Name": "pvvp_back2back",
-        "Traffic Type": "rfc2544_back2back",
         "Collector": "cpu",
         "Deployment": "pvvp",
         "Description": "LTD.Throughput.RFC2544.BackToBackFrames",
-        "biDirectional": "True",
+        "Parameters" : {
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2544_back2back",
+            },
+        },
     },
     {
         "Name": "phy2phy_cpu_load",
-        "Traffic Type": "rfc2544_throughput",
         "Deployment": "p2p",
-        "biDirectional": "True",
         "Description": "LTD.CPU.RFC2544.0PacketLoss",
         "Load" : {
             "tool" : "stress-ng",
             "load" : 100,
             "reserved" : 4,
             "pattern" : "c",
-        }
+        },
+        "Parameters" : {
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2544_throughput",
+            },
+        },
     },
     {
         "Name": "phy2phy_mem_load",
-        "Traffic Type": "rfc2544_throughput",
         "Deployment": "p2p",
-        "biDirectional": "True",
         "Description": "LTD.Memory.RFC2544.0PacketLoss",
         "Load" : {
             "tool" : "stress-ng",
             "load" : 50,
             "pattern" : "m",
             "load_memory" : 80,
-        }
+        },
+        "Parameters" : {
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2544_throughput",
+            },
+        },
     },
-
 ]