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' )
diff --git a/TestON/tests/CHOtest/Dependencies/topoChordalIpv6.py b/TestON/tests/CHOtest/Dependencies/topoChordalIpv6.py
index 64b0405..b181c6c 100755
--- a/TestON/tests/CHOtest/Dependencies/topoChordalIpv6.py
+++ b/TestON/tests/CHOtest/Dependencies/topoChordalIpv6.py
@@ -27,32 +27,31 @@
         # Initialize Topology
         Topo.__init__( self, **opts )
 
-        # add nodes, switches first...
-        s1 = self.addSwitch( 's1' )
-        s2 = self.addSwitch( 's2' )
-        s3 = self.addSwitch( 's3' )
-        s4 = self.addSwitch( 's4' )
-        s5 = self.addSwitch( 's5' )
-        s6 = self.addSwitch( 's6' )
-        s7 = self.addSwitch( 's7' )
-        s8 = self.addSwitch( 's8' )
-        s9 = self.addSwitch( 's9' )
-        s10 = self.addSwitch( 's10' )
-        s11 = self.addSwitch( 's11' )
-        s12 = self.addSwitch( 's12' )
-        s13 = self.addSwitch( 's13' )
-        s14 = self.addSwitch( 's14' )
-        s15 = self.addSwitch( 's15' )
-        s16 = self.addSwitch( 's16' )
-        s17 = self.addSwitch( 's17' )
-        s18 = self.addSwitch( 's18' )
-        s19 = self.addSwitch( 's19' )
-        s20 = self.addSwitch( 's20' )
-        s21 = self.addSwitch( 's21' )
-        s22 = self.addSwitch( 's22' )
-        s23 = self.addSwitch( 's23' )
-        s24 = self.addSwitch( 's24' )
-        s25 = self.addSwitch( 's25' )
+        s1 = self.addSwitch( 's1', dpid='1000000000000001' )
+        s2 = self.addSwitch( 's2', dpid='1000000000000002')
+        s3 = self.addSwitch( 's3', dpid='1000000000000003')
+        s4 = self.addSwitch( 's4', dpid='1000000000000004')
+        s5 = self.addSwitch( 's5', dpid='1000000000000005')
+        s6 = self.addSwitch( 's6', dpid='1000000000000006')
+        s7 = self.addSwitch( 's7', dpid='1000000000000007')
+        s8 = self.addSwitch( 's8', dpid='1000000000000008')
+        s9 = self.addSwitch( 's9', dpid='1000000000000009')
+        s10 = self.addSwitch( 's10', dpid='1000000000000010')
+        s11 = self.addSwitch( 's11', dpid='1000000000000011')
+        s12 = self.addSwitch( 's12', dpid='1000000000000012')
+        s13 = self.addSwitch( 's13', dpid='1000000000000013')
+        s14 = self.addSwitch( 's14', dpid='1000000000000014')
+        s15 = self.addSwitch( 's15', dpid='1000000000000015')
+        s16 = self.addSwitch( 's16', dpid='1000000000000016')
+        s17 = self.addSwitch( 's17', dpid='1000000000000017')
+        s18 = self.addSwitch( 's18', dpid='1000000000000018')
+        s19 = self.addSwitch( 's19', dpid='1000000000000019')
+        s20 = self.addSwitch( 's20', dpid='1000000000000020')
+        s21 = self.addSwitch( 's21', dpid='1000000000000021')
+        s22 = self.addSwitch( 's22', dpid='1000000000000022')
+        s23 = self.addSwitch( 's23', dpid='1000000000000023')
+        s24 = self.addSwitch( 's24', dpid='1000000000000024')
+        s25 = self.addSwitch( 's25', dpid='1000000000000025')
 
         # ... and now hosts
         s1_host = self.addHost( 'h1', ip='10.1.0.1/24', cls=dualStackHost, v6Addr='1000::1/64' )
diff --git a/TestON/tests/CHOtest/Dependencies/topoSpineIpv6.py b/TestON/tests/CHOtest/Dependencies/topoSpineIpv6.py
index 689adb3..c51a75d 100755
--- a/TestON/tests/CHOtest/Dependencies/topoSpineIpv6.py
+++ b/TestON/tests/CHOtest/Dependencies/topoSpineIpv6.py
@@ -26,86 +26,87 @@
         Topo.__init__( self, **opts )
 
         # add nodes, Leaf switches
