commit 5f0d19e2a887815872c50fd30139d487420dbcd3
author kelvin-onlab <kelvin@onlab.us> Tue Aug 04 15:21:00 2015 -0700
committer kelvin-onlab <kelvin@onlab.us> Tue Aug 04 15:50:12 2015 -0700
tree e2d8ed4c5af7fad27d07829309a9a64b2c7b400c
parent cbd300816a31815a1d17780e985453da53b99438

Fixed uninstalling step in CASE2 to force uninstall all nodes

Change-Id: Iea150e9f33f5f87e4399d31874788f26650167ef

TestON/tests/FUNCintent/FUNCintent.py

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 ):
         """