commit 5160dbb84d39beeca1b227e0e4700dbb7ac3d77a
author Thomas Vachuska <tom@onlab.us> Tue Jul 14 10:21:45 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Jul 14 17:24:28 2015 +0000
tree 2e851e9092107c37578c91539a51ef43fbd3595f
parent 18046d44aaa93cb905426164ffdbbf08a39afd88

Adding multiple links to the ATT MPLS test topology.

Change-Id: I0ae7bfcbc733d11c392ebdcc752ac2c75f8f5d99

tools/test/topos/attmplsfast.py

diff --git a/tools/test/topos/attmplsfast.py b/tools/test/topos/attmplsfast.py
index c78f47a..a020dc6 100644
--- a/tools/test/topos/attmplsfast.py
+++ b/tools/test/topos/attmplsfast.py
@@ -103,62 +103,75 @@
         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() ) }