commit a83a4cb86572a52bc3a8faad061e8eb5b9a90cb3
author Jeremy <jeremy@onlab.us> Thu Apr 07 02:20:29 2016 +0000
committer Gerrit Code Review <gerrit@onlab.us> Thu Apr 07 02:20:29 2016 +0000
tree bbfa62f07ccb4f49d4b4110c5eb7a397963f7a7e
parent 6a38671c8eaaf66b27c4300f6ca0670713b436b9
parent 7134f5b0057d68fe194a12709b8015fe09dde0d9

Merge "added better exception catching to FUNCoptical"

TestON/tests/FUNCoptical/FUNCoptical.py

diff --git a/TestON/tests/FUNCoptical/FUNCoptical.py b/TestON/tests/FUNCoptical/FUNCoptical.py
index 2d71cc2..ab4d3d0 100644
--- a/TestON/tests/FUNCoptical/FUNCoptical.py
+++ b/TestON/tests/FUNCoptical/FUNCoptical.py
@@ -602,27 +602,27 @@
         main.step( "Removing host intents" )
         removeResult = main.TRUE
         # Check remaining intents
-        intentsJson = json.loads( main.CLIs[ 0 ].intents() )
-        main.CLIs[ 0 ].removeIntent( intentId=intent1, purge=True )
-        #main.CLIs[ 0 ].removeIntent( intentId=intent2, purge=True )
-        main.log.debug(intentsJson)
-        for intents in intentsJson:
-            try:
+        try:
+            intentsJson = json.loads( main.CLIs[ 0 ].intents() )
+            main.CLIs[ 0 ].removeIntent( intentId=intent1, purge=True )
+            #main.CLIs[ 0 ].removeIntent( intentId=intent2, purge=True )
+            main.log.debug(intentsJson)
+            for intents in intentsJson:
                 main.CLIs[ 0 ].removeIntent( intentId=intents.get( 'id' ),
                                              app='org.onosproject.optical',
                                              purge=True )
-            except TypeError:
-                main.log.error( "Cannot see intents on Node " + str( main.CLIs[ 0 ] ) +\
-                                ".  Removing all intents.")
-                main.CLIs[ 0 ].removeAllIntents( purge=True )
-                main.CLIs[ 0 ].removeAllIntents( purge=True, app='org.onosproject.optical')
 
-        # Check if any intents could not be removed
-        for i in range( main.numCtrls ):
-            if len( json.loads( main.CLIs[ i ].intents() ) ):
-                print json.loads( main.CLIs[ i ].intents() )
-                removeResult = main.FALSE
-            utilities.assert_equals( expect=main.TRUE,
-                                     actual=removeResult,
-                                     onpass="Successfully removed host intents",
-                                     onfail="Failed to remove host intents" )
+            for i in range( main.numCtrls ):
+                if len( json.loads( main.CLIs[ i ].intents() ) ):
+                    print json.loads( main.CLIs[ i ].intents() )
+                    removeResult = main.FALSE
+        except ( TypeError, ValueError ):
+            main.log.error( "Cannot see intents on Node " + str( main.CLIs[ 0 ] ) +\
+                            ".  Removing all intents.")
+            main.CLIs[ 0 ].removeAllIntents( purge=True )
+            main.CLIs[ 0 ].removeAllIntents( purge=True, app='org.onosproject.optical')
+
+        utilities.assert_equals( expect=main.TRUE,
+                                 actual=removeResult,
+                                 onpass="Successfully removed host intents",
+                                 onfail="Failed to remove host intents" )