-        s1 = self.addSwitch( 's1' )
-        s2 = self.addSwitch( 's2' )
-        s3 = self.addSwitch( 's3' )
-        s4 = self.addSwitch( 's4' )
-        s5 = self.addSwitch( 's5' )
-        s6 = self.addSwitch( 's6' )
-        s7 = self.addSwitch( 's7' )
-        s8 = self.addSwitch( 's8' )
-        s9 = self.addSwitch( 's9' )
-        s10 = self.addSwitch( 's10' )
-        s11 = self.addSwitch( 's11' )
-        s12 = self.addSwitch( 's12' )
-        s13 = self.addSwitch( 's13' )
-        s14 = self.addSwitch( 's14' )
+        s1 = self.addSwitch( 's1', dpid='2000000000000001')
+        s2 = self.addSwitch( 's2', dpid='2000000000000002' )
+        s3 = self.addSwitch( 's3', dpid='2000000000000003' )
+        s4 = self.addSwitch( 's4', dpid='2000000000000004' )
+        s5 = self.addSwitch( 's5', dpid='2000000000000005' )
+        s6 = self.addSwitch( 's6', dpid='2000000000000006' )
+        s7 = self.addSwitch( 's7', dpid='2000000000000007' )
+        s8 = self.addSwitch( 's8', dpid='2000000000000008' )
+        s9 = self.addSwitch( 's9', dpid='2000000000000009' )
+        s10 = self.addSwitch( 's10', dpid='2000000000000010' )
+        s11 = self.addSwitch( 's11', dpid='2000000000000011' )
+        s12 = self.addSwitch( 's12', dpid='2000000000000012' )
+        s13 = self.addSwitch( 's13', dpid='2000000000000013' )
+        s14 = self.addSwitch( 's14', dpid='2000000000000014' )
 
         # add nodes, Spine switches first...
