홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Brian O'Connor
Committed by Gerrit Code Review
2f0817ce 1 parent 2495b98b

Adding missing switch and host to attmplsfast.py 

Change-Id: I1660d4ee9c5b9712d8d21e7a829a7afd3505396d
Inline Side-by-side
Showing 1 changed file with 3 additions and 6 deletions
...@@ -15,14 +15,10 @@ from mininet.util import dumpNodeConnections ...@@ -15,14 +15,10 @@ from mininet.util import dumpNodeConnections
15 class AttMplsTopo( Topo ): 15 class AttMplsTopo( Topo ):
16 "Internet Topology Zoo Specimen." 16 "Internet Topology Zoo Specimen."
17 17
18 - def __init__( self ): 18 + def build( self ):
19 "Create a topology." 19 "Create a topology."
20 20
21 - # Initialize Topology
22 - Topo.__init__( self )
23 -
24 # add nodes, switches first... 21 # add nodes, switches first...
25 - NY54 = self.addSwitch( 's25' ) # 40.728270, -73.994483
26 CMBR = self.addSwitch( 's1' ) # 42.373730, -71.109734 22 CMBR = self.addSwitch( 's1' ) # 42.373730, -71.109734
27 CHCG = self.addSwitch( 's2' ) # 41.877461, -87.642892 23 CHCG = self.addSwitch( 's2' ) # 41.877461, -87.642892
28 CLEV = self.addSwitch( 's3' ) # 41.498928, -81.695217 24 CLEV = self.addSwitch( 's3' ) # 41.498928, -81.695217
...@@ -47,9 +43,9 @@ class AttMplsTopo( Topo ): ...@@ -47,9 +43,9 @@ class AttMplsTopo( Topo ):
47 LA03 = self.addSwitch( 's22' ) # 34.056346, -118.235951 43 LA03 = self.addSwitch( 's22' ) # 34.056346, -118.235951
48 SNDG = self.addSwitch( 's23' ) # 32.714564, -117.153528 44 SNDG = self.addSwitch( 's23' ) # 32.714564, -117.153528
49 PHNX = self.addSwitch( 's24' ) # 33.448289, -112.076299 45 PHNX = self.addSwitch( 's24' ) # 33.448289, -112.076299
46 + NY54 = self.addSwitch( 's25' ) # 40.728270, -73.994483
50 47
51 # ... and now hosts 48 # ... and now hosts
52 - NY54_host = self.addHost( 'h25' )
53 CMBR_host = self.addHost( 'h1' ) 49 CMBR_host = self.addHost( 'h1' )
54 CHCG_host = self.addHost( 'h2' ) 50 CHCG_host = self.addHost( 'h2' )
55 CLEV_host = self.addHost( 'h3' ) 51 CLEV_host = self.addHost( 'h3' )
...@@ -74,6 +70,7 @@ class AttMplsTopo( Topo ): ...@@ -74,6 +70,7 @@ class AttMplsTopo( Topo ):
74 LA03_host = self.addHost( 'h22' ) 70 LA03_host = self.addHost( 'h22' )
75 SNDG_host = self.addHost( 'h23' ) 71 SNDG_host = self.addHost( 'h23' )
76 PHNX_host = self.addHost( 'h24' ) 72 PHNX_host = self.addHost( 'h24' )
73 + NY54_host = self.addHost( 'h25' )
77 74
78 # add edges between switch and corresponding host 75 # add edges between switch and corresponding host
79 self.addLink( NY54 , NY54_host ) 76 self.addLink( NY54 , NY54_host )
......