Fixed uninstalling step in CASE2 to force uninstall all nodes
Change-Id: Iea150e9f33f5f87e4399d31874788f26650167ef
diff --git a/TestON/tests/FUNCintent/FUNCintent.params b/TestON/tests/FUNCintent/FUNCintent.params
index d1cd94c..534d0cd 100644
--- a/TestON/tests/FUNCintent/FUNCintent.params
+++ b/TestON/tests/FUNCintent/FUNCintent.params
@@ -13,7 +13,7 @@
# 3000 - Test single to multi point intents
# 4000 - Test multi to single point intents
- <testcases>1,[2,10,12,8,13,1000,2000,3000,4000,5000,14]*2,[2,11,12,8,13,1000,2000,3000,4000,5000,14]*2</testcases>
+ <testcases>1,[2,10,12,8,13,1000,2000,3000,4000,5000,9,14]*2,[2,11,12,8,13,1000,2000,3000,4000,5000,9,14]*2</testcases>
<SCALE>
<size>1,3,1,3</size>
diff --git a/TestON/tests/FUNCintent/FUNCintent.py b/TestON/tests/FUNCintent/FUNCintent.py
index 832311e..d1e91a7 100644
--- a/TestON/tests/FUNCintent/FUNCintent.py
+++ b/TestON/tests/FUNCintent/FUNCintent.py
@@ -175,9 +175,9 @@
time.sleep( main.startUpSleep )
main.step( "Uninstalling ONOS package" )
onosUninstallResult = main.TRUE
- for i in range( main.numCtrls ):
+ for ip in main.ONOSip:
onosUninstallResult = onosUninstallResult and \
- main.ONOSbench.onosUninstall( nodeIp=main.ONOSip[ i ] )
+ main.ONOSbench.onosUninstall( nodeIp=ip )
stepResult = onosUninstallResult
utilities.assert_equals( expect=main.TRUE,
actual=stepResult,
@@ -319,10 +319,10 @@
Report errors/warnings/exceptions
'''
main.log.info( "Error report: \n" )
- main.ONOSbench.logReport( globalONOSip[0],
- [ "INFO", "FOLLOWER", "WARN", "flow", "ERROR" , "Except" ],
- "s" )
- #main.ONOSbench.logReport( globalONOSip[1], [ "INFO" ], "d" )
+ for i in range( main.numCtrls ):
+ main.ONOSbench.logReport( main.ONOSip[ i ],
+ [ "INFO", "FOLLOWER", "WARN", "flow", "ERROR" , "Except" ],
+ "s" )
def CASE10( self, main ):
"""