Added pingall case to testcases and added missing pingall timeout
Change-Id: Ib5dac56277782bf23faff5866590c1574135e409
diff --git a/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params b/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params
index 5d1c7e1..c6b9b40 100755
--- a/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params
+++ b/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params
@@ -1,15 +1,16 @@
<PARAMS>
- # 1 - Optional pull and build ONOS package
- # 2 - Set cell and install ONOS
+ # 1 - optional pull and build ONOS package
+ # 2 - set cell and install ONOS
# 10 - start mininet and assign switches to controller
# 11 - pingall
# 12 - compare topology
# 100 - balance master
# 200 - bring down onos node
# 300 - bring up onos node
+ # 1000 - report logs
- <testcases>1,2,[10,100,12,200,100,12,300,100,12,1000]*3</testcases>
+ <testcases>1,2,[10,100,11,12,200,100,11,12,300,100,11,12,1000]*3</testcases>
<DEPENDENCY>
<path>/tests/SCPFscaleTopo/Dependency/</path>
diff --git a/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py b/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py
index 5094f4d..b094c4b 100644
--- a/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py
+++ b/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py
@@ -283,7 +283,7 @@
'''
main.case( "Pingall" )
main.step( "Pingall" )
- pingResult = main.Mininet1.pingall()
+ pingResult = main.Mininet1.pingall( timeout=main.pingallTimeout )
if not pingResult:
main.log.warn( "First pingall failed. Retrying..." )
time.sleep(3)