commit 20038c49e88b65f4cb2710d270c00066915fcf8b
author GlennRC <glenn@onlab.us> Thu Dec 17 00:18:57 2015 +0000
committer Gerrit Code Review <gerrit@onlab.us> Thu Dec 17 00:18:57 2015 +0000
tree 57981e3d405deb092349dd80d1ad9b72db24a584
parent de6b1e0ef44ebf4eeb6c503103e4741d830c4027
parent 3de72231154ff6ed96124de88df7298191b3044b

Merge "Increased timeout"

TestON/tests/CHOtest/CHOtest.params

diff --git a/TestON/tests/CHOtest/CHOtest.params b/TestON/tests/CHOtest/CHOtest.params
index 274da66..2aee8f2 100644
--- a/TestON/tests/CHOtest/CHOtest.params
+++ b/TestON/tests/CHOtest/CHOtest.params
@@ -93,6 +93,7 @@
         <CheckIntentDelay>8</CheckIntentDelay>
         <topoCheckDelay>15</topoCheckDelay>
         <pingSleep>3</pingSleep>
+        <pingTimeout>1200</pingTimeout>
     </timers>
 
     <TEST>

TestON/tests/CHOtest/CHOtest.py

diff --git a/TestON/tests/CHOtest/CHOtest.py b/TestON/tests/CHOtest/CHOtest.py
index dc1dfd7..9feb9b8 100644
--- a/TestON/tests/CHOtest/CHOtest.py
+++ b/TestON/tests/CHOtest/CHOtest.py
@@ -27,7 +27,6 @@
 
         global intentState
         main.threadID = 0
-        main.pingTimeout = 600
         main.numCtrls = main.params[ 'CTRL' ][ 'numCtrl' ]
         git_pull = main.params[ 'GIT' ][ 'autoPull' ]
         git_branch = main.params[ 'GIT' ][ 'branch' ]
@@ -40,6 +39,7 @@
         main.numPings = int( main.params['TEST']['numPings'] )
         main.pingSleep = int( main.params['timers']['pingSleep'] )
         main.topoCheckDelay = int( main.params['timers']['topoCheckDelay'] )
+        main.pingTimeout = int( main.params['timers']['pingTimeout'] )
         main.newTopo = ""
         main.CLIs = []
         main.prefix = 0
@@ -178,10 +178,11 @@
         import time
         import copy
 
+        main.prefix = 0
+
         main.numMNswitches = int ( main.params[ 'TOPO1' ][ 'numSwitches' ] )
         main.numMNlinks = int ( main.params[ 'TOPO1' ][ 'numLinks' ] )
         main.numMNhosts = int ( main.params[ 'TOPO1' ][ 'numHosts' ] )
-        main.pingTimeout = 300
         main.log.report(
             "Load Att topology and Balance all Mininet switches across controllers" )
         main.log.report(
@@ -246,13 +247,12 @@
         import time
         import copy
 
-        main.prefix += 1
+        main.prefix = 1
 
         main.newTopo = main.params['TOPO2']['topo']
         main.numMNswitches = int ( main.params[ 'TOPO2' ][ 'numSwitches' ] )
         main.numMNlinks = int ( main.params[ 'TOPO2' ][ 'numLinks' ] )
         main.numMNhosts = int ( main.params[ 'TOPO2' ][ 'numHosts' ] )
-        main.pingTimeout = 300
         main.log.report(
             "Load Chordal topology and Balance all Mininet switches across controllers" )
         main.log.report(
@@ -312,7 +312,7 @@
         import time
         import copy
 
-        main.prefix += 1
+        main.prefix = 2
 
         main.newTopo = main.params['TOPO3']['topo']
         main.numMNswitches = int ( main.params[ 'TOPO3' ][ 'numSwitches' ] )
@@ -524,6 +524,9 @@
             str( timeDiff ) +
             " seconds" )
 
+        if not pingResult:
+            main.stop()
+
         utilities.assert_equals( expect=main.TRUE, actual=pingResult,
                                  onpass="Reactive Mode IPv4 Pingall test PASS",
                                  onfail="Reactive Mode IPv4 Pingall test FAIL" )
@@ -531,7 +534,7 @@
         main.step( "Disable Reactive forwarding" )
         appResult =  main.CLIs[0].deactivateApp( "org.onosproject.fwd" )
         utilities.assert_equals( expect=main.TRUE, actual=appResult,
-                                 onpass="Succefully deactivated fwd app",
+                                 onpass="Successfully deactivated fwd app",
                                  onfail="Failed to deactivate fwd app" )
 
     def CASE41( self, main ):
@@ -2224,7 +2227,6 @@
         link2End2top = main.params[ 'SPINECORELINKS' ][ 'linkS10top' ].split( ',' )
         link2End2bot = main.params[ 'SPINECORELINKS' ][ 'linkS10bot' ].split( ',' )
         link_sleep = int( main.params[ 'timers' ][ 'LinkDiscovery' ] )
-        main.pingTimeout = 400
 
         main.log.report( "Bring some core links down and verify ping all (Host Intents-Spine Topo)" )
         main.log.report( "___________________________________________________________________________" )