Refactored single instance 1.3 tests
diff --git a/TestON/tests/ProdFunc13/ProdFunc13.params b/TestON/tests/ProdFunc13/ProdFunc13.params
index f28d620..a9b212f 100755
--- a/TestON/tests/ProdFunc13/ProdFunc13.params
+++ b/TestON/tests/ProdFunc13/ProdFunc13.params
@@ -1,7 +1,6 @@
<PARAMS>
- <testcases>1,4,11,10,5,6,7,8,12,9,2,20,21,22,10,23,24</testcases>
-
+ <testcases>1,4,10,5,6,7,8,9,8,11,8,2,20,21,22,10,23,24</testcases>
#Environment variables
<ENV>
<cellName>driver_test</cellName>
diff --git a/TestON/tests/ProdFunc13/ProdFunc13.py b/TestON/tests/ProdFunc13/ProdFunc13.py
index afa538f..44e78b7 100644
--- a/TestON/tests/ProdFunc13/ProdFunc13.py
+++ b/TestON/tests/ProdFunc13/ProdFunc13.py
@@ -768,16 +768,22 @@
def CASE12( self ):
"""
- Verify the default flows on each switch
+ Verify the default flows on each switch in proactive mode
"""
+ main.log.report( "This testcase is verifying num of default" +
+ " flows on each switch" )
+ main.log.report( "__________________________________" )
+ main.case( "Verify num of default flows on each switch" )
+ main.step( "Obtaining the device id's and flowrule count on them" )
+
case12Result = main.TRUE
idList = main.ONOS2.getAllDevicesId()
for id in idList:
- count = main.ONOS2.FlowStateCount( id )
- print "count = ", count
- if count != 5:
+ count = main.ONOS2.FlowAddedCount( id )
+ main.log.info("count = " +count)
+ if int(count) != 3:
case12Result = main.FALSE
-
+ break
utilities.assert_equals(
expect=main.TRUE,
actual=case12Result,
@@ -1070,8 +1076,8 @@
main.step( "Determine the current number of switches and links" )
topologyOutput = main.ONOS2.topology()
topologyResult = main.ONOS1.getTopology( topologyOutput )
- activeSwitches = topologyResult[ 'devices' ]
- links = topologyResult[ 'links' ]
+ activeSwitches = topologyResult[ 'deviceCount' ]
+ links = topologyResult[ 'linkCount' ]
print "activeSwitches = ", type( activeSwitches )
print "links = ", type( links )
main.log.info(