홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Andrea Campanella
Committed by Thomas Vachuska
87a59447 1 parent 80669bd5

Enhancing Geant Topo 

Change-Id: I71c9252d41cfc2efb29e25aae4900104565c0408
(cherry picked from commit ad509f92)
Inline Side-by-side
Showing 3 changed files with 32 additions and 5 deletions
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
38 exec="onos-mininet sendAndExpect gratuitousArp --expect ."/> 38 exec="onos-mininet sendAndExpect gratuitousArp --expect ."/>
39 39
40 <step name="Check-Summary" requires="ARP-Hosts" 40 <step name="Check-Summary" requires="ARP-Hosts"
41 - exec="onos-check-summary ${OC1} [0-9]* 25 140 25"/> 41 + exec="onos-check-summary ${OC1} [0-9]* 31 108 31"/>
42 42
43 <step name="Balance-Masters" requires="~Check-Summary" if="${OC2}" 43 <step name="Balance-Masters" requires="~Check-Summary" if="${OC2}"
44 exec="onos ${OC1} balance-masters"/> 44 exec="onos ${OC1} balance-masters"/>
......
...@@ -30,7 +30,10 @@ ...@@ -30,7 +30,10 @@
30 "of:0000000000000022": { "basic": { "name": "BDE", "latitude": 50.8285252, "longitude": -4.546936 }}, 30 "of:0000000000000022": { "basic": { "name": "BDE", "latitude": 50.8285252, "longitude": -4.546936 }},
31 "of:000000000000001a": { "basic": { "name": "MAR", "latitude": 43.2961743, "longitude": 5.3699525 }}, 31 "of:000000000000001a": { "basic": { "name": "MAR", "latitude": 43.2961743, "longitude": 5.3699525 }},
32 "of:000000000000001b": { "basic": { "name": "HAM", "latitude": 53.5503414, "longitude": 10.000654 }}, 32 "of:000000000000001b": { "basic": { "name": "HAM", "latitude": 53.5503414, "longitude": 10.000654 }},
33 - "of:000000000000001c": { "basic": { "name": "AMS", "latitude": 52.374436, "longitude": 4.8979956033677 }} 33 + "of:000000000000001c": { "basic": { "name": "AMS", "latitude": 52.374436, "longitude": 4.8979956033677 }},
34 + "of:000000000000001d": { "basic": { "name": "STO", "latitude": 59.3251172, "longitude": 18.0710935 }},
35 + "of:000000000000001e": { "basic": { "name": "OSL", "latitude": 59.9132694, "longitude": 10.7391112 }},
36 + "of:000000000000001f": { "basic": { "name": "HEL", "latitude": 60.1666277, "longitude": 24.9435079 }}
34 }, 37 },
35 "hosts": { 38 "hosts": {
36 "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 }}, 39 "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 @@ ...@@ -46,7 +49,7 @@
46 "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 }}, 49 "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 }},
47 "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 }}, 50 "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 }},
48 "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 }}, 51 "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 }},
49 - "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 }}, 52 + "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 }},
50 "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 }}, 53 "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 }},
51 "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 }}, 54 "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 }},
52 "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 }}, 55 "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 @@ ...@@ -62,7 +65,10 @@
62 "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 }}, 65 "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 }},
63 "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 }}, 66 "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 }},
64 "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 }}, 67 "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 }},
65 - "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 }} 68 + "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 }},
69 + "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 }},
70 + "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 }},
71 + "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 }}
66 } 72 }
67 73
68 } 74 }
......
...@@ -50,6 +50,9 @@ class GeantMplsTopo( Topo ): ...@@ -50,6 +50,9 @@ class GeantMplsTopo( Topo ):
50 MAR = self.addSwitch( 's26' ) 50 MAR = self.addSwitch( 's26' )
51 HAM = self.addSwitch( 's27' ) 51 HAM = self.addSwitch( 's27' )
52 AMS = self.addSwitch( 's28' ) 52 AMS = self.addSwitch( 's28' )
53 + STO = self.addSwitch( 's29' )
54 + OSL = self.addSwitch( 's30' )
55 + HEL = self.addSwitch( 's31' )
53 56
54 57
55 # ... and now hosts 58 # ... and now hosts
...@@ -81,6 +84,9 @@ class GeantMplsTopo( Topo ): ...@@ -81,6 +84,9 @@ class GeantMplsTopo( Topo ):
81 MAR_host = self.addHost( 'h26' ) 84 MAR_host = self.addHost( 'h26' )
82 HAM_host = self.addHost( 'h27' ) 85 HAM_host = self.addHost( 'h27' )
83 AMS_host = self.addHost( 'h28' ) 86 AMS_host = self.addHost( 'h28' )
87 + STO_host = self.addHost( 'h29' )
88 + OSL_host = self.addHost( 'h30' )
89 + HEL_host = self.addHost( 'h31' )
84 90
85 # add edges between switch and corresponding host 91 # add edges between switch and corresponding host
86 self.addLink( ATH , ATH_host ) 92 self.addLink( ATH , ATH_host )
...@@ -111,22 +117,33 @@ class GeantMplsTopo( Topo ): ...@@ -111,22 +117,33 @@ class GeantMplsTopo( Topo ):
111 self.addLink( MAR , MAR_host ) 117 self.addLink( MAR , MAR_host )
112 self.addLink( HAM , HAM_host ) 118 self.addLink( HAM , HAM_host )
113 self.addLink( AMS , AMS_host ) 119 self.addLink( AMS , AMS_host )
120 + self.addLink( STO , STO_host )
121 + self.addLink( HEL , HEL_host )
122 + self.addLink( OSL , OSL_host )
114 123
115 # add edges between switches 124 # add edges between switches
116 self.addLink( ATH , MIL, bw=10 ) 125 self.addLink( ATH , MIL, bw=10 )
126 + self.addLink( MIL , ATH, bw=10 )
117 self.addLink( MIL , VIE, bw=10 ) 127 self.addLink( MIL , VIE, bw=10 )
118 self.addLink( MIL , MAR, bw=10 ) 128 self.addLink( MIL , MAR, bw=10 )
119 self.addLink( MIL , GEN, bw=10 ) 129 self.addLink( MIL , GEN, bw=10 )
130 + self.addLink( GEN , MIL, bw=10 )
120 self.addLink( MIL , MLT, bw=10 ) 131 self.addLink( MIL , MLT, bw=10 )
121 self.addLink( GEN , FRA, bw=10 ) 132 self.addLink( GEN , FRA, bw=10 )
133 + self.addLink( FRA , GEN, bw=10 )
122 self.addLink( GEN , PAR, bw=10 ) 134 self.addLink( GEN , PAR, bw=10 )
135 + self.addLink( PAR , GEN, bw=10 )
136 + self.addLink( GEN , PAR, bw=10 )
137 + self.addLink( FRA , POZ, bw=10 )
123 self.addLink( GEN , MAR, bw=10 ) 138 self.addLink( GEN , MAR, bw=10 )
124 self.addLink( MAR , MAD, bw=10 ) 139 self.addLink( MAR , MAD, bw=10 )
125 self.addLink( MAD , PAR, bw=10 ) 140 self.addLink( MAD , PAR, bw=10 )
126 self.addLink( MAD , LIS, bw=10 ) 141 self.addLink( MAD , LIS, bw=10 )
127 self.addLink( LIS , LON, bw=10 ) 142 self.addLink( LIS , LON, bw=10 )
143 + self.addLink( LON , LIS, bw=10 )
128 self.addLink( LON , PAR, bw=10 ) 144 self.addLink( LON , PAR, bw=10 )
129 self.addLink( LON , DUB, bw=10 ) 145 self.addLink( LON , DUB, bw=10 )
146 + self.addLink( DUB , LON, bw=10 )
130 self.addLink( LON , BRU, bw=10 ) 147 self.addLink( LON , BRU, bw=10 )
131 self.addLink( BRU , AMS, bw=10 ) 148 self.addLink( BRU , AMS, bw=10 )
132 self.addLink( AMS , LUX, bw=10 ) 149 self.addLink( AMS , LUX, bw=10 )
...@@ -154,7 +171,11 @@ class GeantMplsTopo( Topo ): ...@@ -154,7 +171,11 @@ class GeantMplsTopo( Topo ):
154 self.addLink( VIE , BRA, bw=10 ) 171 self.addLink( VIE , BRA, bw=10 )
155 self.addLink( RIG , TLN, bw=10 ) 172 self.addLink( RIG , TLN, bw=10 )
156 self.addLink( TLN , HAM, bw=10 ) 173 self.addLink( TLN , HAM, bw=10 )
157 - 174 + self.addLink( OSL , STO, bw=10 )
175 + self.addLink( STO , HEL, bw=10 )
176 + self.addLink( STO , COP, bw=10 )
177 + self.addLink( OSL , COP, bw=10 )
178 + self.addLink( TLN , HEL, bw=10 )
158 179
159 topos = { 'att': ( lambda: GeantMplsTopo() ) } 180 topos = { 'att': ( lambda: GeantMplsTopo() ) }
160 181
......