commit b2a8658dced03d9e88e624fa65852c0c82d8bb18
author pingping-lin <pingping@onlab.us> Mon Feb 02 16:18:59 2015 -0800
committer pingping-lin <pingping@onlab.us> Mon Feb 02 16:18:59 2015 -0800
tree b7b520e4051dd9a9b5fbb8f06ac58449b6ae5743
parent 0904ad0c6adcdab8f49b17448766c93d9732d9c0

update driver to support both onos1.0 and master branches

TestON/drivers/common/cli/quaggaclidriver.py

diff --git a/TestON/drivers/common/cli/quaggaclidriver.py b/TestON/drivers/common/cli/quaggaclidriver.py
index 8bd4754..87de64d 100644
--- a/TestON/drivers/common/cli/quaggaclidriver.py
+++ b/TestON/drivers/common/cli/quaggaclidriver.py
@@ -179,7 +179,7 @@
         return intents
 
     # This method extracts all actual routes from ONOS CLI
-    def extractActualRoutes( self, getRoutesResult ):
+    def extractActualRoutesOneDotZero( self, getRoutesResult ):
         routesJsonObj = json.loads( getRoutesResult )
 
         allRoutesActual = []
@@ -190,7 +190,8 @@
                 route[ 'prefix' ] + "/" + route[ 'nextHop' ] )
 
         return sorted( allRoutesActual )
-    def extractActualRoutesNew( self, getRoutesResult ):
+
+    def extractActualRoutesMaster( self, getRoutesResult ):
         routesJsonObj = json.loads( getRoutesResult )
 
         allRoutesActual = []