From f426da4469d88fc520fa7aa96576b7ca8096e4d0 Mon Sep 17 00:00:00 2001
From: Maryam Tahhan <maryam.tahhan@intel.com>
Date: Thu, 30 Jul 2015 13:44:36 +0100
Subject: bug_fix: process pkt_size/duration from cli

Refactor rfc25444_duration to duration and update the --test-params help
to show the type of parameters that can be set from the cli. Also
configure pkt_sizes so that it can be modified from the CLI. Also fixes
the tcl script to configure framesize properly (to the value selected
and not the default 64b).

JIRA: VSPERF-27

Change-Id: I76dcd824977a5f940cf7476090d2d2a3acca8160
Signed-off-by: Billy O'Mahony<billy.o.mahony@intel.com>
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Dino Madarang <dino.simeonx.madarang@intel.com>
---
 tools/pkt_gen/ixnet/ixnetrfc2544.tcl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
 mode change 100755 => 100644 tools/pkt_gen/ixnet/ixnetrfc2544.tcl

(limited to 'tools/pkt_gen/ixnet')

diff --git a/tools/pkt_gen/ixnet/ixnetrfc2544.tcl b/tools/pkt_gen/ixnet/ixnetrfc2544.tcl
old mode 100755
new mode 100644
index 2a156d3e..d5479b25
--- a/tools/pkt_gen/ixnet/ixnetrfc2544.tcl
+++ b/tools/pkt_gen/ixnet/ixnetrfc2544.tcl
@@ -252,7 +252,7 @@ proc startRfc2544Test { testSpec trafficSpec } {
      -destMacRetryCount 1 \
      -maxTrafficGenerationQueries 500 \
      -enableStaggeredTransmit False \
-     -learningFrameSize 64 \
+     -learningFrameSize $frameSize \
      -useTxRxSync True \
      -enableDestMacRetry True \
      -enableMulticastScalingFactor False \
@@ -7772,7 +7772,7 @@ proc startRfc2544Test { testSpec trafficSpec } {
          -tolerance 0 \
          -frameLossUnit {0} \
          -staggeredStart False \
-         -framesizeList {64} \
+         -framesizeList $frameSize \
          -frameSizeMode custom \
          -rateSelect percentMaxRate \
          -percentMaxRate 100 \
@@ -7843,7 +7843,7 @@ proc startRfc2544Test { testSpec trafficSpec } {
          -enableFastConvergence $fastConvergence \
          -fastConvergenceDuration $convergenceDuration \
          -fastConvergenceThreshold 10 \
-         -framesizeFixedValue 128 \
+         -framesizeFixedValue $frameSize \
          -gap 3 \
          -unchangedInitial False \
          -generateTrackingOptionAggregationFiles False \
@@ -7856,7 +7856,7 @@ proc startRfc2544Test { testSpec trafficSpec } {
          -imixData {{{{64}{{TOS S:0 S:0 S:0 S:0 S:0} S:0}{1 40}}{{128}{{TOS S:0 S:0 S:0 S:0 S:0} S:0}{1 30}}{{256}{{TOS S:0 S:0 S:0 S:0 S:0} S:0}{1 30}}}} \
          -imixEnabled False \
          -imixTemplates none \
-         -framesizeImixList {64} \
+         -framesizeImixList $frameSize \
          -imixTrafficType {UNCHNAGED} \
          -mapType {oneToOne} \
          -supportedTrafficTypes {mac,ipv4,ipv6,ipmix}
@@ -7865,8 +7865,8 @@ proc startRfc2544Test { testSpec trafficSpec } {
          -learnNumFrames 10 \
          -learnRate 100 \
          -learnWaitTime 1000 \
-         -learnFrameSize 64 \
-         -fastPathLearnFrameSize 64 \
+         -learnFrameSize $frameSize \
+         -fastPathLearnFrameSize $frameSize \
          -learnWaitTimeBeforeTransmit 0 \
          -learnSendMacOnly False \
          -learnSendRouterSolicitation False \
@@ -7945,7 +7945,7 @@ proc startRfc2544Test { testSpec trafficSpec } {
          -tolerance 0 \
          -frameLossUnit {0} \
          -staggeredStart False \
-         -framesizeList {64} \
+         -framesizeList $frameSize \
          -frameSizeMode custom \
          -rateSelect percentMaxRate \
          -percentMaxRate 100 \
@@ -7997,7 +7997,7 @@ proc startRfc2544Test { testSpec trafficSpec } {
          -imixData {{{{64}{{TOS S:0 S:0 S:0 S:0 S:0} S:0}{1 40}}{{128}{{TOS S:0 S:0 S:0 S:0 S:0} S:0}{1 30}}{{256}{{TOS S:0 S:0 S:0 S:0 S:0} S:0}{1 30}}}} \
          -imixEnabled False \
          -imixTemplates none \
-         -framesizeImixList {64} \
+         -framesizeImixList $frameSize \
          -imixTrafficType {UNCHNAGED} \
          -ipRatioMode fixed \
          -ipv4RatioList {10,25,50,75,90} \
-- 
cgit 1.2.3-korg