commit 529dad2f04979f13fd3819ea40ace107d5456113
author pingping-lin <pingping@onlab.us> Mon Feb 02 16:57:35 2015 -0800
committer pingping-lin <pingping@onlab.us> Mon Feb 02 16:57:35 2015 -0800
tree eb7131322b5706fb5ccdb2d45ad76756143e75ce
parent 6d23d9ea4052ae6d793031686a6e2b59b2e2dab9

call different drivers when run on different braches

TestON/tests/SdnIpTest/SdnIpTest.py

diff --git a/TestON/tests/SdnIpTest/SdnIpTest.py b/TestON/tests/SdnIpTest/SdnIpTest.py
index e8baa83..ebbd57e 100644
--- a/TestON/tests/SdnIpTest/SdnIpTest.py
+++ b/TestON/tests/SdnIpTest/SdnIpTest.py
@@ -4,6 +4,7 @@
 
     def __init__( self ):
         self.default = ''
+        global branchName
 
     # This case is to setup ONOS
     def CASE100( self, main ):
@@ -27,6 +28,9 @@
         cellResult = main.ONOSbench.setCell( cellName )
         verifyResult = main.ONOSbench.verifyCell()
 
+        branchName = main.ONOSbench.getBranchName()
+        main.log.info( "ONOS is on branch: " + branchName )
+
         main.log.report( "Uninstalling ONOS" )
         main.ONOSbench.onosUninstall( ONOS1Ip )
 
@@ -38,11 +42,12 @@
 
         main.step( "Using mvn clean & install" )
         cleanInstallResult = main.TRUE
-        if gitPullResult == main.TRUE:
-            cleanInstallResult = main.ONOSbench.cleanInstall()
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                            "clean install" )
+#         if gitPullResult == main.TRUE:
+#             cleanInstallResult = main.ONOSbench.cleanInstall()
+#         else:
+#             main.log.warn( "Did not pull new code so skipping mvn " +
+#                             "clean install" )
+        cleanInstallResult = main.ONOSbench.cleanInstall()
         main.ONOSbench.getVersion( report=True )
 
         #cellResult = main.ONOSbench.setCell( cellName )
@@ -194,8 +199,15 @@
         getRoutesResult = main.ONOScli.routes( jsonFormat=True )
 
         # parse routes from ONOS CLI
-        allRoutesActual = \
-            main.QuaggaCliHost3.extractActualRoutes( getRoutesResult )
+        if branchName == "master":
+            allRoutesActual = \
+            main.QuaggaCliHost3.extractActualRoutesMaster( getRoutesResult )
+        elif branchName == "onos-1.0":
+            allRoutesActual = \
+            main.QuaggaCliHost3.extractActualRoutesOneDotZero( getRoutesResult )
+        else:
+            main.log("ONOS is on wrong branch")
+            exit
 
         allRoutesStrExpected = str( sorted( allRoutesExpected ) )
         allRoutesStrActual = str( allRoutesActual ).replace( 'u', "" )