Enhancing Geant Topo
Change-Id: I71c9252d41cfc2efb29e25aae4900104565c0408
diff --git a/tools/test/scenarios/net-setup-geant.xml b/tools/test/scenarios/net-setup-geant.xml
index 07a84c5..c668347 100644
--- a/tools/test/scenarios/net-setup-geant.xml
+++ b/tools/test/scenarios/net-setup-geant.xml
@@ -38,7 +38,7 @@
exec="onos-mininet sendAndExpect gratuitousArp --expect ."/>
<step name="Check-Summary" requires="ARP-Hosts"
- exec="onos-check-summary ${OC1} [0-9]* 25 140 25"/>
+ exec="onos-check-summary ${OC1} [0-9]* 31 108 31"/>
<step name="Balance-Masters" requires="~Check-Summary" if="${OC2}"
exec="onos ${OC1} balance-masters"/>
diff --git a/tools/test/topos/geantmpls-cfg.json b/tools/test/topos/geantmpls-cfg.json
index 7514e74..a3d9bee 100644
--- a/tools/test/topos/geantmpls-cfg.json
+++ b/tools/test/topos/geantmpls-cfg.json
@@ -30,7 +30,10 @@
"of:0000000000000022": { "basic": { "name": "BDE", "latitude": 50.8285252, "longitude": -4.546936 }},
"of:000000000000001a": { "basic": { "name": "MAR", "latitude": 43.2961743, "longitude": 5.3699525 }},
"of:000000000000001b": { "basic": { "name": "HAM", "latitude": 53.5503414, "longitude": 10.000654 }},
- "of:000000000000001c": { "basic": { "name": "AMS", "latitude": 52.374436, "longitude": 4.8979956033677 }}
+ "of:000000000000001c": { "basic": { "name": "AMS", "latitude": 52.374436, "longitude": 4.8979956033677 }},
+ "of:000000000000001d": { "basic": { "name": "STO", "latitude": 59.3251172, "longitude": 18.0710935 }},
+ "of:000000000000001e": { "basic": { "name": "OSL", "latitude": 59.9132694, "longitude": 10.7391112 }},
+ "of:000000000000001f": { "basic": { "name": "HEL", "latitude": 60.1666277, "longitude": 24.9435079 }}
},
"hosts": {
"00:00:00:00:00:01/-1": { "basic": { "location": "of:0000000000000001/1", "ips": [ "10.0.0.1" ], "name": "ATH", "latitude": 34.9841493, "longitude": 24.7279843 }},
@@ -46,7 +49,7 @@
"00:00:00:00:00:0b/-1": { "basic": { "location": "of:000000000000000b/1", "ips": [ "10.0.0.11" ], "name": "BUC", "latitude": 47.4361414, "longitude": 26.1027443 }},
"00:00:00:00:00:0c/-1": { "basic": { "location": "of:000000000000000c/1", "ips": [ "10.0.0.12" ], "name": "VIE", "latitude": 48.2083537, "longitude": 13.3725042 }},
"00:00:00:00:00:0d/-1": { "basic": { "location": "of:000000000000000d/1", "ips": [ "10.0.0.13" ], "name": "FRA", "latitude": 48.1106529, "longitude": 9.2820934 }},
- "00:00:00:00:00:0e/-1": { "basic": { "location": "of:000000000000000e/1", "ips": [ "10.0.0.14" ], "name": "COP", "latitude": 57.6867243, "longitude": 10.0700724 }},
+ "00:00:00:00:00:0e/-1": { "basic": { "location": "of:000000000000000e/1", "ips": [ "10.0.0.14" ], "name": "COP", "latitude": 57.1867243, "longitude": 9.5700724 }},
"00:00:00:00:00:0f/-1": { "basic": { "location": "of:000000000000000f/1", "ips": [ "10.0.0.15" ], "name": "TLN", "latitude": 59.4372155, "longitude": 26.7453688 }},
"00:00:00:00:00:10/-1": { "basic": { "location": "of:0000000000000010/1", "ips": [ "10.0.0.16" ], "name": "RIG", "latitude": 56.9493977, "longitude": 26.1051846 }},
"00:00:00:00:00:11/-1": { "basic": { "location": "of:0000000000000011/1", "ips": [ "10.0.0.17" ], "name": "KAU", "latitude": 52.8981061, "longitude": 24.9117515 }},
@@ -62,7 +65,10 @@
"00:00:00:00:00:22/-1": { "basic": { "location": "of:0000000000000022/1", "ips": [ "10.0.0.27" ], "name": "BDE", "latitude": 50.8285252, "longitude": -4.546936 }},
"00:00:00:00:00:1a/-1": { "basic": { "location": "of:000000000000001a/1", "ips": [ "10.0.0.28" ], "name": "MAR", "latitude": 43.374436, "longitude": 3.3699525 }},
"00:00:00:00:00:1b/-1": { "basic": { "location": "of:000000000000001b/1", "ips": [ "10.0.0.27" ], "name": "HAM", "latitude": 52.6996415, "longitude": 11.6301627 }},
- "00:00:00:00:00:1c/-1": { "basic": { "location": "of:000000000000001c/1", "ips": [ "10.0.0.29" ], "name": "AMS", "latitude": 51.374436, "longitude": 7.3979956033677 }}
+ "00:00:00:00:00:1c/-1": { "basic": { "location": "of:000000000000001c/1", "ips": [ "10.0.0.29" ], "name": "AMS", "latitude": 51.374436, "longitude": 7.3979956033677 }},
+ "00:00:00:00:00:1d/-1": { "basic": { "location": "of:000000000000001d/1", "ips": [ "10.0.0.30" ], "name": "STO", "latitude": 61.3251172, "longitude": 16.0710935 }},
+ "00:00:00:00:00:1e/-1": { "basic": { "location": "of:000000000000001e/1", "ips": [ "10.0.0.31" ], "name": "OSL", "latitude": 61.9132694, "longitude": 9.7391112 }},
+ "00:00:00:00:00:1f/-1": { "basic": { "location": "of:000000000000001f/1", "ips": [ "10.0.0.32" ], "name": "HEL", "latitude": 62.1666277, "longitude": 24.9435079 }}
}
}
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() ) }