Fix checkFlowsByDpid to retry
Change-Id: Ic8d556597351008cd6dbec09bc506f695a3daa6b
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
index bc021c6..97947be 100644
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
@@ -273,17 +273,17 @@
@staticmethod
def checkFlowsByDpid( main, dpid, minFlowCount, sleep=10 ):
main.step(
- " Check whether the flow count of device %s is bigger than %s" % ( dpid, minFlowCount ) )
- count = utilities.retry( main.Cluster.active( 0 ).CLI.flowAddedCount,
- None,
- args=( dpid, ),
+ " Check whether the flow count of device %s is bigger than %s" % ( dpid, minFlowCount ) )
+ count = utilities.retry( main.Cluster.active( 0 ).CLI.checkFlowAddedCount,
+ main.FALSE,
+ args=( dpid, minFlowCount ),
attempts=5,
sleep=sleep )
utilities.assertEquals(
- expect=True,
- actual=( int( count ) > minFlowCount ),
- onpass="Flow count looks correct: " + count ,
- onfail="Flow count looks wrong: " + count )
+ expect=True,
+ actual=( count > minFlowCount ),
+ onpass="Flow count looks correct: " + str( count ),
+ onfail="Flow count looks wrong. " )
@staticmethod
def pingAllBasedOnIp( main, tag="", dumpflows=True ):