rename Topo() methods for consistency: add_node() -> addNode()

examples/linearbandwidth.py

@@ -41,22 +41,22 @@ class LinearTestTopo( Topo ):
         Topo.__init__( self, **params )
 
         # Create switches and hosts
-        hosts = [ self.add_host( 'h%s' % h )
+        hosts = [ self.addHost( 'h%s' % h )
                   for h in irange( 1, N ) ]
-        switches = [ self.add_switch( 's%s' % s )
+        switches = [ self.addSwitch( 's%s' % s )
                      for s in irange( 1, N - 1 ) ]
 
         # Wire up switches
         last = None
         for switch in switches:
             if last:
-                self.add_link( last, switch )
+                self.addLink( last, switch )
             last = switch
 
         # Wire up hosts
-        self.add_link( hosts[ 0 ], switches[ 0 ] )
+        self.addLink( hosts[ 0 ], switches[ 0 ] )
         for host, switch in zip( hosts[ 1: ], switches ):
-            self.add_link( host, switch )
+            self.addLink( host, switch )
 
 
 def linearBandwidthTest( lengths ):

examples/simpleperf.py

@@ -15,13 +15,13 @@ class SingleSwitchTopo(Topo):
     "Single switch connected to n hosts."
     def __init__(self, n=2, **opts):
         Topo.__init__(self, **opts)
-        switch = self.add_switch('s1')
+        switch = self.addSwitch('s1')
         for h in range(n):
             # Each host gets 50%/n of system CPU
-            host = self.add_host('h%s' % (h + 1),
+            host = self.addHost('h%s' % (h + 1),
                                  cpu=.5 / n)
             # 10 Mbps, 5ms delay, 10% loss
-            self.add_link(host, switch,
+            self.addLink(host, switch,
                           bw=10, delay='5ms', loss=10, use_htb=True)
 
 def perfTest():