Pull in latest changes from master
Change-Id: Ia33a67aacc617f7e8d655c2c0eefc2e293bd7cfd
diff --git a/TestON/tests/USECASE_SdnipFunction_fsfw/Dependency/Functions.py b/TestON/tests/USECASE_SdnipFunction_fsfw/Dependency/Functions.py
index d79bc76..dd0b29f 100644
--- a/TestON/tests/USECASE_SdnipFunction_fsfw/Dependency/Functions.py
+++ b/TestON/tests/USECASE_SdnipFunction_fsfw/Dependency/Functions.py
@@ -1,11 +1,16 @@
def checkRouteNum( main, routeNumExpected ):
+ import time
main.step( "Check routes installed" )
+ wait = int( main.params['timers']['PathAvailable'] )
main.log.info( "Route number expected:" )
main.log.info( routeNumExpected )
main.log.info( "Route number from ONOS CLI:" )
routeNumActual = main.ONOScli.ipv4RouteNumber()
+ if routeNumActual != routeNumExpected:
+ time.sleep( wait )
+ routeNumActual = main.ONOScli.ipv4RouteNumber()
main.log.info( routeNumActual )
utilities.assertEquals( \
expect = routeNumExpected, actual = routeNumActual,
@@ -13,13 +18,20 @@
onfail = "Route number is wrong!" )
def checkM2SintentNum( main, intentNumExpected ):
+ import time
main.step( "Check M2S intents installed" )
+ wait = int( main.params['timers']['PathAvailable'] )
main.log.info( "Intent number expected:" )
main.log.info( intentNumExpected )
main.log.info( "Intent number from ONOS CLI:" )
jsonResult = main.ONOScli.intents( jsonFormat = True, summary = True,
TYPE = "multiPointToSinglePoint" )
intentNumActual = jsonResult['installed']
+ if intentNumActual != intentNumExpected:
+ time.sleep( wait )
+ jsonResult = main.ONOScli.intents( jsonFormat = True, summary = True,
+ TYPE = "multiPointToSinglePoint" )
+ intentNumActual = jsonResult['installed']
main.log.info( intentNumActual )
utilities.assertEquals( \
expect = intentNumExpected, actual = intentNumActual,
@@ -27,13 +39,21 @@
onfail = "M2S intent number is wrong!" )
def checkP2PintentNum( main, intentNumExpected ):
+ import time
main.step( "Check P2P intents installed" )
+ wait = int( main.params['timers']['PathAvailable'] )
main.log.info( "Intent number expected:" )
main.log.info( intentNumExpected )
main.log.info( "Intent number from ONOS CLI:" )
jsonResult = main.ONOScli.intents( jsonFormat = True, summary = True,
TYPE = "pointToPoint" )
intentNumActual = jsonResult['installed']
+
+ if intentNumActual != intentNumExpected:
+ time.sleep( wait )
+ jsonResult = main.ONOScli.intents( jsonFormat = True, summary = True,
+ TYPE = "pointToPoint" )
+ intentNumActual = jsonResult['installed']
main.log.info( intentNumActual )
utilities.assertEquals( \
expect = intentNumExpected, actual = intentNumActual,
@@ -41,11 +61,16 @@
onfail = "P2P intent number is wrong!" )
def checkFlowNum( main, switch, flowNumExpected ):
+ import time
main.step( "Check flow entry number in " + switch )
+ wait = int( main.params['timers']['PathAvailable'] )
main.log.info( "Flow number expected:" )
main.log.info( flowNumExpected )
main.log.info( "Flow number actual:" )
flowNumActual = main.Mininet.getSwitchFlowCount( switch )
+ if flowNumActual != flowNumExpected :
+ time.sleep( wait )
+ flowNumActual = main.Mininet.getSwitchFlowCount( switch )
main.log.info( flowNumActual )
utilities.assertEquals( \
expect = flowNumExpected, actual = flowNumActual,
@@ -109,7 +134,8 @@
* expectAllSuccess - boolean indicating if you expect all results
succeed if True, otherwise expect all results fail if False
"""
- main.step( "Check ping between each host pair" )
+ main.step( "Check ping between each host pair, expect all to succede=" +
+ str( expectAllSuccess ) )
if len( hosts ) == 0:
main.log.error( "Parameter hosts can not be empty." )
main.cleanup()