IXIA setup: Fix to create packets with the specified values.

This patch fixes the setting of the packet fields generated by IXIA.
So that  packets will be created with the values we pass, eg UDP
source port, UDP dest port, MAC source address.

JIRA: VSPERF-477

Change-Id: I15371b9f4e5fe60f738fc0e836ec7abc4f2a3938
Signed-off-by: Antonio Fischetti <antonio.fischetti@intel.com>
Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com>
Reviewed-by: Martin Klozik martinx.klozik@intel.com
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Christian Trautman <ctrautma@redhat.com>

diff --git a/3rd_party/ixia/ixnetrfc2544.tcl b/3rd_party/ixia/ixnetrfc2544.tcl
index e70ca87..faab5a6 100644 (file)
--- a/3rd_party/ixia/ixnetrfc2544.tcl
+++ b/3rd_party/ixia/ixnetrfc2544.tcl
@@ -1387,20 +1387,20 @@ proc startRfc2544Test { testSpec trafficSpec } {
     #
     set sg_field $ixNetSG_Stack(3)/field:"ethernet.header.sourceAddress-2"
     ixNet setMultiAttrs $sg_field \
-     -singleValue {00:00:00:00:00:00} \
+     -singleValue $srcMac \
      -seed {1} \
      -optionalEnabled True \
      -fullMesh False \
      -valueList {{00:00:00:00:00:00}} \
      -stepValue {00:00:00:00:00:00} \
      -fixedBits {00:00:00:00:00:00} \
-     -fieldValue {00:00:00:00:00:00} \
+     -fieldValue $srcMac \
      -auto False \
      -randomMask {00:00:00:00:00:00} \
      -trackingEnabled False \
      -valueType singleValue \
      -activeFieldChoice False \
-     -startValue {00:00:00:00:00:00} \
+     -startValue $srcMac \
      -countValue {1}
     sg_commit
     set sg_field [lindex [ixNet remapIds $sg_field] 0]
@@ -2806,20 +2806,20 @@ proc startRfc2544Test { testSpec trafficSpec } {
     #
     set sg_field $ixNetSG_Stack(3)/field:"udp.header.srcPort-1"
     ixNet setMultiAttrs $sg_field \
-     -singleValue {63} \
+     -singleValue $srcPort \
      -seed {1} \
      -optionalEnabled True \
      -fullMesh False \
      -valueList {{63}} \
      -stepValue {63} \
      -fixedBits {63} \
-     -fieldValue {Default} \
-     -auto True \
+     -fieldValue $srcPort \
+     -auto False \
      -randomMask {63} \
      -trackingEnabled False \
      -valueType singleValue \
      -activeFieldChoice False \
-     -startValue {63} \
+     -startValue $srcPort \
      -countValue {1}
     sg_commit
     set sg_field [lindex [ixNet remapIds $sg_field] 0]
@@ -2829,14 +2829,14 @@ proc startRfc2544Test { testSpec trafficSpec } {
     #
     set sg_field $ixNetSG_Stack(3)/field:"udp.header.dstPort-2"
     ixNet setMultiAttrs $sg_field \
-     -singleValue {63} \
+     -singleValue $dstPort \
      -seed {1} \
      -optionalEnabled True \
      -fullMesh False \
      -valueList {{63}} \
      -stepValue {1} \
      -fixedBits {63} \
-     -fieldValue {Default} \
+     -fieldValue $dstPort \
      -auto False \
      -randomMask {63} \
      -trackingEnabled False \

diff --git a/3rd_party/ixia/ixnetrfc2544v2.tcl b/3rd_party/ixia/ixnetrfc2544v2.tcl
index 539c5a5..cc5a694 100755 (executable)
--- a/3rd_party/ixia/ixnetrfc2544v2.tcl
+++ b/3rd_party/ixia/ixnetrfc2544v2.tcl
@@ -1402,20 +1402,20 @@ proc startRfc2544Test { testSpec trafficSpec } {
     #
     set sg_field $ixNetSG_Stack(3)/field:"ethernet.header.destinationAddress-1"
     ixNet setMultiAttrs $sg_field \
-     -singleValue {00:00:00:00:00:00} \
+     -singleValue $dstMac \
      -seed {1} \
      -optionalEnabled True \
      -fullMesh False \
      -valueList {{00:00:00:00:00:00}} \
-     -stepValue {00:00:00:00:00:00} \
+     -stepValue {00:00:00:00:00:01} \
      -fixedBits {00:00:00:00:00:00} \
-     -fieldValue {00:00:00:00:00:00} \
+     -fieldValue $dstMac \
      -auto False \
      -randomMask {00:00:00:00:00:00} \
      -trackingEnabled False \
      -valueType singleValue \
      -activeFieldChoice False \
-     -startValue {00:00:00:00:00:00} \
+     -startValue $dstMac \
      -countValue {1}
     sg_commit
     set sg_field [lindex [ixNet remapIds $sg_field] 0]
@@ -1425,20 +1425,20 @@ proc startRfc2544Test { testSpec trafficSpec } {
     #
     set sg_field $ixNetSG_Stack(3)/field:"ethernet.header.sourceAddress-2"
     ixNet setMultiAttrs $sg_field \
-     -singleValue {00:00:00:00:00:00} \
+     -singleValue $srcMac \
      -seed {1} \
      -optionalEnabled True \
      -fullMesh False \
      -valueList {{00:00:00:00:00:00}} \
      -stepValue {00:00:00:00:00:00} \
      -fixedBits {00:00:00:00:00:00} \
-     -fieldValue {00:00:00:00:00:00} \
+     -fieldValue $srcMac \
      -auto False \
      -randomMask {00:00:00:00:00:00} \
      -trackingEnabled False \
      -valueType singleValue \
      -activeFieldChoice False \
-     -startValue {00:00:00:00:00:00} \
+     -startValue $srcMac \
      -countValue {1}
     sg_commit
     set sg_field [lindex [ixNet remapIds $sg_field] 0]
@@ -1568,16 +1568,16 @@ proc startRfc2544Test { testSpec trafficSpec } {
      -optionalEnabled True \
      -fullMesh False \
      -valueList {{0.0.0.0}} \
-     -stepValue {0.0.0.0} \
+     -stepValue {0.0.0.1} \
      -fixedBits {0.0.0.0} \
      -fieldValue $dstIp \
      -auto False \
      -randomMask {0.0.0.0} \
      -trackingEnabled False \
-     -valueType singleValue \
+     -valueType $multipleStreams \
      -activeFieldChoice False \
-     -startValue {0.0.0.0} \
-     -countValue {1}
+     -startValue $dstIp \
+     -countValue $numflows
     #sg_commit
     #set sg_field [lindex [ixNet remapIds $sg_field] 0]
 
@@ -1630,13 +1630,13 @@ proc startRfc2544Test { testSpec trafficSpec } {
          -valueList {{63}} \
          -stepValue {63} \
          -fixedBits {63} \
-         -fieldValue {$srcPort} \
-         -auto True \
+         -fieldValue $srcPort \
+         -auto False \
          -randomMask {63} \
          -trackingEnabled False \
          -valueType singleValue \
          -activeFieldChoice False \
-         -startValue {63} \
+         -startValue $srcPort \
          -countValue {1}
 
         #
@@ -1742,7 +1742,7 @@ proc startRfc2544Test { testSpec trafficSpec } {
             -trackingEnabled false \
             -valueType singleValue \
             -activeFieldChoice false \
-            -startValue 60 \
+            -startValue 0 \
             -countValue 1
 
         set sg_field $ixNetSG_Stack(3)/field:"tcp.header.sequenceNumber-3"