commit dc38b4a9a0337532e1a04b88ce3db4b22616462e
author Tim Lindberg <tim@onlab.us> Mon May 13 23:01:02 2013 -0700
committer Tim Lindberg <tim@onlab.us> Mon May 13 23:01:02 2013 -0700
tree 889a21fcdccce84f495ae6341110a28fa8d4bd41
parent d2e57143a646030c4eaa51ca625fbc79820b27ad
parent 3e5ea2b64a9944039cbf704b86e5e7a17ab43142

Merge branch 'master' of https://github.com/OPENNETWORKINGLAB/ONOS

scripts/runiperf.sh

diff --git a/scripts/runiperf.sh b/scripts/runiperf.sh
index 7066bc6..4e26bd2 100755
--- a/scripts/runiperf.sh
+++ b/scripts/runiperf.sh
@@ -45,7 +45,7 @@
       if (testbed == "SW"): 
         cmd="ssh -o StrictHostKeyChecking=no 1.1.%d.1 '/home/ubuntu/ONOS/scripts/iperf -u -t%s -i%s -k%s -yJ -o /home/ubuntu/ONOS/web/log/iperfclient_%s.out -c 192.168.%d.%d 2>&1 &' &" % (src_hostid, duration, interval, samples, flowid, dst_nwid, dst_hostid)
       else:
-        cmd="~/mininet/util/m g%sh%02d '/home/ubuntu/ONOS/scripts/iperf -u -t%s -i%s -k%s -yJ -o /home/ubuntu/ONOS/web/log/iperfclient_%s.out -c 192.168.%d.%d 2>&1 &' &" % (src_nwid, src_hostid, duration, interval, samples, flowid, dst_nwid, dst_hostid + 1)
+        cmd="~/mininet/util/m g%sh%02d '/home/ubuntu/ONOS/scripts/iperf -u -t%s -i%s -k%s -yJ -o /home/ubuntu/ONOS/web/log/iperfclient_%s.out -c 192.168.%d.%d 2>&1 &' &" % (src_nwid, src_hostid, duration, interval, samples, flowid, dst_nwid, dst_hostid )
       killcmd='sudo pkill -KILL -f \"iperf .* -o .*/iperfclient_%s.out\"' % (flowid)
       print killcmd
       print cmd