홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
5160dbb8 1 parent 18046d44

Adding multiple links to the ATT MPLS test topology. 

Change-Id: I0ae7bfcbc733d11c392ebdcc752ac2c75f8f5d99
Inline Side-by-side
Showing 2 changed files with 84 additions and 58 deletions
...@@ -104,8 +104,11 @@ class AttMplsTopo( Topo ): ...@@ -104,8 +104,11 @@ class AttMplsTopo( Topo ):
104 104
105 # add edges between switches 105 # add edges between switches
106 self.addLink( NY54 , CMBR, bw=10, delay='0.979030824185ms') 106 self.addLink( NY54 , CMBR, bw=10, delay='0.979030824185ms')
107 + self.addLink( NY54 , CMBR, bw=10, delay='0.979030824185ms')
108 + self.addLink( NY54 , CMBR, bw=10, delay='0.979030824185ms')
107 self.addLink( NY54 , CHCG, bw=10, delay='0.806374975652ms') 109 self.addLink( NY54 , CHCG, bw=10, delay='0.806374975652ms')
108 self.addLink( NY54 , PHLA, bw=10, delay='0.686192970166ms') 110 self.addLink( NY54 , PHLA, bw=10, delay='0.686192970166ms')
111 + self.addLink( NY54 , PHLA, bw=10, delay='0.686192970166ms')
109 self.addLink( NY54 , WASH, bw=10, delay='0.605826192092ms') 112 self.addLink( NY54 , WASH, bw=10, delay='0.605826192092ms')
110 self.addLink( CMBR , PHLA, bw=10, delay='1.4018238197ms') 113 self.addLink( CMBR , PHLA, bw=10, delay='1.4018238197ms')
111 self.addLink( CHCG , CLEV, bw=10, delay='0.232315346482ms') 114 self.addLink( CHCG , CLEV, bw=10, delay='0.232315346482ms')
...@@ -113,6 +116,7 @@ class AttMplsTopo( Topo ): ...@@ -113,6 +116,7 @@ class AttMplsTopo( Topo ):
113 self.addLink( CHCG , STLS, bw=10, delay='1.12827896944ms') 116 self.addLink( CHCG , STLS, bw=10, delay='1.12827896944ms')
114 self.addLink( CHCG , DNVR, bw=10, delay='1.35964770335ms') 117 self.addLink( CHCG , DNVR, bw=10, delay='1.35964770335ms')
115 self.addLink( CHCG , KSCY, bw=10, delay='1.5199778541ms') 118 self.addLink( CHCG , KSCY, bw=10, delay='1.5199778541ms')
119 + self.addLink( CHCG , KSCY, bw=10, delay='1.5199778541ms')
116 self.addLink( CHCG , SNFN, bw=10, delay='0.620743405435ms') 120 self.addLink( CHCG , SNFN, bw=10, delay='0.620743405435ms')
117 self.addLink( CHCG , STTL, bw=10, delay='0.93027212534ms') 121 self.addLink( CHCG , STTL, bw=10, delay='0.93027212534ms')
118 self.addLink( CHCG , SLKC, bw=10, delay='0.735621751348ms') 122 self.addLink( CHCG , SLKC, bw=10, delay='0.735621751348ms')
...@@ -125,6 +129,8 @@ class AttMplsTopo( Topo ): ...@@ -125,6 +129,8 @@ class AttMplsTopo( Topo ):
125 self.addLink( ATLN , NSVL, bw=10, delay='1.32869749865ms') 129 self.addLink( ATLN , NSVL, bw=10, delay='1.32869749865ms')
126 self.addLink( ATLN , STLS, bw=10, delay='0.767705554748ms') 130 self.addLink( ATLN , STLS, bw=10, delay='0.767705554748ms')
127 self.addLink( ATLN , DLLS, bw=10, delay='0.544782086448ms') 131 self.addLink( ATLN , DLLS, bw=10, delay='0.544782086448ms')
132 + self.addLink( ATLN , DLLS, bw=10, delay='0.544782086448ms')
133 + self.addLink( ATLN , DLLS, bw=10, delay='0.544782086448ms')
128 self.addLink( ATLN , ORLD, bw=10, delay='1.46119152532ms') 134 self.addLink( ATLN , ORLD, bw=10, delay='1.46119152532ms')
129 self.addLink( PHLA , WASH, bw=10, delay='0.372209320106ms') 135 self.addLink( PHLA , WASH, bw=10, delay='0.372209320106ms')
130 self.addLink( NSVL , STLS, bw=10, delay='1.43250491305ms') 136 self.addLink( NSVL , STLS, bw=10, delay='1.43250491305ms')
...@@ -141,11 +147,15 @@ class AttMplsTopo( Topo ): ...@@ -141,11 +147,15 @@ class AttMplsTopo( Topo ):
141 self.addLink( SNAN , PHNX, bw=10, delay='1.34258627257ms') 147 self.addLink( SNAN , PHNX, bw=10, delay='1.34258627257ms')
142 self.addLink( SNAN , DLLS, bw=10, delay='1.50063532341ms') 148 self.addLink( SNAN , DLLS, bw=10, delay='1.50063532341ms')
143 self.addLink( DLLS , DNVR, bw=10, delay='0.251471593235ms') 149 self.addLink( DLLS , DNVR, bw=10, delay='0.251471593235ms')
150 + self.addLink( DLLS , DNVR, bw=10, delay='0.251471593235ms')
151 + self.addLink( DLLS , KSCY, bw=10, delay='0.18026026737ms')
144 self.addLink( DLLS , KSCY, bw=10, delay='0.18026026737ms') 152 self.addLink( DLLS , KSCY, bw=10, delay='0.18026026737ms')
145 self.addLink( DLLS , SNFN, bw=10, delay='0.74304274592ms') 153 self.addLink( DLLS , SNFN, bw=10, delay='0.74304274592ms')
146 self.addLink( DLLS , LA03, bw=10, delay='0.506439293357ms') 154 self.addLink( DLLS , LA03, bw=10, delay='0.506439293357ms')
155 + self.addLink( DLLS , LA03, bw=10, delay='0.506439293357ms')
147 self.addLink( DNVR , KSCY, bw=10, delay='0.223328790403ms') 156 self.addLink( DNVR , KSCY, bw=10, delay='0.223328790403ms')
148 self.addLink( DNVR , SNFN, bw=10, delay='0.889017541903ms') 157 self.addLink( DNVR , SNFN, bw=10, delay='0.889017541903ms')
158 + self.addLink( DNVR , SNFN, bw=10, delay='0.889017541903ms')
149 self.addLink( DNVR , SLKC, bw=10, delay='0.631898982721ms') 159 self.addLink( DNVR , SLKC, bw=10, delay='0.631898982721ms')
150 self.addLink( KSCY , SNFN, bw=10, delay='0.922778522233ms') 160 self.addLink( KSCY , SNFN, bw=10, delay='0.922778522233ms')
151 self.addLink( SNFN , SCRM, bw=10, delay='0.630352278097ms') 161 self.addLink( SNFN , SCRM, bw=10, delay='0.630352278097ms')
...@@ -153,12 +163,15 @@ class AttMplsTopo( Topo ): ...@@ -153,12 +163,15 @@ class AttMplsTopo( Topo ):
153 self.addLink( SNFN , STTL, bw=10, delay='1.54076081649ms') 163 self.addLink( SNFN , STTL, bw=10, delay='1.54076081649ms')
154 self.addLink( SNFN , SLKC, bw=10, delay='0.621507502625ms') 164 self.addLink( SNFN , SLKC, bw=10, delay='0.621507502625ms')
155 self.addLink( SNFN , LA03, bw=10, delay='0.602936230151ms') 165 self.addLink( SNFN , LA03, bw=10, delay='0.602936230151ms')
166 + self.addLink( SNFN , LA03, bw=10, delay='0.602936230151ms')
167 + self.addLink( SNFN , LA03, bw=10, delay='0.602936230151ms')
156 self.addLink( SCRM , SLKC, bw=10, delay='0.461350343644ms') 168 self.addLink( SCRM , SLKC, bw=10, delay='0.461350343644ms')
157 self.addLink( PTLD , STTL, bw=10, delay='1.17591515181ms') 169 self.addLink( PTLD , STTL, bw=10, delay='1.17591515181ms')
158 self.addLink( SLKC , LA03, bw=10, delay='0.243225267023ms') 170 self.addLink( SLKC , LA03, bw=10, delay='0.243225267023ms')
159 self.addLink( LA03 , SNDG, bw=10, delay='0.681264950821ms') 171 self.addLink( LA03 , SNDG, bw=10, delay='0.681264950821ms')
172 + self.addLink( LA03 , SNDG, bw=10, delay='0.681264950821ms')
173 + self.addLink( LA03 , PHNX, bw=10, delay='0.343709457969ms')
160 self.addLink( LA03 , PHNX, bw=10, delay='0.343709457969ms') 174 self.addLink( LA03 , PHNX, bw=10, delay='0.343709457969ms')
161 - # self.addLink( LA03 , PHNX, bw=10, delay='0.343709457969ms')
162 self.addLink( SNDG , PHNX, bw=10, delay='0.345064487693ms') 175 self.addLink( SNDG , PHNX, bw=10, delay='0.345064487693ms')
163 176
164 topos = { 'att': ( lambda: AttMplsTopo() ) } 177 topos = { 'att': ( lambda: AttMplsTopo() ) }
......
...@@ -103,62 +103,75 @@ class AttMplsTopo( Topo ): ...@@ -103,62 +103,75 @@ class AttMplsTopo( Topo ):
103 self.addLink( PHNX , PHNX_host ) 103 self.addLink( PHNX , PHNX_host )
104 104
105 # add edges between switches 105 # add edges between switches
106 - self.addLink( NY54 , CMBR ) 106 + self.addLink( NY54 , CMBR)
107 - self.addLink( NY54 , CHCG ) 107 + self.addLink( NY54 , CMBR)
108 - self.addLink( NY54 , PHLA ) 108 + self.addLink( NY54 , CMBR)
109 - self.addLink( NY54 , WASH ) 109 + self.addLink( NY54 , CHCG)
110 - self.addLink( CMBR , PHLA ) 110 + self.addLink( NY54 , PHLA)
111 - self.addLink( CHCG , CLEV ) 111 + self.addLink( NY54 , PHLA)
112 - self.addLink( CHCG , PHLA ) 112 + self.addLink( NY54 , WASH)
113 - self.addLink( CHCG , STLS ) 113 + self.addLink( CMBR , PHLA)
114 - self.addLink( CHCG , DNVR ) 114 + self.addLink( CHCG , CLEV)
115 - self.addLink( CHCG , KSCY ) 115 + self.addLink( CHCG , PHLA)
116 - self.addLink( CHCG , SNFN ) 116 + self.addLink( CHCG , STLS)
117 - self.addLink( CHCG , STTL ) 117 + self.addLink( CHCG , DNVR)
118 - self.addLink( CHCG , SLKC ) 118 + self.addLink( CHCG , KSCY)
119 - self.addLink( CLEV , NSVL ) 119 + self.addLink( CHCG , KSCY)
120 - self.addLink( CLEV , STLS ) 120 + self.addLink( CHCG , SNFN)
121 - self.addLink( CLEV , PHLA ) 121 + self.addLink( CHCG , STTL)
122 - self.addLink( RLGH , ATLN ) 122 + self.addLink( CHCG , SLKC)
123 - self.addLink( RLGH , WASH ) 123 + self.addLink( CLEV , NSVL)
124 - self.addLink( ATLN , WASH ) 124 + self.addLink( CLEV , STLS)
125 - self.addLink( ATLN , NSVL ) 125 + self.addLink( CLEV , PHLA)
126 - self.addLink( ATLN , STLS ) 126 + self.addLink( RLGH , ATLN)
127 - self.addLink( ATLN , DLLS ) 127 + self.addLink( RLGH , WASH)
128 - self.addLink( ATLN , ORLD ) 128 + self.addLink( ATLN , WASH)
129 - self.addLink( PHLA , WASH ) 129 + self.addLink( ATLN , NSVL)
130 - self.addLink( NSVL , STLS ) 130 + self.addLink( ATLN , STLS)
131 - self.addLink( NSVL , DLLS ) 131 + self.addLink( ATLN , DLLS)
132 - self.addLink( STLS , DLLS ) 132 + self.addLink( ATLN , DLLS)
133 - self.addLink( STLS , KSCY ) 133 + self.addLink( ATLN , DLLS)
134 - self.addLink( STLS , LA03 ) 134 + self.addLink( ATLN , ORLD)
135 - self.addLink( NWOR , HSTN ) 135 + self.addLink( PHLA , WASH)
136 - self.addLink( NWOR , DLLS ) 136 + self.addLink( NSVL , STLS)
137 - self.addLink( NWOR , ORLD ) 137 + self.addLink( NSVL , DLLS)
138 - self.addLink( HSTN , SNAN ) 138 + self.addLink( STLS , DLLS)
139 - self.addLink( HSTN , DLLS ) 139 + self.addLink( STLS , KSCY)
140 - self.addLink( HSTN , ORLD ) 140 + self.addLink( STLS , LA03)
141 - self.addLink( SNAN , PHNX ) 141 + self.addLink( NWOR , HSTN)
142 - self.addLink( SNAN , DLLS ) 142 + self.addLink( NWOR , DLLS)
143 - self.addLink( DLLS , DNVR ) 143 + self.addLink( NWOR , ORLD)
144 - self.addLink( DLLS , KSCY ) 144 + self.addLink( HSTN , SNAN)
145 - self.addLink( DLLS , SNFN ) 145 + self.addLink( HSTN , DLLS)
146 - self.addLink( DLLS , LA03 ) 146 + self.addLink( HSTN , ORLD)
147 - self.addLink( DNVR , KSCY ) 147 + self.addLink( SNAN , PHNX)
148 - self.addLink( DNVR , SNFN ) 148 + self.addLink( SNAN , DLLS)
149 - self.addLink( DNVR , SLKC ) 149 + self.addLink( DLLS , DNVR)
150 - self.addLink( KSCY , SNFN ) 150 + self.addLink( DLLS , DNVR)
151 - self.addLink( SNFN , SCRM ) 151 + self.addLink( DLLS , KSCY)
152 - self.addLink( SNFN , PTLD ) 152 + self.addLink( DLLS , KSCY)
153 - self.addLink( SNFN , STTL ) 153 + self.addLink( DLLS , SNFN)
154 - self.addLink( SNFN , SLKC ) 154 + self.addLink( DLLS , LA03)
155 - self.addLink( SNFN , LA03 ) 155 + self.addLink( DLLS , LA03)
156 - self.addLink( SCRM , SLKC ) 156 + self.addLink( DNVR , KSCY)
157 - self.addLink( PTLD , STTL ) 157 + self.addLink( DNVR , SNFN)
158 - self.addLink( SLKC , LA03 ) 158 + self.addLink( DNVR , SNFN)
159 - self.addLink( LA03 , SNDG ) 159 + self.addLink( DNVR , SLKC)
160 - self.addLink( LA03 , PHNX ) 160 + self.addLink( KSCY , SNFN)
161 - # self.addLink( LA03 , PHNX ) 161 + self.addLink( SNFN , SCRM)
162 - self.addLink( SNDG , PHNX ) 162 + self.addLink( SNFN , PTLD)
163 + self.addLink( SNFN , STTL)
164 + self.addLink( SNFN , SLKC)
165 + self.addLink( SNFN , LA03)
166 + self.addLink( SNFN , LA03)
167 + self.addLink( SNFN , LA03)
168 + self.addLink( SCRM , SLKC)
169 + self.addLink( PTLD , STTL)
170 + self.addLink( SLKC , LA03)
171 + self.addLink( LA03 , SNDG)
172 + self.addLink( LA03 , SNDG)
173 + self.addLink( LA03 , PHNX)
174 + self.addLink( LA03 , PHNX)
175 + self.addLink( SNDG , PHNX)
163 176
164 topos = { 'att': ( lambda: AttMplsTopo() ) } 177 topos = { 'att': ( lambda: AttMplsTopo() ) }
......