commit 43ae498013b55033659da660bde013d40f30920c
author Thomas Vachuska <tom@opennetworking.org> Thu Feb 01 09:23:44 2018 -0800
committer Thomas Vachuska <tom@opennetworking.org> Thu Feb 01 09:23:44 2018 -0800
tree 2f06fc3178e58405ab9c48ae6ab26d34af91d115
parent 15370d2a16fb9577a20103801611b004fcb56a6e

Fixed the UK mininet topology.

Change-Id: I7da56a6e42c3c245e01f4a4d7b6916a86a01d325

tools/test/topos/uk.py

diff --git a/tools/test/topos/uk.py b/tools/test/topos/uk.py
index 2ed1765..aabd0b7 100644
--- a/tools/test/topos/uk.py
+++ b/tools/test/topos/uk.py
@@ -7,6 +7,11 @@
 class UkTopo( Topo ):
     """Switches projected onto the UK map"""
 
+    def addSwitch( self, name, **opts ):
+        kwargs = { 'protocols' : 'OpenFlow13' }
+        kwargs.update( opts )
+        return super(UkTopo, self).addSwitch( name, **kwargs )
+
     def __init__( self ):
         """Create a topology."""
 
@@ -56,29 +61,29 @@
         self.addLink( ABYSTW, ABYSTW_host )
 
         # add edges between switches
-        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( DOVER,  BRGHTN, 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( 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( 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')
+        self.addLink( BIRMHM, LIVRPL )
+        self.addLink( BIRMHM, YORK )
+        self.addLink( BRISTL, ABYSTW )
+        self.addLink( BRISTL, BIRMHM )
+        self.addLink( BRISTL, PLYMTH )
+        self.addLink( DOVER,  BRGHTN )
+        self.addLink( DOVER,  NRWICH )
+        self.addLink( LIVRPL, ABYSTW )
+        self.addLink( LIVRPL, EDBUGH )
+        self.addLink( LONDON, BIRMHM )
+        self.addLink( LONDON, BRGHTN )
+        self.addLink( LONDON, BRISTL )
+        self.addLink( LONDON, BRISTL )
+        self.addLink( LONDON, DOVER )
+        self.addLink( LONDON, NRWICH )
+        self.addLink( LONDON, PLYMTH )
+        self.addLink( LONDON, YORK )
+        self.addLink( LONDON, YORK )
+        self.addLink( NWCSTL, EDBUGH )
+        self.addLink( NWCSTL, LIVRPL )
+        self.addLink( NWCSTL, YORK )
+        self.addLink( YORK,   LIVRPL )
+        self.addLink( YORK,   NRWICH )
 
 topos = { 'uk': ( lambda: UkTopo() ) }