홍길동 / 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 22 additions and 20 deletions
......@@ -194,3 +194,6 @@ function vicell {
# Load AT&T MPLS topo GEO data
alias atttopo='onos-netcfg $OCI $ONOS_ROOT/tools/test/topos/attmpls-cfg.json'
# Load UK topo GEO data
alias uktopo='onos-netcfg $OCI $ONOS_ROOT/tools/test/topos/uk-cfg.json'
......
......@@ -5,7 +5,7 @@
from mininet.topo import Topo
class UkTopo( Topo ):
"""Internet Topology Zoo Specimen."""
"""Switches projected onto the UK map"""
def __init__( self ):
"""Create a topology."""
......@@ -27,7 +27,6 @@ class UkTopo( Topo ):
EDBUGH = self.addSwitch( 's11' )
ABYSTW = self.addSwitch( 's12' )
# ... and now hosts
LONDON_host = self.addHost( 'h1' )
BRISTL_host = self.addHost( 'h2' )
......@@ -57,28 +56,28 @@ class UkTopo( Topo ):
self.addLink( ABYSTW, ABYSTW_host )
# add edges between switches
self.addLink( LONDON, BRISTL, bw=10, delay='1.0ms')
self.addLink( LONDON, BRISTL, bw=10, delay='1.0ms')
self.addLink( LONDON, BIRMHM, bw=10, delay='1.0ms')
self.addLink( BIRMHM, LIVRPL, bw=10, delay='1.0ms')
self.addLink( BIRMHM, YORK, bw=10, delay='1.0ms')
self.addLink( BRISTL, ABYSTW, bw=10, delay='1.0ms')
self.addLink( BRISTL, BIRMHM, bw=10, delay='1.0ms')
self.addLink( BRISTL, PLYMTH, bw=10, delay='1.0ms')
self.addLink( LONDON, PLYMTH, bw=10, delay='1.0ms')
self.addLink( LONDON, DOVER, bw=10, delay='1.0ms')
self.addLink( LONDON, BRGHTN, bw=10, delay='1.0ms')
self.addLink( DOVER, BRGHTN, bw=10, delay='1.0ms')
self.addLink( BIRMHM, LIVRPL, bw=10, delay='1.0ms')
self.addLink( BIRMHM, YORK, bw=10, delay='1.0ms')
self.addLink( NWCSTL, YORK, bw=10, delay='1.0ms')
self.addLink( NWCSTL, LIVRPL, bw=10, delay='1.0ms')
self.addLink( LONDON, YORK, bw=10, delay='1.0ms')
self.addLink( LONDON, YORK, bw=10, delay='1.0ms')
self.addLink( DOVER, NRWICH, bw=10, delay='1.0ms')
self.addLink( LIVRPL, ABYSTW, bw=10, delay='1.0ms')
self.addLink( LIVRPL, EDBUGH, bw=10, delay='1.0ms')
self.addLink( LONDON, BIRMHM, bw=10, delay='1.0ms')
self.addLink( LONDON, BRGHTN, bw=10, delay='1.0ms')
self.addLink( LONDON, BRISTL, bw=10, delay='1.0ms')
self.addLink( LONDON, BRISTL, bw=10, delay='1.0ms')
self.addLink( LONDON, DOVER, bw=10, delay='1.0ms')
self.addLink( LONDON, NRWICH, bw=10, delay='1.0ms')
self.addLink( DOVER, NRWICH, bw=10, delay='1.0ms')
self.addLink( YORK, NRWICH, bw=10, delay='1.0ms')
self.addLink( YORK, LIVRPL, bw=10, delay='1.0ms')
self.addLink( LONDON, PLYMTH, bw=10, delay='1.0ms')
self.addLink( LONDON, YORK, bw=10, delay='1.0ms')
self.addLink( LONDON, YORK, bw=10, delay='1.0ms')
self.addLink( NWCSTL, EDBUGH, bw=10, delay='1.0ms')
self.addLink( LIVRPL, EDBUGH, bw=10, delay='1.0ms')
self.addLink( LIVRPL, ABYSTW, bw=10, delay='1.0ms')
self.addLink( BRISTL, ABYSTW, bw=10, delay='1.0ms')
self.addLink( NWCSTL, LIVRPL, bw=10, delay='1.0ms')
self.addLink( NWCSTL, YORK, bw=10, delay='1.0ms')
self.addLink( YORK, LIVRPL, bw=10, delay='1.0ms')
self.addLink( YORK, NRWICH, bw=10, delay='1.0ms')
topos = { 'uk': ( lambda: UkTopo() ) }
......