From 5160dbb84d39beeca1b227e0e4700dbb7ac3d77a Mon Sep 17 00:00:00 2001 From: Thomas Vachuska Date: Tue, 14 Jul 2015 10:21:45 -0700 Subject: [PATCH] Adding multiple links to the ATT MPLS test topology. Change-Id: I0ae7bfcbc733d11c392ebdcc752ac2c75f8f5d99 --- tools/test/topos/attmpls.py | 15 +++- tools/test/topos/attmplsfast.py | 127 ++++++++++++++++++-------------- 2 files changed, 84 insertions(+), 58 deletions(-) diff --git a/tools/test/topos/attmpls.py b/tools/test/topos/attmpls.py index 8b75df71db..4fe711546d 100644 --- a/tools/test/topos/attmpls.py +++ b/tools/test/topos/attmpls.py @@ -104,8 +104,11 @@ class AttMplsTopo( Topo ): # add edges between switches self.addLink( NY54 , CMBR, bw=10, delay='0.979030824185ms') + self.addLink( NY54 , CMBR, bw=10, delay='0.979030824185ms') + self.addLink( NY54 , CMBR, bw=10, delay='0.979030824185ms') self.addLink( NY54 , CHCG, bw=10, delay='0.806374975652ms') self.addLink( NY54 , PHLA, bw=10, delay='0.686192970166ms') + self.addLink( NY54 , PHLA, bw=10, delay='0.686192970166ms') self.addLink( NY54 , WASH, bw=10, delay='0.605826192092ms') self.addLink( CMBR , PHLA, bw=10, delay='1.4018238197ms') self.addLink( CHCG , CLEV, bw=10, delay='0.232315346482ms') @@ -113,6 +116,7 @@ class AttMplsTopo( Topo ): self.addLink( CHCG , STLS, bw=10, delay='1.12827896944ms') self.addLink( CHCG , DNVR, bw=10, delay='1.35964770335ms') self.addLink( CHCG , KSCY, bw=10, delay='1.5199778541ms') + self.addLink( CHCG , KSCY, bw=10, delay='1.5199778541ms') self.addLink( CHCG , SNFN, bw=10, delay='0.620743405435ms') self.addLink( CHCG , STTL, bw=10, delay='0.93027212534ms') self.addLink( CHCG , SLKC, bw=10, delay='0.735621751348ms') @@ -125,6 +129,8 @@ class AttMplsTopo( Topo ): self.addLink( ATLN , NSVL, bw=10, delay='1.32869749865ms') self.addLink( ATLN , STLS, bw=10, delay='0.767705554748ms') self.addLink( ATLN , DLLS, bw=10, delay='0.544782086448ms') + self.addLink( ATLN , DLLS, bw=10, delay='0.544782086448ms') + self.addLink( ATLN , DLLS, bw=10, delay='0.544782086448ms') self.addLink( ATLN , ORLD, bw=10, delay='1.46119152532ms') self.addLink( PHLA , WASH, bw=10, delay='0.372209320106ms') self.addLink( NSVL , STLS, bw=10, delay='1.43250491305ms') @@ -141,11 +147,15 @@ class AttMplsTopo( Topo ): self.addLink( SNAN , PHNX, bw=10, delay='1.34258627257ms') self.addLink( SNAN , DLLS, bw=10, delay='1.50063532341ms') self.addLink( DLLS , DNVR, bw=10, delay='0.251471593235ms') + self.addLink( DLLS , DNVR, bw=10, delay='0.251471593235ms') + self.addLink( DLLS , KSCY, bw=10, delay='0.18026026737ms') self.addLink( DLLS , KSCY, bw=10, delay='0.18026026737ms') self.addLink( DLLS , SNFN, bw=10, delay='0.74304274592ms') self.addLink( DLLS , LA03, bw=10, delay='0.506439293357ms') + self.addLink( DLLS , LA03, bw=10, delay='0.506439293357ms') self.addLink( DNVR , KSCY, bw=10, delay='0.223328790403ms') self.addLink( DNVR , SNFN, bw=10, delay='0.889017541903ms') + self.addLink( DNVR , SNFN, bw=10, delay='0.889017541903ms') self.addLink( DNVR , SLKC, bw=10, delay='0.631898982721ms') self.addLink( KSCY , SNFN, bw=10, delay='0.922778522233ms') self.addLink( SNFN , SCRM, bw=10, delay='0.630352278097ms') @@ -153,12 +163,15 @@ class AttMplsTopo( Topo ): self.addLink( SNFN , STTL, bw=10, delay='1.54076081649ms') self.addLink( SNFN , SLKC, bw=10, delay='0.621507502625ms') self.addLink( SNFN , LA03, bw=10, delay='0.602936230151ms') + self.addLink( SNFN , LA03, bw=10, delay='0.602936230151ms') + self.addLink( SNFN , LA03, bw=10, delay='0.602936230151ms') self.addLink( SCRM , SLKC, bw=10, delay='0.461350343644ms') self.addLink( PTLD , STTL, bw=10, delay='1.17591515181ms') self.addLink( SLKC , LA03, bw=10, delay='0.243225267023ms') self.addLink( LA03 , SNDG, bw=10, delay='0.681264950821ms') + self.addLink( LA03 , SNDG, bw=10, delay='0.681264950821ms') + self.addLink( LA03 , PHNX, bw=10, delay='0.343709457969ms') self.addLink( LA03 , PHNX, bw=10, delay='0.343709457969ms') - # self.addLink( LA03 , PHNX, bw=10, delay='0.343709457969ms') self.addLink( SNDG , PHNX, bw=10, delay='0.345064487693ms') topos = { 'att': ( lambda: AttMplsTopo() ) } diff --git a/tools/test/topos/attmplsfast.py b/tools/test/topos/attmplsfast.py index c78f47a709..a020dc6a90 100644 --- a/tools/test/topos/attmplsfast.py +++ b/tools/test/topos/attmplsfast.py @@ -103,62 +103,75 @@ class AttMplsTopo( Topo ): self.addLink( PHNX , PHNX_host ) # add edges between switches - self.addLink( NY54 , CMBR ) - self.addLink( NY54 , CHCG ) - self.addLink( NY54 , PHLA ) - self.addLink( NY54 , WASH ) - self.addLink( CMBR , PHLA ) - self.addLink( CHCG , CLEV ) - self.addLink( CHCG , PHLA ) - self.addLink( CHCG , STLS ) - self.addLink( CHCG , DNVR ) - self.addLink( CHCG , KSCY ) - self.addLink( CHCG , SNFN ) - self.addLink( CHCG , STTL ) - self.addLink( CHCG , SLKC ) - self.addLink( CLEV , NSVL ) - self.addLink( CLEV , STLS ) - self.addLink( CLEV , PHLA ) - self.addLink( RLGH , ATLN ) - self.addLink( RLGH , WASH ) - self.addLink( ATLN , WASH ) - self.addLink( ATLN , NSVL ) - self.addLink( ATLN , STLS ) - self.addLink( ATLN , DLLS ) - self.addLink( ATLN , ORLD ) - self.addLink( PHLA , WASH ) - self.addLink( NSVL , STLS ) - self.addLink( NSVL , DLLS ) - self.addLink( STLS , DLLS ) - self.addLink( STLS , KSCY ) - self.addLink( STLS , LA03 ) - self.addLink( NWOR , HSTN ) - self.addLink( NWOR , DLLS ) - self.addLink( NWOR , ORLD ) - self.addLink( HSTN , SNAN ) - self.addLink( HSTN , DLLS ) - self.addLink( HSTN , ORLD ) - self.addLink( SNAN , PHNX ) - self.addLink( SNAN , DLLS ) - self.addLink( DLLS , DNVR ) - self.addLink( DLLS , KSCY ) - self.addLink( DLLS , SNFN ) - self.addLink( DLLS , LA03 ) - self.addLink( DNVR , KSCY ) - self.addLink( DNVR , SNFN ) - self.addLink( DNVR , SLKC ) - self.addLink( KSCY , SNFN ) - self.addLink( SNFN , SCRM ) - self.addLink( SNFN , PTLD ) - self.addLink( SNFN , STTL ) - self.addLink( SNFN , SLKC ) - self.addLink( SNFN , LA03 ) - self.addLink( SCRM , SLKC ) - self.addLink( PTLD , STTL ) - self.addLink( SLKC , LA03 ) - self.addLink( LA03 , SNDG ) - self.addLink( LA03 , PHNX ) - # self.addLink( LA03 , PHNX ) - self.addLink( SNDG , PHNX ) + self.addLink( NY54 , CMBR) + self.addLink( NY54 , CMBR) + self.addLink( NY54 , CMBR) + self.addLink( NY54 , CHCG) + self.addLink( NY54 , PHLA) + self.addLink( NY54 , PHLA) + self.addLink( NY54 , WASH) + self.addLink( CMBR , PHLA) + self.addLink( CHCG , CLEV) + self.addLink( CHCG , PHLA) + self.addLink( CHCG , STLS) + self.addLink( CHCG , DNVR) + self.addLink( CHCG , KSCY) + self.addLink( CHCG , KSCY) + self.addLink( CHCG , SNFN) + self.addLink( CHCG , STTL) + self.addLink( CHCG , SLKC) + self.addLink( CLEV , NSVL) + self.addLink( CLEV , STLS) + self.addLink( CLEV , PHLA) + self.addLink( RLGH , ATLN) + self.addLink( RLGH , WASH) + self.addLink( ATLN , WASH) + self.addLink( ATLN , NSVL) + self.addLink( ATLN , STLS) + self.addLink( ATLN , DLLS) + self.addLink( ATLN , DLLS) + self.addLink( ATLN , DLLS) + self.addLink( ATLN , ORLD) + self.addLink( PHLA , WASH) + self.addLink( NSVL , STLS) + self.addLink( NSVL , DLLS) + self.addLink( STLS , DLLS) + self.addLink( STLS , KSCY) + self.addLink( STLS , LA03) + self.addLink( NWOR , HSTN) + self.addLink( NWOR , DLLS) + self.addLink( NWOR , ORLD) + self.addLink( HSTN , SNAN) + self.addLink( HSTN , DLLS) + self.addLink( HSTN , ORLD) + self.addLink( SNAN , PHNX) + self.addLink( SNAN , DLLS) + self.addLink( DLLS , DNVR) + self.addLink( DLLS , DNVR) + self.addLink( DLLS , KSCY) + self.addLink( DLLS , KSCY) + self.addLink( DLLS , SNFN) + self.addLink( DLLS , LA03) + self.addLink( DLLS , LA03) + self.addLink( DNVR , KSCY) + self.addLink( DNVR , SNFN) + self.addLink( DNVR , SNFN) + self.addLink( DNVR , SLKC) + self.addLink( KSCY , SNFN) + self.addLink( SNFN , SCRM) + self.addLink( SNFN , PTLD) + self.addLink( SNFN , STTL) + self.addLink( SNFN , SLKC) + self.addLink( SNFN , LA03) + self.addLink( SNFN , LA03) + self.addLink( SNFN , LA03) + self.addLink( SCRM , SLKC) + self.addLink( PTLD , STTL) + self.addLink( SLKC , LA03) + self.addLink( LA03 , SNDG) + self.addLink( LA03 , SNDG) + self.addLink( LA03 , PHNX) + self.addLink( LA03 , PHNX) + self.addLink( SNDG , PHNX) topos = { 'att': ( lambda: AttMplsTopo() ) }