Refactored SCPFmaxIntents
- Use Retry to set up apps, more stability
- Fixed driver function, getTotalFlowsNum to get total ADDED flows
- Only wirte the Total ADDED flows to database (we write all flows
include PENDING_ADD before)
Change-Id: I1c05f27dcf621c14143a406d71b66adc6409f87e
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 16f2208..f77ad8f 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -2197,20 +2197,19 @@
main.cleanup()
main.exit()
- def getTotalFlowsNum( self ):
+ def getTotalFlowsNum( self, timeout=60 ):
"""
Description:
- Get the total number of flows, include every states.
+ Get the number of ADDED flows.
Return:
- The number of flows
+ The number of ADDED flows
"""
try:
- cmd = "summary -j"
- response = self.sendline( cmd )
+ cmd = "flows -s|grep ADDED|wc -l"
+ response = self.sendline( cmd, timeout=timeout )
if response == None:
return -1
- response = json.loads( response )
- return int( response.get("flows") )
+ return int( response )
except TypeError:
main.log.exception( self.name + ": Object not as expected" )
return None