Removed underscores for public Node methods. Minor cleanup & comments.

examples/linearbandwidth.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 """
-Test bandwidth (using iperf) on linear networks of varying size, 
+Test bandwidth (using iperf) on linear networks of varying size,
 using both kernel and user datapaths.
 
 We construct a network of N hosts and N-1 switches, connected as follows:
@@ -9,7 +9,7 @@ We construct a network of N hosts and N-1 switches, connected as follows:
 h1 <-> sN+1 <-> sN+2 .. sN+N-1
        |        |       |
        h2       h3      hN
-        
+
 Note: by default, the reference controller only supports 16
 switches, so this test WILL NOT WORK unless you have recompiled
 your controller to support 100 switches (or more.)
@@ -25,9 +25,9 @@ of switches, this example demonstrates:
 
 import sys
 flush = sys.stdout.flush
-   
+
 from mininet.net import init, Mininet
-from mininet.node import Host, KernelSwitch, UserSwitch
+from mininet.node import KernelSwitch, UserSwitch
 from mininet.topo import Topo, Node
 from mininet.log import lg
 
@@ -35,26 +35,26 @@ class LinearTestTopo( Topo ):
     "Topology for a string of N hosts and N-1 switches."
 
     def __init__( self, N ):
-    
+
         # Add default members to class.
         super( LinearTestTopo, self ).__init__()
-        
+
         # Create switch and host nodes
-        hosts = range( 1, N+1 )
-        switches = range( N+1, N+N )
-        for id in hosts:
-            self._add_node( id, Node( is_switch=False ) )
-        for id in switches:
-            self._add_node( id, Node( is_switch=True ) )
-        
+        hosts = range( 1, N + 1 )
+        switches = range( N + 1 , N + N )
+        for h in hosts:
+            self.add_node( h, Node( is_switch=False ) )
+        for s in switches:
+            self.add_node( s, Node( is_switch=True ) )
+
         # Wire up switches
         for s in switches[ :-1 ]:
-            self._add_edge( s, s + 1 )
-        
+            self.add_edge( s, s + 1 )
+
         # Wire up hosts
-        self._add_edge( hosts[ 0 ], switches[ 0 ] )
+        self.add_edge( hosts[ 0 ], switches[ 0 ] )
         for h in hosts[ 1: ]:
-            self._add_edge( h, h+N-1 )
+            self.add_edge( h, h + N - 1 )
 
         # Consider all switches and hosts 'on'
         self.enable_all()
@@ -81,26 +81,25 @@ def linearBandwidthTest( lengths ):
             src, dst = net.hosts[ 0 ], net.hosts[ n ]
             print "testing", src.name, "<->", dst.name
             bandwidth = net.iperf( [ src, dst ] )
-            print bandwidth ; flush()
+            print bandwidth
+            flush()
             results[ datapath ] += [ ( n, bandwidth ) ]
         net.stop()
-      
+
     for datapath in datapaths:
         print
         print "*** Linear network results for", datapath, "datapath:"
         print
-        result = results[ datapath ]  
+        result = results[ datapath ]
         print "SwitchCount\tiperf Results"
         for switchCount, bandwidth in result:
-            print switchCount, '\t\t', 
+            print switchCount, '\t\t',
             print bandwidth[ 0 ], 'server, ', bandwidth[ 1 ], 'client'
         print
     print
-      
+
 if __name__ == '__main__':
     lg.setLogLevel( 'info' )
     init()
     print "*** Running linearBandwidthTest"
     linearBandwidthTest( [ 1, 10, 20  ]  )
-
-