ixia: Make L3 and L4 headers optional

During testing it is sometimes useful to generate pure L2 traffic
without L3 or L4 related headers. IxNetwork TCL script was updated
to support this option.
Generic TRAFFIC array was enhanced by on/off switch for L3 and L4
headers. Thus it can be implemented by other traffic generators
in the future, if this feature will prove itself useful.

JIRA: VSPERF-500

Change-Id: I723c703e5d6ef609fd5b7db366871278a4730203
Signed-off-by: Martin Klozik <martinx.klozik@intel.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Christian Trautman <ctrautma@redhat.com>
Reviewed-by: Sridhar Rao <sridhar.rao@spirent.com>
Reviewed-by: Trevor Cooper <trevor.cooper@intel.com>

3 files changed, 21 insertions, 7 deletions

diff --git a/docs/testing/developer/design/trafficgen_integration_guide.rst b/docs/testing/developer/design/trafficgen_integration_guide.rst
index 382cedcb..7dae19ba 100644
--- a/docs/testing/developer/design/trafficgen_integration_guide.rst
+++ b/docs/testing/developer/design/trafficgen_integration_guide.rst
@@ -215,9 +215,9 @@ functions:
       * param **l2**: A dictionary with data link layer details, e.g. **srcmac**,
         **dstmac** and **framesize**.
       * param **l3**: A dictionary with network layer details, e.g. **srcip**,
-        **dstip** and **proto**.
-      * param **l3**: A dictionary with transport layer details, e.g. **srcport**,
-        **dstport**.
+        **dstip**, **proto** and l3 on/off switch **enabled**.
+      * param **l4**: A dictionary with transport layer details, e.g. **srcport**,
+        **dstport** and l4 on/off switch **enabled**.
       * param **vlan**: A dictionary with vlan specific parameters,
         e.g. **priority**, **cfi**, **id** and vlan on/off switch **enabled**.
 
diff --git a/docs/testing/developer/design/vswitchperf_design.rst b/docs/testing/developer/design/vswitchperf_design.rst
index aa7fb342..a5a99c8a 100644
--- a/docs/testing/developer/design/vswitchperf_design.rst
+++ b/docs/testing/developer/design/vswitchperf_design.rst
@@ -354,6 +354,10 @@ Detailed description of ``TRAFFIC`` dictionary items follows:
                       Default value: 64
     'l3'            - A dictionary with l3 network layer details. Supported
                       values are:
+        'enabled'   - Specifies if l3 layer should be enabled or disabled.
+                      Data type: bool
+                      Default value: True
+                      NOTE: Supported only by IxNet trafficgen class
         'srcip'     - Specifies source MAC address filled by traffic generator.
                       NOTE: It can be modified by vsperf in some scenarios.
                       Data type: str
@@ -369,6 +373,10 @@ Detailed description of ``TRAFFIC`` dictionary items follows:
                       Default value: "udp".
     'l4'            - A dictionary with l4 network layer details. Supported
                       values are:
+        'enabled'   - Specifies if l4 layer should be enabled or disabled.
+                      Data type: bool
+                      Default value: True
+                      NOTE: Supported only by IxNet trafficgen class
         'srcport'   - Specifies source port of selected transport protocol.
                       NOTE: It can be modified by vsperf in some scenarios.
                       Data type: int
diff --git a/docs/testing/user/configguide/trafficgen.rst b/docs/testing/user/configguide/trafficgen.rst
index 4e42b2be..fff8af07 100644
--- a/docs/testing/user/configguide/trafficgen.rst
+++ b/docs/testing/user/configguide/trafficgen.rst
@@ -50,11 +50,13 @@ and is configured as follows:
             'dstmac': '00:00:00:00:00:00',
         },
         'l3': {
+            'enabled': True,
             'proto': 'udp',
             'srcip': '1.1.1.1',
             'dstip': '90.90.90.90',
         },
         'l4': {
+            'enabled': True,
             'srcport': 3000,
             'dstport': 3001,
         },
@@ -133,8 +135,9 @@ when the setup is complete.
     {
         "flow_type": "port",
         "l3": {
+            "enabled": True,
             "srcip": "1.1.1.1",
-            "proto": "tcp",
+            "proto": "udp",
             "dstip": "90.90.90.90"
         },
         "traffic_type": "rfc2544_continuous",
@@ -144,12 +147,15 @@ when the setup is complete.
             "cfi": 0,
             "priority": 0,
             "id": 0,
-            "enabled": false
+            "enabled": False
+        },
+        "l4": {
+            "enabled": True,
+            "srcport": 3000,
+            "dstport": 3001,
         },
         "frame_rate": 90,
         "l2": {
-            "dstport": 3001,
-            "srcport": 3000,
             "dstmac": "00:00:00:00:00:00",
             "srcmac": "00:00:00:00:00:00",
             "framesize": 64