modify checking for ONOS startup and reduce pingall timeout
Change-Id: Iadda1f310789ed56f00107e33838bd9e375c3dc8
diff --git a/TestON/tests/FUNC/FUNCintent/FUNCintent.py b/TestON/tests/FUNC/FUNCintent/FUNCintent.py
index ceb4b2d..080aa8f 100644
--- a/TestON/tests/FUNC/FUNCintent/FUNCintent.py
+++ b/TestON/tests/FUNC/FUNCintent/FUNCintent.py
@@ -209,8 +209,9 @@
onosIsUp = main.TRUE
for i in range( main.numCtrls ):
- onosIsUp = main.ONOSbench.isup( main.ONOSip[ i ] )
- if onosIsUp == main.TRUE:
+ isUp = main.ONOSbench.isup( main.ONOSip[ i ] )
+ onosIsUp = onosIsUp and isUp
+ if isUp == main.TRUE:
main.log.report( "ONOS instance {0} is up and ready".format( i + 1 ) )
else:
main.log.report( "ONOS instance {0} may not be up, stop and ".format( i + 1 ) +