commit 8244a3b73d2c5c5c8f49bd93f5dd51c9e00b43e9
author pingping-lin <pingping@onlab.us> Wed Sep 16 13:36:56 2015 -0700
committer pingping-lin <pingping@onlab.us> Thu Sep 17 17:01:09 2015 -0700
tree b67bc6e75958761d236e251450587f8a55edd16f
parent 9563aec31823ebc83fd86e878d0221fe2ad4e93f

add case 7 for I2, add new drivers

Change-Id: Idf2b06b1a80989f0c7a61435b84f05a1a50aae34

TestON/tests/USECASE_SdnipI2/Dependency/Functions.py

diff --git a/TestON/tests/USECASE_SdnipI2/Dependency/Functions.py b/TestON/tests/USECASE_SdnipI2/Dependency/Functions.py
index 16c8bf1..732ff41 100644
--- a/TestON/tests/USECASE_SdnipI2/Dependency/Functions.py
+++ b/TestON/tests/USECASE_SdnipI2/Dependency/Functions.py
@@ -10,17 +10,32 @@
     utilities.assertEquals( \
         expect = routeNumExpected, actual = routeNumActual,
         onpass = "***Route number is correct!***",
-        onfail = "***Routes number is wrong!***" )
+        onfail = "***Route number is wrong!***" )
 
 def checkM2SintentNum( main, intentNumExpected ):
     main.step( "Check M2S intents installed" )
     main.log.info( "Intent number expected:" )
     main.log.info( intentNumExpected )
     main.log.info( "Intent number from ONOS CLI:" )
-    intentNumActual = main.ONOScli.m2SIntentInstalledNumber()
+    jsonResult = main.ONOScli.intents( jsonFormat = True, summary = True,
+                                       TYPE = "multiPointToSinglePoint" )
+    intentNumActual = jsonResult['installed']
     main.log.info( intentNumActual )
     utilities.assertEquals( \
         expect = intentNumExpected, actual = intentNumActual,
-        onpass = "***Intents number is correct!***",
-        onfail = "***Intents number is wrong!***" )
+        onpass = "***M2S intent number is correct!***",
+        onfail = "***M2S intent number is wrong!***" )
 
+def checkP2PintentNum( main, intentNumExpected ):
+    main.step( "Check P2P intents installed" )
+    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']
+    main.log.info( intentNumActual )
+    utilities.assertEquals( \
+        expect = intentNumExpected, actual = intentNumActual,
+        onpass = "***P2P intent number is correct!***",
+        onfail = "***P2P intent number is wrong!***" )