commit 10065773e0153097a83d28e611107051a38632f9
author Hari Krishna <hari@onlab.us> Fri Jul 10 15:55:53 2015 -0700
committer Hari Krishna <hari@onlab.us> Fri Jul 10 17:24:00 2015 -0700
tree 27237431e277039b3a04b8a1f8fca8d5dd375466
parent a25104c9c288b33bbcaa1ab2dbf616100849785b

formatting issues fixed

Change-Id: Iba2983f4535e9b7852e40a8565918775ffe921f1

TestON/tests/OnosCHO/OnosCHO.py

diff --git a/TestON/tests/OnosCHO/OnosCHO.py b/TestON/tests/OnosCHO/OnosCHO.py
index 8899845..dfdfd39 100644
--- a/TestON/tests/OnosCHO/OnosCHO.py
+++ b/TestON/tests/OnosCHO/OnosCHO.py
@@ -32,14 +32,13 @@
         cell_name = main.params[ 'ENV' ][ 'cellName' ]
         git_pull = main.params[ 'GIT' ][ 'autoPull' ]
         git_branch = main.params[ 'GIT' ][ 'branch' ]
+        karafTimeout = main.params['CTRL']['karafCliTimeout']
         main.newTopo = ""
         main.CLIs = []
         main.onosIPs = []
-        main.onosPorts = []
 
         for i in range( 1, int(main.numCtrls) + 1 ):
             main.CLIs.append( getattr( main, 'ONOScli' + str( i ) ) )
-            main.onosPorts.append( main.params[ 'CTRL' ][ 'port' + str( i ) ] )
 
         main.case( "Set up test environment" )
         main.log.report( "Set up test environment" )
@@ -117,7 +116,6 @@
         
         main.step( "Start ONOS CLI on all nodes" )
         cliResult = main.TRUE
-        karafTimeout = "3600000"
         main.log.step(" Start ONOS cli using thread ")
         startCliResult  = main.TRUE
         pool = []
@@ -181,8 +179,7 @@
         for i in range( 1, ( main.numMNswitches + 1 ) ):  # 1 to ( num of switches +1 )
             main.Mininet1.assignSwController(
                 sw="s" + str( i ),
-                ip=main.onosIPs,
-                port=main.onosPorts )
+                ip=main.onosIPs )
 
         switch_mastership = main.TRUE
         for i in range( 1, ( main.numMNswitches + 1 ) ):
@@ -245,8 +242,7 @@
         for i in range( 1, ( main.numMNswitches + 1 ) ):  # 1 to ( num of switches +1 )
             main.Mininet1.assignSwController(
                 sw="s" + str( i ),
-                ip=main.onosIPs,
-                port=main.onosPorts )
+                ip=main.onosIPs )
 
         switch_mastership = main.TRUE
         for i in range( 1, ( main.numMNswitches + 1 ) ):
@@ -305,8 +301,7 @@
         for i in range( 1, ( main.numMNswitches + 1 ) ):  # 1 to ( num of switches +1 )
             main.Mininet1.assignSwController(
                 sw="s" + str( i ),
-                ip=main.onosIPs,
-                port=main.onosPorts )
+                ip=main.onosIPs )
 
         switch_mastership = main.TRUE
         for i in range( 1, ( main.numMNswitches + 1 ) ):