-        s15 = self.addSwitch( 's15' )
-        s16 = self.addSwitch( 's16' )
-        s17 = self.addSwitch( 's17' )
-        s18 = self.addSwitch( 's18' )
-        s19 = self.addSwitch( 's19' )
-        s20 = self.addSwitch( 's20' )
-        s21 = self.addSwitch( 's21' )
-        s22 = self.addSwitch( 's22' )
-        s23 = self.addSwitch( 's23' )
-        s24 = self.addSwitch( 's24' )
-        s25 = self.addSwitch( 's25' )
-        s26 = self.addSwitch( 's26' )
-        s27 = self.addSwitch( 's27' )
-        s28 = self.addSwitch( 's28' )
-        s29 = self.addSwitch( 's29' )
-        s30 = self.addSwitch( 's30' )
-        s31 = self.addSwitch( 's31' )
-        s32 = self.addSwitch( 's32' )
-        s33 = self.addSwitch( 's33' )
-        s34 = self.addSwitch( 's34' )
-        s35 = self.addSwitch( 's35' )
-        s36 = self.addSwitch( 's36' )
-        s37 = self.addSwitch( 's37' )
-        s38 = self.addSwitch( 's38' )
-        s39 = self.addSwitch( 's39' )
-        s40 = self.addSwitch( 's40' )
-        s41 = self.addSwitch( 's41' )
-        s42 = self.addSwitch( 's42' )
-        s43 = self.addSwitch( 's43' )
-        s44 = self.addSwitch( 's44' )
-        s45 = self.addSwitch( 's45' )
-        s46 = self.addSwitch( 's46' )
-        s47 = self.addSwitch( 's47' )
-        s48 = self.addSwitch( 's48' )
-        s49 = self.addSwitch( 's49' )
-        s50 = self.addSwitch( 's50' )
-        s51 = self.addSwitch( 's51' )
-        s52 = self.addSwitch( 's52' )
-        s53 = self.addSwitch( 's53' )
-        s54 = self.addSwitch( 's54' )
-        s55 = self.addSwitch( 's55' )
-        s56 = self.addSwitch( 's56' )
-        s57 = self.addSwitch( 's57' )
-        s58 = self.addSwitch( 's58' )
-        s59 = self.addSwitch( 's59' )
-        s60 = self.addSwitch( 's60' )
-        s61 = self.addSwitch( 's61' )
-        s62 = self.addSwitch( 's62' )
-        s63 = self.addSwitch( 's63' )
-        s64 = self.addSwitch( 's64' )
-        s65 = self.addSwitch( 's65' )
-        s66 = self.addSwitch( 's66' )
-        s67 = self.addSwitch( 's67' )
-        s68 = self.addSwitch( 's68' )
-        s69 = self.addSwitch( 's69' )
-        s70 = self.addSwitch( 's70' )
-        s71 = self.addSwitch( 's71' )
-        s72 = self.addSwitch( 's72' )
-        s73 = self.addSwitch( 's73' )
-        s74 = self.addSwitch( 's74' )
-        s75 = self.addSwitch( 's75' )
-        s76 = self.addSwitch( 's76' )
-        s77 = self.addSwitch( 's77' )
-        s78 = self.addSwitch( 's78' )
+        s15 = self.addSwitch( 's15', dpid='2000000000000015' )
+        s16 = self.addSwitch( 's16', dpid='2000000000000016' )
+        s17 = self.addSwitch( 's17', dpid='2000000000000017' )
+        s18 = self.addSwitch( 's18', dpid='2000000000000018' )
+        s19 = self.addSwitch( 's19', dpid='2000000000000019' )
+        s20 = self.addSwitch( 's20', dpid='2000000000000020' )
+        s21 = self.addSwitch( 's21', dpid='2000000000000021' )
+        s22 = self.addSwitch( 's22', dpid='2000000000000022' )
+        s23 = self.addSwitch( 's23', dpid='2000000000000023' )
+        s24 = self.addSwitch( 's24', dpid='2000000000000024' )
+        s25 = self.addSwitch( 's25', dpid='2000000000000025' )
+        s26 = self.addSwitch( 's26', dpid='2000000000000026' )
+        s27 = self.addSwitch( 's27', dpid='2000000000000027' )
+        s28 = self.addSwitch( 's28', dpid='2000000000000028' )
+        s29 = self.addSwitch( 's29', dpid='2000000000000029' )
+        s30 = self.addSwitch( 's30', dpid='2000000000000030' )
+        s31 = self.addSwitch( 's31', dpid='2000000000000031' )
+        s32 = self.addSwitch( 's32', dpid='2000000000000032' )
+        s33 = self.addSwitch( 's33', dpid='2000000000000033' )
+        s34 = self.addSwitch( 's34', dpid='2000000000000034' )
+        s35 = self.addSwitch( 's35', dpid='2000000000000035' )
+        s36 = self.addSwitch( 's36', dpid='2000000000000036' )
+        s37 = self.addSwitch( 's37', dpid='2000000000000037' )
+        s38 = self.addSwitch( 's38', dpid='2000000000000038' )
+        s39 = self.addSwitch( 's39', dpid='2000000000000039' )
+        s40 = self.addSwitch( 's40', dpid='2000000000000040' )
+        s41 = self.addSwitch( 's41', dpid='2000000000000041' )
+        s42 = self.addSwitch( 's42', dpid='2000000000000042' )
+        s43 = self.addSwitch( 's43', dpid='2000000000000043' )
+        s44 = self.addSwitch( 's44', dpid='2000000000000044' )
+        s45 = self.addSwitch( 's45', dpid='2000000000000045' )
+        s46 = self.addSwitch( 's46', dpid='2000000000000046' )
+        s47 = self.addSwitch( 's47', dpid='2000000000000047' )
+        s48 = self.addSwitch( 's48', dpid='2000000000000048' )
+        s49 = self.addSwitch( 's49', dpid='2000000000000049' )
+        s50 = self.addSwitch( 's50', dpid='2000000000000050' )
+        s51 = self.addSwitch( 's51', dpid='2000000000000051' )
+        s52 = self.addSwitch( 's52', dpid='2000000000000052' )
+        s53 = self.addSwitch( 's53', dpid='2000000000000053' )
+        s54 = self.addSwitch( 's54', dpid='2000000000000054' )
+        s55 = self.addSwitch( 's55', dpid='2000000000000055' )
+        s56 = self.addSwitch( 's56', dpid='2000000000000056' )
+        s57 = self.addSwitch( 's57', dpid='2000000000000057' )
+        s58 = self.addSwitch( 's58', dpid='2000000000000058' )
+        s59 = self.addSwitch( 's59', dpid='2000000000000059' )
+        s60 = self.addSwitch( 's60', dpid='2000000000000060' )
+        s61 = self.addSwitch( 's61', dpid='2000000000000061' )
+        s62 = self.addSwitch( 's62', dpid='2000000000000062' )
+        s63 = self.addSwitch( 's63', dpid='2000000000000063' )
+        s64 = self.addSwitch( 's64', dpid='2000000000000064' )
+        s65 = self.addSwitch( 's65', dpid='2000000000000065' )
+        s66 = self.addSwitch( 's66', dpid='2000000000000066' )
+        s67 = self.addSwitch( 's67', dpid='2000000000000067' )
+        s68 = self.addSwitch( 's68', dpid='2000000000000068' )
+        s69 = self.addSwitch( 's69', dpid='2000000000000069' )
+        s70 = self.addSwitch( 's70', dpid='2000000000000070' )
+        s71 = self.addSwitch( 's71', dpid='2000000000000071' )
+        s72 = self.addSwitch( 's72', dpid='2000000000000072' )
+        s73 = self.addSwitch( 's73', dpid='2000000000000073' )
+        s74 = self.addSwitch( 's74', dpid='2000000000000074' )
+        s75 = self.addSwitch( 's75', dpid='2000000000000075' )
+        s76 = self.addSwitch( 's76', dpid='2000000000000076' )
+        s77 = self.addSwitch( 's77', dpid='2000000000000077' )
+        s78 = self.addSwitch( 's78', dpid='2000000000000078' )
+
 
         # ... and now hosts
         # s1_host = self.addHost( 'h1', ip='10.1.0.1/24', cls=dualStackHost, v6Addr='1000::1/64' )