commit ad509f9248312c5ab2269909f9bf10605bd9ef11
author Andrea Campanella <andrea@onlab.us> Tue Jun 21 15:06:12 2016 +0200
committer Andrea Campanella <andrea@onlab.us> Tue Jun 21 15:06:12 2016 +0200
tree 85369a6e36f4e0c839e6d14e44cbf39d4bf8f9d7
parent 60a5a989c5d4e63129fce9eea6e1e7d2f42bfbe7

Enhancing Geant Topo

Change-Id: I71c9252d41cfc2efb29e25aae4900104565c0408

tools/test/topos/geantmpls.py

diff --git a/tools/test/topos/geantmpls.py b/tools/test/topos/geantmpls.py
index fec7286..9a1fa12 100644
--- a/tools/test/topos/geantmpls.py
+++ b/tools/test/topos/geantmpls.py
@@ -50,6 +50,9 @@
         MAR = self.addSwitch( 's26' )
         HAM = self.addSwitch( 's27' )
         AMS = self.addSwitch( 's28' )
+        STO = self.addSwitch( 's29' )
+        OSL = self.addSwitch( 's30' )
+        HEL = self.addSwitch( 's31' )
 
 
     # ... and now hosts
@@ -81,6 +84,9 @@
         MAR_host = self.addHost( 'h26' )
         HAM_host = self.addHost( 'h27' )
         AMS_host = self.addHost( 'h28' )
+        STO_host = self.addHost( 'h29' )
+        OSL_host = self.addHost( 'h30' )
+        HEL_host = self.addHost( 'h31' )
 
         # add edges between switch and corresponding host
         self.addLink( ATH , ATH_host )
@@ -111,22 +117,33 @@
         self.addLink( MAR , MAR_host )
         self.addLink( HAM , HAM_host )
         self.addLink( AMS , AMS_host )
+        self.addLink( STO , STO_host )
+        self.addLink( HEL , HEL_host )
+        self.addLink( OSL , OSL_host )
 
         # add edges between switches
         self.addLink( ATH , MIL, bw=10 )
+        self.addLink( MIL , ATH, bw=10 )
         self.addLink( MIL , VIE, bw=10 )
         self.addLink( MIL , MAR, bw=10 )
         self.addLink( MIL , GEN, bw=10 )
+        self.addLink( GEN , MIL, bw=10 )
         self.addLink( MIL , MLT, bw=10 )
         self.addLink( GEN , FRA, bw=10 )
+        self.addLink( FRA , GEN, bw=10 )
         self.addLink( GEN , PAR, bw=10 )
+        self.addLink( PAR , GEN, bw=10 )
+        self.addLink( GEN , PAR, bw=10 )
+        self.addLink( FRA , POZ, bw=10 )
         self.addLink( GEN , MAR, bw=10 )
         self.addLink( MAR , MAD, bw=10 )
         self.addLink( MAD , PAR, bw=10 )
         self.addLink( MAD , LIS, bw=10 )
         self.addLink( LIS , LON, bw=10 )
+        self.addLink( LON , LIS, bw=10 )
         self.addLink( LON , PAR, bw=10 )
         self.addLink( LON , DUB, bw=10 )
+        self.addLink( DUB , LON, bw=10 )
         self.addLink( LON , BRU, bw=10 )
         self.addLink( BRU , AMS, bw=10 )
         self.addLink( AMS , LUX, bw=10 )
@@ -154,7 +171,11 @@
         self.addLink( VIE , BRA, bw=10 )
         self.addLink( RIG , TLN, bw=10 )
         self.addLink( TLN , HAM, bw=10 )
-
+        self.addLink( OSL , STO, bw=10 )
+        self.addLink( STO , HEL, bw=10 )
+        self.addLink( STO , COP, bw=10 )
+        self.addLink( OSL , COP, bw=10 )
+        self.addLink( TLN , HEL, bw=10 )
 
 topos = { 'att': ( lambda: GeantMplsTopo() ) }