commit 2f0817ced826114d45896a4333c18313a7f88899
author Brian O'Connor <bocon@onlab.us> Thu Sep 03 16:36:27 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Sep 04 01:04:47 2015 +0000
tree 9bf71e8414efafea5d09a2d41f304a4e4e110851
parent 2495b98ba9fc40ae9eff874249143facfa92637f

Adding missing switch and host to attmplsfast.py

Change-Id: I1660d4ee9c5b9712d8d21e7a829a7afd3505396d

tools/test/topos/attmplsfast.py

diff --git a/tools/test/topos/attmplsfast.py b/tools/test/topos/attmplsfast.py
index a020dc6..7f90446 100644
--- a/tools/test/topos/attmplsfast.py
+++ b/tools/test/topos/attmplsfast.py
@@ -15,14 +15,10 @@
 class AttMplsTopo( Topo ):
     "Internet Topology Zoo Specimen."
 
-    def __init__( self ):
+    def build( self ):
         "Create a topology."
 
-        # Initialize Topology
-        Topo.__init__( self )
-
         # add nodes, switches first...
-        NY54 = self.addSwitch( 's25' ) # 40.728270, -73.994483
         CMBR = self.addSwitch( 's1' )  # 42.373730, -71.109734
         CHCG = self.addSwitch( 's2' )  # 41.877461, -87.642892
         CLEV = self.addSwitch( 's3' )  # 41.498928, -81.695217
@@ -47,9 +43,9 @@
         LA03 = self.addSwitch( 's22' ) # 34.056346, -118.235951
         SNDG = self.addSwitch( 's23' ) # 32.714564, -117.153528
         PHNX = self.addSwitch( 's24' ) # 33.448289, -112.076299
+        NY54 = self.addSwitch( 's25' ) # 40.728270, -73.994483
 
         # ... and now hosts
-        NY54_host = self.addHost( 'h25' )
         CMBR_host = self.addHost( 'h1' )
         CHCG_host = self.addHost( 'h2' )
         CLEV_host = self.addHost( 'h3' )
@@ -74,6 +70,7 @@
         LA03_host = self.addHost( 'h22' )
         SNDG_host = self.addHost( 'h23' )
         PHNX_host = self.addHost( 'h24' )
+        NY54_host = self.addHost( 'h25' )
 
         # add edges between switch and corresponding host
         self.addLink( NY54 , NY54_host )