commit 2aa165622a4b84eca8eedb705c6eab584d82e0fb
author Jon Hall <jhall@ciena.com> Tue May 23 11:26:46 2017 -0700
committer Jon Hall <jhall@ciena.com> Tue May 23 11:26:46 2017 -0700
tree ebc0b743ee2fc65de3625b285d75ba078f7bf880
parent c3f88af80421c954b04fbe1b2c4c5fcd2ebf6208

Clean up some logging and concatenation errors in SDNIP test

Change-Id: I51fbe3d620689d0309697c797e2d68be98e87060

TestON/tests/USECASE/USECASE_SdnipFunction/dependencies/Functions.py

diff --git a/TestON/tests/USECASE/USECASE_SdnipFunction/dependencies/Functions.py b/TestON/tests/USECASE/USECASE_SdnipFunction/dependencies/Functions.py
index e99f4f6..10c3675 100644
--- a/TestON/tests/USECASE/USECASE_SdnipFunction/dependencies/Functions.py
+++ b/TestON/tests/USECASE/USECASE_SdnipFunction/dependencies/Functions.py
@@ -21,18 +21,24 @@
     import time
     main.step( "Check M2S intents installed" )
     wait = int( main.params['timers']['PathAvailable'] )
-    main.log.info( "Intent number expected:" )
-    main.log.info( intentNumExpected )
-    main.log.info( "Intent number from ONOS CLI:" )
     jsonResult = main.ONOScli.intents( jsonFormat = True, summary = True,
                                        TYPE = "multiPointToSinglePoint" )
-    intentNumActual = jsonResult['installed']
+    try:
+        intentNumActual = jsonResult['installed']
+    except TypeError as e:
+        intentNumActual = -1
+        main.log.error( e )
     if intentNumActual != intentNumExpected:
         time.sleep( wait )
         jsonResult = main.ONOScli.intents( jsonFormat = True, summary = True,
                                            TYPE = "multiPointToSinglePoint" )
-        intentNumActual = jsonResult['installed']
-    main.log.info( intentNumActual )
+        try:
+            intentNumActual = jsonResult['installed']
+        except TypeError as e:
+            intentNumActual = -1
+            main.log.error( e )
+    main.log.info( "Intent number expected: {}".format( intentNumExpected ) )
+    main.log.info( "Intent number from ONOS CLI: {}".format( intentNumActual ) )
     utilities.assertEquals( \
         expect = intentNumExpected, actual = intentNumActual,
         onpass = "M2S intent number is correct!",
@@ -42,19 +48,25 @@
     import time
     main.step( "Check P2P intents installed" )
     wait = int( main.params['timers']['PathAvailable'] )
-    main.log.info( "Intent number expected:" )
-    main.log.info( intentNumExpected )
-    main.log.info( "Intent number from ONOS CLI:" )
     jsonResult = main.ONOScli.intents( jsonFormat = True, summary = True,
                                        TYPE = "pointToPoint" )
-    intentNumActual = jsonResult['installed']
+    try:
+        intentNumActual = jsonResult['installed']
+    except TypeError as e:
+        intentNumActual = -1
+        main.log.error( e )
 
     if intentNumActual != intentNumExpected:
         time.sleep( wait )
         jsonResult = main.ONOScli.intents( jsonFormat = True, summary = True,
                                            TYPE = "pointToPoint" )
-        intentNumActual = jsonResult['installed']
-    main.log.info( intentNumActual )
+        try:
+            intentNumActual = jsonResult['installed']
+        except TypeError as e:
+            intentNumActual = -1
+            main.log.error( e )
+    main.log.info( "Intent number expected: {}".format( intentNumExpected ) )
+    main.log.info( "Intent number from ONOS CLI: {}".format( intentNumActual ) )
     utilities.assertEquals( \
         expect = intentNumExpected, actual = intentNumActual,
         onpass = "P2P intent number is correct!",
@@ -64,14 +76,12 @@
     import time
     main.step( "Check flow entry number in " + switch )
     wait = int( main.params['timers']['PathAvailable'] )
-    main.log.info( "Flow number expected:" )
-    main.log.info( flowNumExpected )
-    main.log.info( "Flow number actual:" )
+    main.log.info( "Flow number expected: {}".format( flowNumExpected ) )
     flowNumActual = main.Mininet.getSwitchFlowCount( switch )
     if flowNumActual != flowNumExpected :
         time.sleep( wait )
         flowNumActual = main.Mininet.getSwitchFlowCount( switch )
-    main.log.info( flowNumActual )
+    main.log.info( "Flow number actual: {}".format( flowNumActual ) )
     utilities.assertEquals( \
         expect = flowNumExpected, actual = flowNumActual,
         onpass = "Flow number in " + switch + " is correct!",