From 74857ba474918cd23146f77d35bd605cd3c1dc4f Mon Sep 17 00:00:00 2001
From: cody burkard <cody@onlab.us>
Date: Sat, 27 Sep 2014 02:07:08 -0700
Subject: [PATCH] remove User Switch from linearBandwidth due to poor
performance
---
examples/linearbandwidth.py | 5 ++---
examples/test/test_linearbandwidth.py | 8 +++++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/examples/linearbandwidth.py b/examples/linearbandwidth.py
index dee5490c..90ca2ed0 100755
--- a/examples/linearbandwidth.py
+++ b/examples/linearbandwidth.py
@@ -24,7 +24,7 @@
"""
from mininet.net import Mininet
-from mininet.node import UserSwitch, OVSKernelSwitch, Controller
+from mininet.node import OVSKernelSwitch, Controller
from mininet.topo import Topo
from mininet.log import lg
from mininet.util import irange
@@ -67,8 +67,7 @@ def linearBandwidthTest( lengths ):
switchCount = max( lengths )
hostCount = switchCount + 1
- switches = { 'reference user': UserSwitch,
- 'Open vSwitch kernel': OVSKernelSwitch }
+ switches = { 'Open vSwitch kernel': OVSKernelSwitch }
topo = LinearTestTopo( hostCount )
diff --git a/examples/test/test_linearbandwidth.py b/examples/test/test_linearbandwidth.py
index d3c11441..95a18acb 100755
--- a/examples/test/test_linearbandwidth.py
+++ b/examples/test/test_linearbandwidth.py
@@ -21,7 +21,6 @@ def testLinearBandwidth( self ):
while True:
index = p.expect( opts, timeout=600 )
if index == 0:
- previous_bw = 10 ** 10 # 10 Gbits
count += 1
elif index == 1:
n = int( p.match.group( 1 ) )
@@ -32,12 +31,15 @@ def testLinearBandwidth( self ):
elif unit[ 0 ] == 'M':
bw *= 10 ** 6
elif unit[ 0 ] == 'G':
- bw *= 10 ** 9
- self.assertTrue( bw < previous_bw )
+ bw *= 10 ** 9a
+ # check that we have a previous result to compare to
+ if n != 1:
+ self.assertTrue( bw < previous_bw )
previous_bw = bw
else:
break
+ # verify that we received results from at least one switch
self.assertTrue( count > 0 )
if __name__ == '__main__':
--
GitLab