Using unique dpids for each topology and excluded the ipv6 pingall cases

Change-Id: I6ca88e57156b0949238a9e59629f185661fb1ab7
diff --git a/TestON/tests/CHOtest/CHOtest.py b/TestON/tests/CHOtest/CHOtest.py
index a1a1610..1bdfa5b 100644
--- a/TestON/tests/CHOtest/CHOtest.py
+++ b/TestON/tests/CHOtest/CHOtest.py
@@ -27,7 +27,7 @@
 
         global intentState
         main.threadID = 0
-        main.pingTimeout = 300
+        main.pingTimeout = 600
         main.numCtrls = main.params[ 'CTRL' ][ 'numCtrl' ]
         git_pull = main.params[ 'GIT' ][ 'autoPull' ]
         git_branch = main.params[ 'GIT' ][ 'branch' ]
@@ -61,7 +61,7 @@
         else:
             main.log.error( "Please provide onoscell option at TestON CLI to run CHO tests" )
             main.log.error( "Example: ~/TestON/bin/cli.py run OnosCHO onoscell <cellName>" )
-            main.clean()
+            main.cleanup()
             main.exit()
 
         main.step( "Git checkout and pull " + git_branch )