Using unique dpids for each topology and excluded the ipv6 pingall cases
Change-Id: I6ca88e57156b0949238a9e59629f185661fb1ab7
diff --git a/TestON/tests/CHOtest/Dependencies/topoAttIpv6.py b/TestON/tests/CHOtest/Dependencies/topoAttIpv6.py
index c5ca4c7..505cc0c 100755
--- a/TestON/tests/CHOtest/Dependencies/topoAttIpv6.py
+++ b/TestON/tests/CHOtest/Dependencies/topoAttIpv6.py
@@ -29,32 +29,31 @@
# Initialize Topology
Topo.__init__( self, **opts )
- # add nodes, switches first...
- NY54 = self.addSwitch( 's1' )
- CMBR = self.addSwitch( 's2' )
- CHCG = self.addSwitch( 's3' )
- CLEV = self.addSwitch( 's4' )
- RLGH = self.addSwitch( 's5' )
- ATLN = self.addSwitch( 's6' )
- PHLA = self.addSwitch( 's7' )
- WASH = self.addSwitch( 's8' )
- NSVL = self.addSwitch( 's9' )
- STLS = self.addSwitch( 's10' )
- NWOR = self.addSwitch( 's11' )
- HSTN = self.addSwitch( 's12' )
- SNAN = self.addSwitch( 's13' )
- DLLS = self.addSwitch( 's14' )
- ORLD = self.addSwitch( 's15' )
- DNVR = self.addSwitch( 's16' )
- KSCY = self.addSwitch( 's17' )
- SNFN = self.addSwitch( 's18' )
- SCRM = self.addSwitch( 's19' )
- PTLD = self.addSwitch( 's20' )
- STTL = self.addSwitch( 's21' )
- SLKC = self.addSwitch( 's22' )
- LA03 = self.addSwitch( 's23' )
- SNDG = self.addSwitch( 's24' )
- PHNX = self.addSwitch( 's25' )
+ NY54 = self.addSwitch( 's1', dpid='0000000000000001' )
+ CMBR = self.addSwitch( 's2', dpid='0000000000000002' )
+ CHCG = self.addSwitch( 's3', dpid='0000000000000003' )
+ CLEV = self.addSwitch( 's4', dpid='0000000000000004' )
+ RLGH = self.addSwitch( 's5', dpid='0000000000000005' )
+ ATLN = self.addSwitch( 's6', dpid='0000000000000006' )
+ PHLA = self.addSwitch( 's7', dpid='0000000000000007' )
+ WASH = self.addSwitch( 's8', dpid='0000000000000008' )
+ NSVL = self.addSwitch( 's9', dpid='0000000000000009' )
+ STLS = self.addSwitch( 's10', dpid='0000000000000010' )
+ NWOR = self.addSwitch( 's11', dpid='0000000000000011' )
+ HSTN = self.addSwitch( 's12', dpid='0000000000000012' )
+ SNAN = self.addSwitch( 's13', dpid='0000000000000013' )
+ DLLS = self.addSwitch( 's14', dpid='0000000000000014' )
+ ORLD = self.addSwitch( 's15', dpid='0000000000000015' )
+ DNVR = self.addSwitch( 's16', dpid='0000000000000016' )
+ KSCY = self.addSwitch( 's17', dpid='0000000000000017' )
+ SNFN = self.addSwitch( 's18', dpid='0000000000000018' )
+ SCRM = self.addSwitch( 's19', dpid='0000000000000019' )
+ PTLD = self.addSwitch( 's20', dpid='0000000000000020' )
+ STTL = self.addSwitch( 's21', dpid='0000000000000021' )
+ SLKC = self.addSwitch( 's22', dpid='0000000000000022' )
+ LA03 = self.addSwitch( 's23', dpid='0000000000000023' )
+ SNDG = self.addSwitch( 's24', dpid='0000000000000024' )
+ PHNX = self.addSwitch( 's25', dpid='0000000000000025' )
# ... and now hosts
NY54_host = self.addHost( 'h1', ip='10.1.0.1/24', cls=dualStackHost, v6Addr='1000::1/64' )