홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Simon Hunt
Committed by Thomas Vachuska
cf7e3b54 1 parent 0505f1df

GUI -- UK TOPO -- clean up order of links added 

- add alias.

Change-Id: Ic9902054505fdacff727b3d73a77bb628ca1a49e

GUI topo - added alias for uk geo information.

Change-Id: Ic32a74c086fe6c789c18b3e8e22cb87e0a30b783
Inline Side-by-side
Showing 2 changed files with 21 additions and 19 deletions
...@@ -194,3 +194,6 @@ function vicell { ...@@ -194,3 +194,6 @@ function vicell {
194 194
195 # Load AT&T MPLS topo GEO data 195 # Load AT&T MPLS topo GEO data
196 alias atttopo='onos-netcfg $OCI $ONOS_ROOT/tools/test/topos/attmpls-cfg.json' 196 alias atttopo='onos-netcfg $OCI $ONOS_ROOT/tools/test/topos/attmpls-cfg.json'
197 +
198 +# Load UK topo GEO data
199 +alias uktopo='onos-netcfg $OCI $ONOS_ROOT/tools/test/topos/uk-cfg.json'
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 from mininet.topo import Topo 5 from mininet.topo import Topo
6 6
7 class UkTopo( Topo ): 7 class UkTopo( Topo ):
8 - """Internet Topology Zoo Specimen.""" 8 + """Switches projected onto the UK map"""
9 9
10 def __init__( self ): 10 def __init__( self ):
11 """Create a topology.""" 11 """Create a topology."""
...@@ -27,7 +27,6 @@ class UkTopo( Topo ): ...@@ -27,7 +27,6 @@ class UkTopo( Topo ):
27 EDBUGH = self.addSwitch( 's11' ) 27 EDBUGH = self.addSwitch( 's11' )
28 ABYSTW = self.addSwitch( 's12' ) 28 ABYSTW = self.addSwitch( 's12' )
29 29
30 -
31 # ... and now hosts 30 # ... and now hosts
32 LONDON_host = self.addHost( 'h1' ) 31 LONDON_host = self.addHost( 'h1' )
33 BRISTL_host = self.addHost( 'h2' ) 32 BRISTL_host = self.addHost( 'h2' )
...@@ -57,28 +56,28 @@ class UkTopo( Topo ): ...@@ -57,28 +56,28 @@ class UkTopo( Topo ):
57 self.addLink( ABYSTW, ABYSTW_host ) 56 self.addLink( ABYSTW, ABYSTW_host )
58 57
59 # add edges between switches 58 # add edges between switches
60 - self.addLink( LONDON, BRISTL, bw=10, delay='1.0ms') 59 + self.addLink( BIRMHM, LIVRPL, bw=10, delay='1.0ms')
61 - self.addLink( LONDON, BRISTL, bw=10, delay='1.0ms') 60 + self.addLink( BIRMHM, YORK, bw=10, delay='1.0ms')
62 - self.addLink( LONDON, BIRMHM, bw=10, delay='1.0ms') 61 + self.addLink( BRISTL, ABYSTW, bw=10, delay='1.0ms')
63 self.addLink( BRISTL, BIRMHM, bw=10, delay='1.0ms') 62 self.addLink( BRISTL, BIRMHM, bw=10, delay='1.0ms')
64 self.addLink( BRISTL, PLYMTH, bw=10, delay='1.0ms') 63 self.addLink( BRISTL, PLYMTH, bw=10, delay='1.0ms')
65 - self.addLink( LONDON, PLYMTH, bw=10, delay='1.0ms')
66 - self.addLink( LONDON, DOVER, bw=10, delay='1.0ms')
67 - self.addLink( LONDON, BRGHTN, bw=10, delay='1.0ms')
68 self.addLink( DOVER, BRGHTN, bw=10, delay='1.0ms') 64 self.addLink( DOVER, BRGHTN, bw=10, delay='1.0ms')
69 - self.addLink( BIRMHM, LIVRPL, bw=10, delay='1.0ms') 65 + self.addLink( DOVER, NRWICH, bw=10, delay='1.0ms')
70 - self.addLink( BIRMHM, YORK, bw=10, delay='1.0ms') 66 + self.addLink( LIVRPL, ABYSTW, bw=10, delay='1.0ms')
71 - self.addLink( NWCSTL, YORK, bw=10, delay='1.0ms') 67 + self.addLink( LIVRPL, EDBUGH, bw=10, delay='1.0ms')
72 - self.addLink( NWCSTL, LIVRPL, bw=10, delay='1.0ms') 68 + self.addLink( LONDON, BIRMHM, bw=10, delay='1.0ms')
69 + self.addLink( LONDON, BRGHTN, bw=10, delay='1.0ms')
70 + self.addLink( LONDON, BRISTL, bw=10, delay='1.0ms')
71 + self.addLink( LONDON, BRISTL, bw=10, delay='1.0ms')
72 + self.addLink( LONDON, DOVER, bw=10, delay='1.0ms')
73 + self.addLink( LONDON, NRWICH, bw=10, delay='1.0ms')
74 + self.addLink( LONDON, PLYMTH, bw=10, delay='1.0ms')
73 self.addLink( LONDON, YORK, bw=10, delay='1.0ms') 75 self.addLink( LONDON, YORK, bw=10, delay='1.0ms')
74 self.addLink( LONDON, YORK, bw=10, delay='1.0ms') 76 self.addLink( LONDON, YORK, bw=10, delay='1.0ms')
75 - self.addLink( LONDON, NRWICH, bw=10, delay='1.0ms')
76 - self.addLink( DOVER, NRWICH, bw=10, delay='1.0ms')
77 - self.addLink( YORK, NRWICH, bw=10, delay='1.0ms')
78 - self.addLink( YORK, LIVRPL, bw=10, delay='1.0ms')
79 self.addLink( NWCSTL, EDBUGH, bw=10, delay='1.0ms') 77 self.addLink( NWCSTL, EDBUGH, bw=10, delay='1.0ms')
80 - self.addLink( LIVRPL, EDBUGH, bw=10, delay='1.0ms') 78 + self.addLink( NWCSTL, LIVRPL, bw=10, delay='1.0ms')
81 - self.addLink( LIVRPL, ABYSTW, bw=10, delay='1.0ms') 79 + self.addLink( NWCSTL, YORK, bw=10, delay='1.0ms')
82 - self.addLink( BRISTL, ABYSTW, bw=10, delay='1.0ms') 80 + self.addLink( YORK, LIVRPL, bw=10, delay='1.0ms')
81 + self.addLink( YORK, NRWICH, bw=10, delay='1.0ms')
83 82
84 topos = { 'uk': ( lambda: UkTopo() ) } 83 topos = { 'uk': ( lambda: UkTopo() ) }
......