From 0c292cdcf82ca1d5a71a93c1e1f91cb061a2c6f2 Mon Sep 17 00:00:00 2001 From: Maryam Tahhan Date: Sun, 8 Nov 2015 17:35:50 -0500 Subject: pkt_gen: add duration to all send functions Allow a configurable duration for all send functions. JIRA: VSPERF-125 Change-Id: I7c6f5d136a7d7100e3990f7fdc00121b07081a80 Signed-off-by: Maryam Tahhan Reviewed-by: Martin Klozik Reviewed-by: Billy O Mahony Reviewed-by: Dino Simeon Madarang Reviewed-by: Radek Zetik --- tools/pkt_gen/ixnet/ixnet.py | 8 ++++---- tools/pkt_gen/ixnet/ixnetrfc2544.tcl | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tools/pkt_gen/ixnet') diff --git a/tools/pkt_gen/ixnet/ixnet.py b/tools/pkt_gen/ixnet/ixnet.py index 52300b1e..9a705f44 100755 --- a/tools/pkt_gen/ixnet/ixnet.py +++ b/tools/pkt_gen/ixnet/ixnet.py @@ -200,14 +200,14 @@ class IxNet(trafficgen.ITrafficGenerator): """ pass - def send_cont_traffic(self, traffic=None, time=30, multistream=False): + def send_cont_traffic(self, traffic=None, duration=30, multistream=False): """See ITrafficGenerator for description """ - self.start_cont_traffic(traffic, time) + self.start_cont_traffic(traffic, duration) return self.stop_cont_traffic() - def start_cont_traffic(self, traffic=None, time=30): + def start_cont_traffic(self, traffic=None, duration=30): """Start transmission. """ self._bidir = traffic['bidir'] @@ -215,7 +215,7 @@ class IxNet(trafficgen.ITrafficGenerator): self._params['config'] = { 'binary': False, # don't do binary search and send one stream - 'time': time, + 'duration': duration, 'framerate': traffic['frame_rate'], 'multipleStreams': traffic['multistream'], 'rfc2544TestType': 'throughput', diff --git a/tools/pkt_gen/ixnet/ixnetrfc2544.tcl b/tools/pkt_gen/ixnet/ixnetrfc2544.tcl index eda369db..f6df0713 100644 --- a/tools/pkt_gen/ixnet/ixnetrfc2544.tcl +++ b/tools/pkt_gen/ixnet/ixnetrfc2544.tcl @@ -81,15 +81,15 @@ proc startRfc2544Test { testSpec trafficSpec } { set binary [dict get $testSpec binary] + set duration [dict get $testSpec duration] + if {$binary} { set numTrials [dict get $testSpec trials] - set duration [dict get $testSpec duration] set frameRate 100 set tolerance [dict get $testSpec lossrate] set loadType binary } else { set numTrials 1 - set duration [dict get $testSpec time] set frameRate [dict get $testSpec framerate] set tolerance 0.0 set loadType custom -- cgit 1.2.3-korg