- Removed the duplicate folder for PeeringRouter
- Update the mininet script and json files for PeeringRouterTestwq
diff --git a/TestON/tests/PeeringRouter/CASE4-ping-as2host.sh b/TestON/tests/PeeringRouter/CASE4-ping-as2host.sh
deleted file mode 100755
index 52768b2..0000000
--- a/TestON/tests/PeeringRouter/CASE4-ping-as2host.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-
-#all the address in this for loop should work
-
-# ping test between as2 and as3
-for ((i=0;i<10;i++)); do
-
-        #echo '------from 3.0.0.x to 4.0.1.'$j'------'
-
-	for ((j=0; j<10; ++j )) ; do
-		echo '3.0.'$i'.1 -> 4.0.'$j'.1'
-    		ping -c 1 -w 1 -I 3.0.$i.1 4.0.$j.1 | grep 'from 4.0.'$j'.1'
-
-	done
-
-done
-for ((i=0;i<10;i++)); do
-
-        #echo '------from 3.0.0.x to 5.0.1.'$j'------'
-
-        for ((j=0; j<10; ++j )) ; do
-                echo '3.0.'$i'.1 -> 5.0.'$j'.1'
-                ping -c 1 -w 1 -I 3.0.$i.1 5.0.$j.1 | grep 'from 5.0.'$j'.1'
-
-        done
-
-done
-
-# ping test between as2 and as4
-for ((i=1;i<2;i++)); do
-       for ((prefix=101; prefix<=200; ++prefix)) ; do
-               for ((j=0; j<10; ++j )) ; do
-                       echo '3.0.0.'$i' - > '$prefix'.0.'$j'.1'
-                       ping -c 1 -w 1 -I 3.0.0.$i $prefix.0.$j.1 | grep 'from '$prefix'.0.'$j'.1'
-
-                done
-        done 
-
-done
-
diff --git a/TestON/tests/PeeringRouter/PeeringRouter.params b/TestON/tests/PeeringRouter/PeeringRouter.params
deleted file mode 100755
index 467141d..0000000
--- a/TestON/tests/PeeringRouter/PeeringRouter.params
+++ /dev/null
@@ -1,25 +0,0 @@
-<PARAMS>
-    
-    <testcases>4</testcases>
-
-    #Environment variables
-    <ENV>
-        <cellName>sdnip_single_instance</cellName>
-    </ENV>
-
-    <CTRL>
-        <ip1>127.0.0.1</ip1>
-        <port1>6633</port1>
-    </CTRL>
-
-    <GIT>
-        <autoPull>off</autoPull>
-        <checkout>master</checkout>
-    </GIT>
-
-    <JSON>
-        <prefix>prefix</prefix>
-        <nextHop>nextHop</nextHop>
-    </JSON>
-
-</PARAMS>
diff --git a/TestON/tests/PeeringRouter/PeeringRouter.py b/TestON/tests/PeeringRouter/PeeringRouter.py
deleted file mode 100755
index 2a3b496..0000000
--- a/TestON/tests/PeeringRouter/PeeringRouter.py
+++ /dev/null
@@ -1,1132 +0,0 @@
-# from cupshelpers.config import prefix
-
-# Testing the basic functionality of SDN-IP
-
-
-class PeeringRouter:
-
-    def __init__( self ):
-        self.default = ''
-
-# from cupshelpers.config import prefix
-
-# Testing the basic functionality of SDN-IP
-
-
-class PeeringRouter:
-
-    def __init__( self ):
-        self.default = ''
-
-    def CASE4( self, main ):
-        """
-        Test the SDN-IP functionality
-        allRoutesExpected: all expected routes for all BGP peers
-        routeIntentsExpected: all expected MultiPointToSinglePointIntent \
-        intents
-        bgpIntentsExpected: expected PointToPointIntent intents
-        allRoutesActual: all routes from ONOS LCI
-        routeIntentsActual: actual MultiPointToSinglePointIntent intents from \
-        ONOS CLI
-        bgpIntentsActual: actual PointToPointIntent intents from ONOS CLI
-        """
-        import time
-        import json
-        from operator import eq
-        # from datetime import datetime
-        from time import localtime, strftime
-
-        main.case("The test case is to help to setup the TestON environment \
-            and test new drivers" )
-        SDNIPJSONFILEPATH = \
-            "/home/sdnip/TestON/tests/PeeringRouter/sdnip.json"
-        # all expected routes for all BGP peers
-        allRoutesExpected = []
-        main.step( "Start to generate routes for all BGP peers" )
-        main.log.info( "Generate prefixes for host3" )
-        prefixesHost3 = main.QuaggaCliHost3.generatePrefixes( 3, 10 )
-        main.log.info( prefixesHost3 )
-        # generate route with next hop
-        for prefix in prefixesHost3:
-            allRoutesExpected.append( prefix + "/" + "192.168.20.1" )
-        routeIntentsExpectedHost3 = \
-            main.QuaggaCliHost3.generateExpectedOnePeerRouteIntents(
-            prefixesHost3, "192.168.20.1", "00:00:00:00:02:02",
-            SDNIPJSONFILEPATH )
-
-        main.log.info( "Generate prefixes for host4" )
-        prefixesHost4 = main.QuaggaCliHost4.generatePrefixes( 4, 10 )
-        main.log.info( prefixesHost4 )
-        # generate route with next hop
-        for prefix in prefixesHost4:
-            allRoutesExpected.append( prefix + "/" + "192.168.30.1" )
-        routeIntentsExpectedHost4 = \
-            main.QuaggaCliHost4.generateExpectedOnePeerRouteIntents(
-            prefixesHost4, "192.168.30.1", "00:00:00:00:03:01",
-            SDNIPJSONFILEPATH )
-
-        main.log.info( "Generate prefixes for host5" )
-        prefixesHost5 = main.QuaggaCliHost5.generatePrefixes( 5, 10 )
-        main.log.info( prefixesHost5 )
-        for prefix in prefixesHost5:
-            allRoutesExpected.append( prefix + "/" + "192.168.60.2" )
-        routeIntentsExpectedHost5 = \
-            main.QuaggaCliHost5.generateExpectedOnePeerRouteIntents(
-            prefixesHost5, "192.168.60.1", "00:00:00:00:06:02",
-            SDNIPJSONFILEPATH )
-
-        routeIntentsExpected = routeIntentsExpectedHost3 + \
-            routeIntentsExpectedHost4 + routeIntentsExpectedHost5
-
-        cellName = main.params[ 'ENV' ][ 'cellName' ]
-        ONOS1Ip = main.params[ 'CTRL' ][ 'ip1' ]
-        main.step( "Set cell for ONOS-cli environment" )
-        main.ONOScli.setCell( cellName )
-        verifyResult = main.ONOSbench.verifyCell()
-
-        main.log.report( "Removing raft logs" )
-        main.ONOSbench.onosRemoveRaftLogs()
-        main.log.report( "Uninstalling ONOS" )
-        main.ONOSbench.onosUninstall( ONOS1Ip )
-
-        main.step( "Installing ONOS package" )
-        onos1InstallResult = main.ONOSbench.onosInstall(
-            options="-f", node=ONOS1Ip )
-
-        main.step( "Checking if ONOS is up yet" )
-        time.sleep( 20 )
-        onos1Isup = main.ONOSbench.isup( ONOS1Ip )
-        if not onos1Isup:
-            main.log.report( "ONOS1 didn't start!" )
-
-        main.step( "Start ONOS-cli" )
-
-        main.ONOScli.startOnosCli( ONOS1Ip )
-
-        main.step( "Get devices in the network" )
-        listResult = main.ONOScli.devices( jsonFormat=False )
-        main.log.info( listResult )
-        time.sleep( 10 )
-        main.log.info( "Installing gbprouter feature" )
-        main.ONOScli.featureInstall( "onos-app-bgprouter" )
-        time.sleep( 10 )
-        main.step( "Login all BGP peers and add routes into peers" )
-
-        main.log.info( "Login Quagga CLI on host3" )
-        main.QuaggaCliHost3.loginQuagga( "1.168.30.2" )
-        main.log.info( "Enter configuration model of Quagga CLI on host3" )
-        main.QuaggaCliHost3.enterConfig( 64514 )
-        main.log.info( "Add routes to Quagga on host3" )
-        main.QuaggaCliHost3.addRoutes( prefixesHost3, 1 )
-
-        main.log.info( "Login Quagga CLI on host4" )
-        main.QuaggaCliHost4.loginQuagga( "1.168.30.3" )
-        main.log.info( "Enter configuration model of Quagga CLI on host4" )
-        main.QuaggaCliHost4.enterConfig( 64516 )
-        main.log.info( "Add routes to Quagga on host4" )
-        main.QuaggaCliHost4.addRoutes( prefixesHost4, 1 )
-
-        main.log.info( "Login Quagga CLI on host5" )
-        main.QuaggaCliHost5.loginQuagga( "1.168.30.5" )
-        main.log.info( "Enter configuration model of Quagga CLI on host5" )
-        main.QuaggaCliHost5.enterConfig( 64521 )
-        main.log.info( "Add routes to Quagga on host5" )
-        main.QuaggaCliHost5.addRoutes( prefixesHost5, 1 )
-
-        time.sleep( 30 )
-
-        # get routes inside SDN-IP
-        getRoutesResult = main.ONOScli.routes( jsonFormat=True )
-
-        # parse routes from ONOS CLI
-        allRoutesActual = \
-            main.QuaggaCliHost3.extractActualRoutes( getRoutesResult )
-
-        allRoutesStrExpected = str( sorted( allRoutesExpected ) )
-        allRoutesStrActual = str( allRoutesActual ).replace( 'u', "" )
-        main.step( "Check routes installed" )
-        main.log.info( "Routes expected:" )
-        main.log.info( allRoutesStrExpected )
-        main.log.info( "Routes get from ONOS CLI:" )
-        main.log.info( allRoutesStrActual )
-        utilities.assertEquals(
-            expect=allRoutesStrExpected, actual=allRoutesStrActual,
-            onpass="***Routes in SDN-IP are correct!***",
-            onfail="***Routes in SDN-IP are wrong!***" )
-        if( eq( allRoutesStrExpected, allRoutesStrActual ) ):
-            main.log.report(
-                "***Routes in SDN-IP after adding routes are correct!***" )
-        else:
-            main.log.report(
-                "***Routes in SDN-IP after adding routes are wrong!***" )
-
-        time.sleep( 20 )
-        getIntentsResult = main.ONOScli.intents( jsonFormat=True )
-
-        main.step( "Check MultiPointToSinglePointIntent intents installed" )
-        # routeIntentsExpected are generated when generating routes
-        # get rpoute intents from ONOS CLI
-        routeIntentsActual = \
-            main.QuaggaCliHost3.extractActualRouteIntents(
-                getIntentsResult )
-        routeIntentsStrExpected = str( sorted( routeIntentsExpected ) )
-        routeIntentsStrActual = str( routeIntentsActual ).replace( 'u', "" )
-        main.log.info( "MultiPointToSinglePoint intents expected:" )
-        main.log.info( routeIntentsStrExpected )
-        main.log.info( "MultiPointToSinglePoint intents get from ONOS CLI:" )
-        main.log.info( routeIntentsStrActual )
-        utilities.assertEquals(
-            expect=True,
-            actual=eq( routeIntentsStrExpected, routeIntentsStrActual ),
-            onpass="***MultiPointToSinglePoint Intents in SDN-IP are \
-            correct!***",
-            onfail="***MultiPointToSinglePoint Intents in SDN-IP are \
-            wrong!***" )
-
-        if( eq( routeIntentsStrExpected, routeIntentsStrActual ) ):
-            main.log.report( "***MultiPointToSinglePoint Intents before \
-            deleting routes correct!***" )
-        else:
-            main.log.report( "***MultiPointToSinglePoint Intents before \
-            deleting routes wrong!***" )
-
-        main.step( "Check BGP PointToPointIntent intents installed" )
-        # bgp intents expected
-        bgpIntentsExpected = \
-            main.QuaggaCliHost3.generateExpectedBgpIntents( SDNIPJSONFILEPATH )
-        # get BGP intents from ONOS CLI
-        bgpIntentsActual = \
-            main.QuaggaCliHost3.extractActualBgpIntents( getIntentsResult )
-
-        bgpIntentsStrExpected = str( bgpIntentsExpected ).replace( 'u', "" )
-        bgpIntentsStrActual = str( bgpIntentsActual )
-        main.log.info( "PointToPointIntent intents expected:" )
-        main.log.info( bgpIntentsStrExpected )
-        main.log.info( "PointToPointIntent intents get from ONOS CLI:" )
-        main.log.info( bgpIntentsStrActual )
-
-        utilities.assertEquals(
-            expect=True,
-            actual=eq( bgpIntentsStrExpected, bgpIntentsStrActual ),
-            onpass="***PointToPointIntent Intents in SDN-IP are correct!***",
-            onfail="***PointToPointIntent Intents in SDN-IP are wrong!***" )
-
-        if ( eq( bgpIntentsStrExpected, bgpIntentsStrActual ) ):
-            main.log.report(
-                "***PointToPointIntent Intents in SDN-IP are correct!***" )
-        else:
-            main.log.report(
-                "***PointToPointIntent Intents in SDN-IP are wrong!***" )
-
-        main.log.info( "Ping Test Start" )
-        time.sleep(1000000)
-
-        #============================= Ping Test ========================
-        # wait until all MultiPointToSinglePoint
-        time.sleep( 20 )
-        pingTestScript = "CASE4-ping-as2host.sh"
-        pingTestResultsFile = \
-        "~/CASE4-ping-results-before-delete-routes-" \
-            + strftime( "%Y-%m-%d_%H:%M:%S", localtime() ) + ".txt"
-        pingTestResults = main.QuaggaCliHost.pingTest(
-            "1.168.30.100", pingTestScript, pingTestResultsFile )
-        main.log.info( pingTestResults )
-        time.sleep( 20 )
-
-        #============================= Deleting Routes ==================
-        main.step( "Check deleting routes installed" )
-        main.QuaggaCliHost3.deleteRoutes( prefixesHost3, 1 )
-        main.QuaggaCliHost4.deleteRoutes( prefixesHost4, 1 )
-        main.QuaggaCliHost5.deleteRoutes( prefixesHost5, 1 )
-
-        getRoutesResult = main.ONOScli.routes( jsonFormat=True )
-        allRoutesActual = \
-            main.QuaggaCliHost3.extractActualRoutes( getRoutesResult )
-        main.log.info( "allRoutes_actual = " )
-        main.log.info( allRoutesActual )
-
-        utilities.assertEquals(
-            expect="[]", actual=str( allRoutesActual ),
-            onpass="***Route number in SDN-IP is 0, correct!***",
-            onfail="***Routes number in SDN-IP is not 0, wrong!***" )
-
-        if( eq( allRoutesStrExpected, allRoutesStrActual ) ):
-            main.log.report( "***Routes in SDN-IP after deleting correct!***" )
-        else:
-            main.log.report( "***Routes in SDN-IP after deleting wrong!***" )
-
-        main.step( "Check intents after deleting routes" )
-        getIntentsResult = main.ONOScli.intents( jsonFormat=True )
-        routeIntentsActual = \
-            main.QuaggaCliHost3.extractActualRouteIntents(
-                getIntentsResult )
-        main.log.info( "main.ONOScli.intents()= " )
-        main.log.info( routeIntentsActual )
-        utilities.assertEquals(
-            expect="[]", actual=str( routeIntentsActual ),
-            onpass="***MultiPointToSinglePoint Intents number in SDN-IP is 0, \
-            correct!***",
-            onfail="***MultiPointToSinglePoint Intents number in SDN-IP is 0, \
-            wrong!***" )
-
-        if( eq( routeIntentsStrExpected, routeIntentsStrActual ) ):
-            main.log.report( "***MultiPointToSinglePoint Intents after \
-            deleting routes correct!***" )
-        else:
-            main.log.report( "***MultiPointToSinglePoint Intents after \
-            deleting routes wrong!***" )
-
-        time.sleep( 20 )
-        pingTestScript = "CASE4-ping-as2host.sh"
-        pingTestResultsFile = \
-        "~/CASE4-ping-results-after-delete-routes-" \
-            + strftime( "%Y-%m-%d_%H:%M:%S", localtime() ) + ".txt"
-        pingTestResults = main.QuaggaCliHost.pingTest(
-            "1.168.30.100", pingTestScript, pingTestResultsFile )
-        main.log.info( pingTestResults )
-        time.sleep( 100 )
-
-        # main.step( "Test whether Mininet is started" )
-        # main.Mininet2.handle.sendline( "xterm host1" )
-        # main.Mininet2.handle.expect( "mininet>" )
-
-    def CASE3( self, main ):
-        """
-        Test the SDN-IP functionality
-        allRoutesExpected: all expected routes for all BGP peers
-        routeIntentsExpected: all expected MultiPointToSinglePointIntent intents
-        bgpIntentsExpected: expected PointToPointIntent intents
-        allRoutesActual: all routes from ONOS LCI
-        routeIntentsActual: actual MultiPointToSinglePointIntent intents from \
-        ONOS CLI
-        bgpIntentsActual: actual PointToPointIntent intents from ONOS CLI
-        """
-        import time
-        import json
-        from operator import eq
-        # from datetime import datetime
-        from time import localtime, strftime
-
-        main.case( "The test case is to help to setup the TestON \
-            environment and test new drivers" )
-        # SDNIPJSONFILEPATH = "../tests/SdnIpTest/sdnip.json"
-        SDNIPJSONFILEPATH = \
-            "/home/admin/workspace/onos/tools/package/config/sdnip.json"
-        # all expected routes for all BGP peers
-        allRoutesExpected = []
-        main.step( "Start to generate routes for all BGP peers" )
-        main.log.info( "Generate prefixes for host3" )
-        prefixesHost3 = main.QuaggaCliHost3.generatePrefixes( 3, 10 )
-        main.log.info( prefixesHost3 )
-        # generate route with next hop
-        for prefix in prefixesHost3:
-            allRoutesExpected.append( prefix + "/" + "192.168.20.1" )
-        routeIntentsExpectedHost3 = \
-            main.QuaggaCliHost3.generateExpectedOnePeerRouteIntents(
-            prefixesHost3, "192.168.20.1", "00:00:00:00:02:02",
-            SDNIPJSONFILEPATH )
-
-        main.log.info( "Generate prefixes for host4" )
-        prefixesHost4 = main.QuaggaCliHost4.generatePrefixes( 4, 10 )
-        main.log.info( prefixesHost4 )
-        # generate route with next hop
-        for prefix in prefixesHost4:
-            allRoutesExpected.append( prefix + "/" + "192.168.30.1" )
-        routeIntentsExpectedHost4 = \
-            main.QuaggaCliHost4.generateExpectedOnePeerRouteIntents(
-            prefixesHost4, "192.168.30.1", "00:00:00:00:03:01",
-            SDNIPJSONFILEPATH )
-
-        routeIntentsExpected = routeIntentsExpectedHost3 + \
-            routeIntentsExpectedHost4
-
-        cellName = main.params[ 'ENV' ][ 'cellName' ]
-        ONOS1Ip = main.params[ 'CTRL' ][ 'ip1' ]
-        main.step( "Set cell for ONOS-cli environment" )
-        main.ONOScli.setCell( cellName )
-        verifyResult = main.ONOSbench.verifyCell()
-
-        main.log.report( "Removing raft logs" )
-        main.ONOSbench.onosRemoveRaftLogs()
-        main.log.report( "Uninstalling ONOS" )
-        main.ONOSbench.onosUninstall( ONOS1Ip )
-
-        main.step( "Installing ONOS package" )
-        onos1InstallResult = main.ONOSbench.onosInstall(
-            options="-f", node=ONOS1Ip )
-
-        main.step( "Checking if ONOS is up yet" )
-        time.sleep( 60 )
-        onos1Isup = main.ONOSbench.isup( ONOS1Ip )
-        if not onos1Isup:
-            main.log.report( "ONOS1 didn't start!" )
-
-        main.step( "Start ONOS-cli" )
-
-        main.ONOScli.startOnosCli( ONOS1Ip )
-
-        main.step( "Get devices in the network" )
-        listResult = main.ONOScli.devices( jsonFormat=False )
-        main.log.info( listResult )
-        time.sleep( 10 )
-        main.log.info( "Installing sdn-ip feature" )
-        main.ONOScli.featureInstall( "onos-app-sdnip" )
-        time.sleep( 10 )
-        main.step( "Login all BGP peers and add routes into peers" )
-
-        main.log.info( "Login Quagga CLI on host3" )
-        main.QuaggaCliHost3.loginQuagga( "1.168.30.2" )
-        main.log.info( "Enter configuration model of Quagga CLI on host3" )
-        main.QuaggaCliHost3.enterConfig( 64514 )
-        main.log.info( "Add routes to Quagga on host3" )
-        main.QuaggaCliHost3.addRoutes( prefixesHost3, 1 )
-
-        main.log.info( "Login Quagga CLI on host4" )
-        main.QuaggaCliHost4.loginQuagga( "1.168.30.3" )
-        main.log.info( "Enter configuration model of Quagga CLI on host4" )
-        main.QuaggaCliHost4.enterConfig( 64516 )
-        main.log.info( "Add routes to Quagga on host4" )
-        main.QuaggaCliHost4.addRoutes( prefixesHost4, 1 )
-
-        for i in range( 101, 201 ):
-            prefixesHostX = \
-                main.QuaggaCliHost.generatePrefixes( str( i ), 10 )
-            main.log.info( prefixesHostX )
-            for prefix in prefixesHostX:
-                allRoutesExpected.append(
-                    prefix + "/" + "192.168.40." + str( i - 100 ) )
-
-            routeIntentsExpectedHostX = \
-                main.QuaggaCliHost.generateExpectedOnePeerRouteIntents(
-                prefixesHostX, "192.168.40." + str( i - 100 ),
-                "00:00:%02d:00:00:90" % ( i - 101 ), SDNIPJSONFILEPATH )
-            routeIntentsExpected = routeIntentsExpected + \
-                routeIntentsExpectedHostX
-
-            main.log.info( "Login Quagga CLI on host" + str( i ) )
-            QuaggaCliHostX = getattr( main, ( 'QuaggaCliHost' + str( i ) ) )
-            QuaggaCliHostX.loginQuagga( "1.168.30." + str( i ) )
-            main.log.info(
-                "Enter configuration model of Quagga CLI on host" + str( i ) )
-            QuaggaCliHostX.enterConfig( 65000 + i - 100 )
-            main.log.info( "Add routes to Quagga on host" + str( i ) )
-            QuaggaCliHostX.addRoutes( prefixesHostX, 1 )
-
-        time.sleep( 60 )
-
-        # get routes inside SDN-IP
-        getRoutesResult = main.ONOScli.routes( jsonFormat=True )
-
-        # parse routes from ONOS CLI
-        allRoutesActual = \
-            main.QuaggaCliHost3.extractActualRoutes( getRoutesResult )
-
-        allRoutesStrExpected = str( sorted( allRoutesExpected ) )
-        allRoutesStrActual = str( allRoutesActual ).replace( 'u', "" )
-        main.step( "Check routes installed" )
-        main.log.info( "Routes expected:" )
-        main.log.info( allRoutesStrExpected )
-        main.log.info( "Routes get from ONOS CLI:" )
-        main.log.info( allRoutesStrActual )
-        utilities.assertEquals(
-            expect=allRoutesStrExpected, actual=allRoutesStrActual,
-            onpass="***Routes in SDN-IP are correct!***",
-            onfail="***Routes in SDN-IP are wrong!***" )
-        if( eq( allRoutesStrExpected, allRoutesStrActual ) ):
-            main.log.report(
-                "***Routes in SDN-IP after adding routes are correct!***" )
-        else:
-            main.log.report(
-                "***Routes in SDN-IP after adding routes are wrong!***" )
-
-        time.sleep( 20 )
-        getIntentsResult = main.ONOScli.intents( jsonFormat=True )
-
-        main.step( "Check MultiPointToSinglePointIntent intents installed" )
-        # routeIntentsExpected are generated when generating routes
-        # get rpoute intents from ONOS CLI
-        routeIntentsActual = \
-            main.QuaggaCliHost3.extractActualRouteIntents(
-                getIntentsResult )
-        routeIntentsStrExpected = str( sorted( routeIntentsExpected ) )
-        routeIntentsStrActual = str( routeIntentsActual ).replace( 'u', "" )
-        main.log.info( "MultiPointToSinglePoint intents expected:" )
-        main.log.info( routeIntentsStrExpected )
-        main.log.info( "MultiPointToSinglePoint intents get from ONOS CLI:" )
-        main.log.info( routeIntentsStrActual )
-        utilities.assertEquals(
-            expect=True,
-            actual=eq( routeIntentsStrExpected, routeIntentsStrActual ),
-            onpass="***MultiPointToSinglePoint Intents in SDN-IP are \
-            correct!***",
-            onfail="***MultiPointToSinglePoint Intents in SDN-IP are \
-            wrong!***" )
-
-        if( eq( routeIntentsStrExpected, routeIntentsStrActual ) ):
-            main.log.report(
-                "***MultiPointToSinglePoint Intents before deleting routes \
-                correct!***" )
-        else:
-            main.log.report(
-                "***MultiPointToSinglePoint Intents before deleting routes \
-                wrong!***" )
-
-        main.step( "Check BGP PointToPointIntent intents installed" )
-        # bgp intents expected
-        bgpIntentsExpected = main.QuaggaCliHost3.generateExpectedBgpIntents(
-            SDNIPJSONFILEPATH )
-        # get BGP intents from ONOS CLI
-        bgpIntentsActual = main.QuaggaCliHost3.extractActualBgpIntents(
-            getIntentsResult )
-
-        bgpIntentsStrExpected = str( bgpIntentsExpected ).replace( 'u', "" )
-        bgpIntentsStrActual = str( bgpIntentsActual )
-        main.log.info( "PointToPointIntent intents expected:" )
-        main.log.info( bgpIntentsStrExpected )
-        main.log.info( "PointToPointIntent intents get from ONOS CLI:" )
-        main.log.info( bgpIntentsStrActual )
-
-        utilities.assertEquals(
-            expect=True,
-            actual=eq( bgpIntentsStrExpected, bgpIntentsStrActual ),
-            onpass="***PointToPointIntent Intents in SDN-IP are correct!***",
-            onfail="***PointToPointIntent Intents in SDN-IP are wrong!***" )
-
-        if ( eq( bgpIntentsStrExpected, bgpIntentsStrActual ) ):
-            main.log.report(
-                "***PointToPointIntent Intents in SDN-IP are correct!***" )
-        else:
-            main.log.report(
-                "***PointToPointIntent Intents in SDN-IP are wrong!***" )
-
-        #============================= Ping Test ========================
-        # wait until all MultiPointToSinglePoint
-        time.sleep( 20 )
-        pingTestScript = "~/SDNIP/test-tools/CASE3-ping-as2host.sh"
-        pingTestResultsFile = \
-        "~/SDNIP/SdnIpIntentDemo/log/CASE3-ping-results-before-delete-routes-" \
-            + strftime( "%Y-%m-%d_%H:%M:%S", localtime() ) + ".txt"
-        pingTestResults = main.QuaggaCliHost.pingTest(
-            "1.168.30.100", pingTestScript, pingTestResultsFile )
-        main.log.info( pingTestResults )
-        time.sleep( 20 )
-
-        #============================= Deleting Routes ==================
-        main.step( "Check deleting routes installed" )
-        main.QuaggaCliHost3.deleteRoutes( prefixesHost3, 1 )
-        main.QuaggaCliHost4.deleteRoutes( prefixesHost4, 1 )
-        for i in range( 101, 201 ):
-            prefixesHostX = \
-                main.QuaggaCliHost.generatePrefixes( str( i ), 10 )
-            main.log.info( prefixesHostX )
-            QuaggaCliHostX = getattr( main, ( 'QuaggaCliHost' + str( i ) ) )
-            QuaggaCliHostX.deleteRoutes( prefixesHostX, 1 )
-
-        getRoutesResult = main.ONOScli.routes( jsonFormat=True )
-        allRoutesActual = main.QuaggaCliHost3.extractActualRoutes(
-            getRoutesResult )
-        main.log.info( "allRoutes_actual = " )
-        main.log.info( allRoutesActual )
-
-        utilities.assertEquals(
-            expect="[]", actual=str( allRoutesActual ),
-            onpass="***Route number in SDN-IP is 0, correct!***",
-            onfail="***Routes number in SDN-IP is not 0, wrong!***" )
-
-        if( eq( allRoutesStrExpected, allRoutesStrActual ) ):
-            main.log.report(
-                "***Routes in SDN-IP after deleting correct!***" )
-        else:
-            main.log.report(
-                "***Routes in SDN-IP after deleting wrong!***" )
-
-        main.step( "Check intents after deleting routes" )
-        getIntentsResult = main.ONOScli.intents( jsonFormat=True )
-        routeIntentsActual = \
-            main.QuaggaCliHost3.extractActualRouteIntents(
-                getIntentsResult )
-        main.log.info( "main.ONOScli.intents()= " )
-        main.log.info( routeIntentsActual )
-        utilities.assertEquals(
-            expect="[]", actual=str( routeIntentsActual ),
-            onpass="***MultiPointToSinglePoint Intents number in SDN-IP is \
-            0, correct!***",
-            onfail="***MultiPointToSinglePoint Intents number in SDN-IP is \
-            0, wrong!***" )
-
-        if( eq( routeIntentsStrExpected, routeIntentsStrActual ) ):
-            main.log.report(
-                "***MultiPointToSinglePoint Intents after deleting routes \
-                correct!***" )
-        else:
-            main.log.report(
-                "***MultiPointToSinglePoint Intents after deleting routes \
-                wrong!***" )
-
-        time.sleep( 20 )
-        pingTestScript = "~/SDNIP/test-tools/CASE3-ping-as2host.sh"
-        pingTestResultsFile = \
-        "~/SDNIP/SdnIpIntentDemo/log/CASE3-ping-results-after-delete-routes-" \
-            + strftime( "%Y-%m-%d_%H:%M:%S", localtime() ) + ".txt"
-        pingTestResults = main.QuaggaCliHost.pingTest(
-            "1.168.30.100", pingTestScript, pingTestResultsFile )
-        main.log.info( pingTestResults )
-        time.sleep( 100 )
-
-        # main.step( "Test whether Mininet is started" )
-        # main.Mininet2.handle.sendline( "xterm host1" )
-        # main.Mininet2.handle.expect( "mininet>" )
-
-    def CASE1( self, main ):
-        """
-        Test the SDN-IP functionality
-        allRoutesExpected: all expected routes for all BGP peers
-        routeIntentsExpected: all expected MultiPointToSinglePointIntent \
-        intents
-        bgpIntentsExpected: expected PointToPointIntent intents
-        allRoutesActual: all routes from ONOS LCI
-        routeIntentsActual: actual MultiPointToSinglePointIntent intents \
-        from ONOS CLI
-        bgpIntentsActual: actual PointToPointIntent intents from ONOS CLI
-        """
-        import time
-        import json
-        from operator import eq
-        # from datetime import datetime
-        from time import localtime, strftime
-
-        main.case("The test case is to help to setup the TestON environment \
-            and test new drivers" )
-        SDNIPJSONFILEPATH = "../tests/SdnIpTest/sdnip.json"
-        # all expected routes for all BGP peers
-        allRoutesExpected = []
-        main.step( "Start to generate routes for all BGP peers" )
-        # bgpPeerHosts = []
-        # for i in range( 3, 5 ):
-        #    bgpPeerHosts.append( "host" + str( i ) )
-        # main.log.info( "BGP Peer Hosts are:" + bgpPeerHosts )
-
-        # for i in range( 3, 5 ):
-         #   QuaggaCliHost = "QuaggaCliHost" + str( i )
-          #  prefixes = main.QuaggaCliHost.generatePrefixes( 3, 10 )
-
-           # main.log.info( prefixes )
-            # allRoutesExpected.append( prefixes )
-        main.log.info( "Generate prefixes for host3" )
-        prefixesHost3 = main.QuaggaCliHost3.generatePrefixes( 3, 10 )
-        main.log.info( prefixesHost3 )
-        # generate route with next hop
-        for prefix in prefixesHost3:
-            allRoutesExpected.append( prefix + "/" + "192.168.20.1" )
-        routeIntentsExpectedHost3 = \
-            main.QuaggaCliHost3.generateExpectedOnePeerRouteIntents(
-            prefixesHost3, "192.168.20.1", "00:00:00:00:02:02",
-            SDNIPJSONFILEPATH )
-
-        main.log.info( "Generate prefixes for host4" )
-        prefixesHost4 = main.QuaggaCliHost4.generatePrefixes( 4, 10 )
-        main.log.info( prefixesHost4 )
-        # generate route with next hop
-        for prefix in prefixesHost4:
-            allRoutesExpected.append( prefix + "/" + "192.168.30.1" )
-        routeIntentsExpectedHost4 = \
-            main.QuaggaCliHost4.generateExpectedOnePeerRouteIntents(
-            prefixesHost4, "192.168.30.1", "00:00:00:00:03:01",
-            SDNIPJSONFILEPATH )
-
-        routeIntentsExpected = routeIntentsExpectedHost3 + \
-            routeIntentsExpectedHost4
-
-        cellName = main.params[ 'ENV' ][ 'cellName' ]
-        ONOS1Ip = main.params[ 'CTRL' ][ 'ip1' ]
-        main.step( "Set cell for ONOS-cli environment" )
-        main.ONOScli.setCell( cellName )
-        verifyResult = main.ONOSbench.verifyCell()
-        main.log.report( "Removing raft logs" )
-        main.ONOSbench.onosRemoveRaftLogs()
-        main.log.report( "Uninstalling ONOS" )
-        main.ONOSbench.onosUninstall( ONOS1Ip )
-        main.step( "Creating ONOS package" )
-        packageResult = main.ONOSbench.onosPackage()
-
-        main.step( "Starting ONOS service" )
-        # TODO: start ONOS from Mininet Script
-        # startResult = main.ONOSbench.onosStart( "127.0.0.1" )
-        main.step( "Installing ONOS package" )
-        onos1InstallResult = main.ONOSbench.onosInstall(
-            options="-f", node=ONOS1Ip )
-
-        main.step( "Checking if ONOS is up yet" )
-        time.sleep( 60 )
-        onos1Isup = main.ONOSbench.isup( ONOS1Ip )
-        if not onos1Isup:
-            main.log.report( "ONOS1 didn't start!" )
-
-        main.step( "Start ONOS-cli" )
-        # TODO: change the hardcode in startOnosCli method in ONOS CLI driver
-
-        main.ONOScli.startOnosCli( ONOS1Ip )
-
-        main.step( "Get devices in the network" )
-        listResult = main.ONOScli.devices( jsonFormat=False )
-        main.log.info( listResult )
-        time.sleep( 10 )
-        main.log.info( "Installing sdn-ip feature" )
-        main.ONOScli.featureInstall( "onos-app-sdnip" )
-        time.sleep( 10 )
-        main.step( "Login all BGP peers and add routes into peers" )
-        main.log.info( "Login Quagga CLI on host3" )
-        main.QuaggaCliHost3.loginQuagga( "1.168.30.2" )
-        main.log.info( "Enter configuration model of Quagga CLI on host3" )
-        main.QuaggaCliHost3.enterConfig( 64514 )
-        main.log.info( "Add routes to Quagga on host3" )
-        main.QuaggaCliHost3.addRoutes( prefixesHost3, 1 )
-
-        main.log.info( "Login Quagga CLI on host4" )
-        main.QuaggaCliHost4.loginQuagga( "1.168.30.3" )
-        main.log.info( "Enter configuration model of Quagga CLI on host4" )
-        main.QuaggaCliHost4.enterConfig( 64516 )
-        main.log.info( "Add routes to Quagga on host4" )
-        main.QuaggaCliHost4.addRoutes( prefixesHost4, 1 )
-        time.sleep( 60 )
-
-        # get all routes inside SDN-IP
-        getRoutesResult = main.ONOScli.routes( jsonFormat=True )
-
-        # parse routes from ONOS CLI
-        allRoutesActual = \
-            main.QuaggaCliHost3.extractActualRoutes( getRoutesResult )
-
-        allRoutesStrExpected = str( sorted( allRoutesExpected ) )
-        allRoutesStrActual = str( allRoutesActual ).replace( 'u', "" )
-        main.step( "Check routes installed" )
-        main.log.info( "Routes expected:" )
-        main.log.info( allRoutesStrExpected )
-        main.log.info( "Routes get from ONOS CLI:" )
-        main.log.info( allRoutesStrActual )
-        utilities.assertEquals(
-            expect=allRoutesStrExpected, actual=allRoutesStrActual,
-            onpass="***Routes in SDN-IP are correct!***",
-            onfail="***Routes in SDN-IP are wrong!***" )
-        if( eq( allRoutesStrExpected, allRoutesStrActual ) ):
-            main.log.report(
-                "***Routes in SDN-IP after adding routes are correct!***" )
-        else:
-            main.log.report(
-                "***Routes in SDN-IP after adding routes are wrong!***" )
-
-        time.sleep( 20 )
-        getIntentsResult = main.ONOScli.intents( jsonFormat=True )
-
-        main.step( "Check MultiPointToSinglePointIntent intents installed" )
-        # routeIntentsExpected are generated when generating routes
-        # get rpoute intents from ONOS CLI
-        routeIntentsActual = \
-            main.QuaggaCliHost3.extractActualRouteIntents(
-                getIntentsResult )
-        routeIntentsStrExpected = str( sorted( routeIntentsExpected ) )
-        routeIntentsStrActual = str( routeIntentsActual ).replace( 'u', "" )
-        main.log.info( "MultiPointToSinglePoint intents expected:" )
-        main.log.info( routeIntentsStrExpected )
-        main.log.info( "MultiPointToSinglePoint intents get from ONOS CLI:" )
-        main.log.info( routeIntentsStrActual )
-        utilities.assertEquals(
-            expect=True,
-            actual=eq( routeIntentsStrExpected, routeIntentsStrActual ),
-            onpass="***MultiPointToSinglePoint Intents in SDN-IP are \
-            correct!***",
-            onfail="***MultiPointToSinglePoint Intents in SDN-IP are \
-            wrong!***" )
-
-        if( eq( routeIntentsStrExpected, routeIntentsStrActual ) ):
-            main.log.report(
-                "***MultiPointToSinglePoint Intents before deleting routes \
-                correct!***" )
-        else:
-            main.log.report(
-                "***MultiPointToSinglePoint Intents before deleting routes \
-                wrong!***" )
-
-        main.step( "Check BGP PointToPointIntent intents installed" )
-        # bgp intents expected
-        bgpIntentsExpected = \
-            main.QuaggaCliHost3.generateExpectedBgpIntents( SDNIPJSONFILEPATH )
-        # get BGP intents from ONOS CLI
-        bgpIntentsActual = main.QuaggaCliHost3.extractActualBgpIntents(
-            getIntentsResult )
-
-        bgpIntentsStrExpected = str( bgpIntentsExpected ).replace( 'u', "" )
-        bgpIntentsStrActual = str( bgpIntentsActual )
-        main.log.info( "PointToPointIntent intents expected:" )
-        main.log.info( bgpIntentsStrExpected )
-        main.log.info( "PointToPointIntent intents get from ONOS CLI:" )
-        main.log.info( bgpIntentsStrActual )
-
-        utilities.assertEquals(
-            expect=True,
-            actual=eq( bgpIntentsStrExpected, bgpIntentsStrActual ),
-            onpass="***PointToPointIntent Intents in SDN-IP are correct!***",
-            onfail="***PointToPointIntent Intents in SDN-IP are wrong!***" )
-
-        if ( eq( bgpIntentsStrExpected, bgpIntentsStrActual ) ):
-            main.log.report(
-                "***PointToPointIntent Intents in SDN-IP are correct!***" )
-        else:
-            main.log.report(
-                "***PointToPointIntent Intents in SDN-IP are wrong!***" )
-
-        #============================= Ping Test ========================
-        # wait until all MultiPointToSinglePoint
-        time.sleep( 20 )
-        pingTestScript = "~/SDNIP/SdnIpIntentDemo/CASE1-ping-as2host.sh"
-        pingTestResultsFile = \
-        "~/SDNIP/SdnIpIntentDemo/log/CASE1-ping-results-before-delete-routes-" \
-             + strftime( "%Y-%m-%d_%H:%M:%S", localtime() ) + ".txt"
-        pingTestResults = main.QuaggaCliHost.pingTest(
-            "1.168.30.100", pingTestScript, pingTestResultsFile )
-        main.log.info( pingTestResults )
-
-        # ping test
-
-        #============================= Deleting Routes ==================
-        main.step( "Check deleting routes installed" )
-        main.QuaggaCliHost3.deleteRoutes( prefixesHost3, 1 )
-        main.QuaggaCliHost4.deleteRoutes( prefixesHost4, 1 )
-
-        # main.log.info( "main.ONOScli.get_routes_num() = " )
-        # main.log.info( main.ONOScli.getRoutesNum() )
-        # utilities.assertEquals( expect="Total SDN-IP routes = 1", actual=
-        # main.ONOScli.getRoutesNum(),
-        getRoutesResult = main.ONOScli.routes( jsonFormat=True )
-        allRoutesActual = \
-            main.QuaggaCliHost3.extractActualRoutes( getRoutesResult )
-        main.log.info( "allRoutes_actual = " )
-        main.log.info( allRoutesActual )
-
-        utilities.assertEquals(
-            expect="[]", actual=str( allRoutesActual ),
-            onpass="***Route number in SDN-IP is 0, correct!***",
-            onfail="***Routes number in SDN-IP is not 0, wrong!***" )
-
-        if( eq( allRoutesStrExpected, allRoutesStrActual ) ):
-            main.log.report(
-                "***Routes in SDN-IP after deleting correct!***" )
-        else:
-            main.log.report(
-                "***Routes in SDN-IP after deleting wrong!***" )
-
-        main.step( "Check intents after deleting routes" )
-        getIntentsResult = main.ONOScli.intents( jsonFormat=True )
-        routeIntentsActual = \
-            main.QuaggaCliHost3.extractActualRouteIntents(
-                getIntentsResult )
-        main.log.info( "main.ONOScli.intents()= " )
-        main.log.info( routeIntentsActual )
-        utilities.assertEquals(
-            expect="[]", actual=str( routeIntentsActual ),
-            onpass="***MultiPointToSinglePoint Intents number in SDN-IP is \
-            0, correct!***",
-            onfail="***MultiPointToSinglePoint Intents number in SDN-IP is \
-            0, wrong!***" )
-
-        if( eq( routeIntentsStrExpected, routeIntentsStrActual ) ):
-            main.log.report(
-                "***MultiPointToSinglePoint Intents after deleting routes \
-                correct!***" )
-        else:
-            main.log.report(
-                "***MultiPointToSinglePoint Intents after deleting routes \
-                wrong!***" )
-
-        time.sleep( 20 )
-        pingTestScript = "~/SDNIP/SdnIpIntentDemo/CASE1-ping-as2host.sh"
-        pingTestResultsFile = \
-        "~/SDNIP/SdnIpIntentDemo/log/CASE1-ping-results-after-delete-routes-" \
-             + strftime( "%Y-%m-%d_%H:%M:%S", localtime() ) + ".txt"
-        pingTestResults = main.QuaggaCliHost.pingTest(
-            "1.168.30.100", pingTestScript, pingTestResultsFile )
-        main.log.info( pingTestResults )
-        time.sleep( 30 )
-
-        # main.step( "Test whether Mininet is started" )
-        # main.Mininet2.handle.sendline( "xterm host1" )
-        # main.Mininet2.handle.expect( "mininet>" )
-
-    def CASE2( self, main ):
-        """
-        Test the SDN-IP functionality
-        allRoutesExpected: all expected routes for all BGP peers
-        routeIntentsExpected: all expected MultiPointToSinglePointIntent \
-        intents
-        bgpIntentsExpected: expected PointToPointIntent intents
-        allRoutesActual: all routes from ONOS LCI
-        routeIntentsActual: actual MultiPointToSinglePointIntent intents \
-        from ONOS CLI
-        bgpIntentsActual: actual PointToPointIntent intents from ONOS CLI
-        """
-        import time
-        import json
-        from operator import eq
-        from time import localtime, strftime
-
-        main.case(
-            "The test case is to help to setup the TestON environment and \
-            test new drivers" )
-        SDNIPJSONFILEPATH = "../tests/SdnIpTest/sdnip.json"
-        # all expected routes for all BGP peers
-        allRoutesExpected = []
-        main.step( "Start to generate routes for all BGP peers" )
-
-        main.log.info( "Generate prefixes for host3" )
-        prefixesHost3 = main.QuaggaCliHost3.generatePrefixes( 3, 10 )
-        main.log.info( prefixesHost3 )
-        # generate route with next hop
-        for prefix in prefixesHost3:
-            allRoutesExpected.append( prefix + "/" + "192.168.20.1" )
-        routeIntentsExpectedHost3 = \
-            main.QuaggaCliHost3.generateExpectedOnePeerRouteIntents(
-            prefixesHost3, "192.168.20.1", "00:00:00:00:02:02",
-            SDNIPJSONFILEPATH )
-
-        main.log.info( "Generate prefixes for host4" )
-        prefixesHost4 = main.QuaggaCliHost4.generatePrefixes( 4, 10 )
-        main.log.info( prefixesHost4 )
-        # generate route with next hop
-        for prefix in prefixesHost4:
-            allRoutesExpected.append( prefix + "/" + "192.168.30.1" )
-        routeIntentsExpectedHost4 = \
-            main.QuaggaCliHost4.generateExpectedOnePeerRouteIntents(
-            prefixesHost4, "192.168.30.1", "00:00:00:00:03:01",
-            SDNIPJSONFILEPATH )
-
-        routeIntentsExpected = routeIntentsExpectedHost3 + \
-            routeIntentsExpectedHost4
-
-        main.log.report( "Removing raft logs" )
-        main.ONOSbench.onosRemoveRaftLogs()
-        main.log.report( "Uninstalling ONOS" )
-        main.ONOSbench.onosUninstall( ONOS1Ip )
-
-        cellName = main.params[ 'ENV' ][ 'cellName' ]
-        ONOS1Ip = main.params[ 'CTRL' ][ 'ip1' ]
-        main.step( "Set cell for ONOS-cli environment" )
-        main.ONOScli.setCell( cellName )
-        verifyResult = main.ONOSbench.verifyCell()
-        # main.log.report( "Removing raft logs" )
-        # main.ONOSbench.onosRemoveRaftLogs()
-        # main.log.report( "Uninstalling ONOS" )
-        # main.ONOSbench.onosUninstall( ONOS1Ip )
-        main.step( "Creating ONOS package" )
-        # packageResult = main.ONOSbench.onosPackage()
-
-        main.step( "Installing ONOS package" )
-        # onos1InstallResult = main.ONOSbench.onosInstall( options="-f",
-        # node=ONOS1Ip )
-
-        main.step( "Checking if ONOS is up yet" )
-        # time.sleep( 60 )
-        onos1Isup = main.ONOSbench.isup( ONOS1Ip )
-        if not onos1Isup:
-            main.log.report( "ONOS1 didn't start!" )
-
-        main.step( "Start ONOS-cli" )
-        main.ONOScli.startOnosCli( ONOS1Ip )
-
-        main.step( "Get devices in the network" )
-        listResult = main.ONOScli.devices( jsonFormat=False )
-        main.log.info( listResult )
-        time.sleep( 10 )
-        main.log.info( "Installing sdn-ip feature" )
-        main.ONOScli.featureInstall( "onos-app-sdnip" )
-        time.sleep( 10 )
-
-        main.step( "Check BGP PointToPointIntent intents installed" )
-        # bgp intents expected
-        bgpIntentsExpected = main.QuaggaCliHost3.generateExpectedBgpIntents(
-            SDNIPJSONFILEPATH )
-        # get BGP intents from ONOS CLI
-        getIntentsResult = main.ONOScli.intents( jsonFormat=True )
-        bgpIntentsActual = main.QuaggaCliHost3.extractActualBgpIntents(
-            getIntentsResult )
-
-        bgpIntentsStrExpected = str( bgpIntentsExpected ).replace( 'u', "" )
-        bgpIntentsStrActual = str( bgpIntentsActual )
-        main.log.info( "PointToPointIntent intents expected:" )
-        main.log.info( bgpIntentsStrExpected )
-        main.log.info( "PointToPointIntent intents get from ONOS CLI:" )
-        main.log.info( bgpIntentsStrActual )
-
-        utilities.assertEquals(
-            expect=True,
-            actual=eq( bgpIntentsStrExpected, bgpIntentsStrActual ),
-            onpass="***PointToPointIntent Intents in SDN-IP are correct!***",
-            onfail="***PointToPointIntent Intents in SDN-IP are wrong!***" )
-
-        if ( eq( bgpIntentsStrExpected, bgpIntentsStrActual ) ):
-            main.log.report(
-                "***PointToPointIntent Intents in SDN-IP are correct!***" )
-        else:
-            main.log.report(
-                "***PointToPointIntent Intents in SDN-IP are wrong!***" )
-
-        allRoutesStrExpected = str( sorted( allRoutesExpected ) )
-        routeIntentsStrExpected = str( sorted( routeIntentsExpected ) )
-        pingTestScript = "~/SDNIP/SdnIpIntentDemo/CASE1-ping-as2host.sh"
-        # roundNum = 0;
-        # while( True ):
-        for roundNum in range( 1, 6 ):
-            # round = round + 1;
-            main.log.report( "The Round " + str( roundNum ) +
-                             " test starts................................" )
-
-            main.step( "Login all BGP peers and add routes into peers" )
-            main.log.info( "Login Quagga CLI on host3" )
-            main.QuaggaCliHost3.loginQuagga( "1.168.30.2" )
-            main.log.info(
-                "Enter configuration model of Quagga CLI on host3" )
-            main.QuaggaCliHost3.enterConfig( 64514 )
-            main.log.info( "Add routes to Quagga on host3" )
-            main.QuaggaCliHost3.addRoutes( prefixesHost3, 1 )
-
-            main.log.info( "Login Quagga CLI on host4" )
-            main.QuaggaCliHost4.loginQuagga( "1.168.30.3" )
-            main.log.info(
-                "Enter configuration model of Quagga CLI on host4" )
-            main.QuaggaCliHost4.enterConfig( 64516 )
-            main.log.info( "Add routes to Quagga on host4" )
-            main.QuaggaCliHost4.addRoutes( prefixesHost4, 1 )
-            time.sleep( 60 )
-
-            # get all routes inside SDN-IP
-            getRoutesResult = main.ONOScli.routes( jsonFormat=True )
-
-            # parse routes from ONOS CLI
-            allRoutesActual = \
-                main.QuaggaCliHost3.extractActualRoutes( getRoutesResult )
-
-            # allRoutesStrExpected = str( sorted( allRoutesExpected ) )
-            allRoutesStrActual = str( allRoutesActual ).replace( 'u', "" )
-            main.step( "Check routes installed" )
-            main.log.info( "Routes expected:" )
-            main.log.info( allRoutesStrExpected )
-            main.log.info( "Routes get from ONOS CLI:" )
-            main.log.info( allRoutesStrActual )
-            utilities.assertEquals(
-                expect=allRoutesStrExpected, actual=allRoutesStrActual,
-                onpass="***Routes in SDN-IP are correct!***",
-                onfail="***Routes in SDN-IP are wrong!***" )
-            if( eq( allRoutesStrExpected, allRoutesStrActual ) ):
-                main.log.report(
-                    "***Routes in SDN-IP after adding correct!***" )
-            else:
-                main.log.report(
-                    "***Routes in SDN-IP after adding wrong!***" )
-
-            time.sleep( 20 )
-            getIntentsResult = main.ONOScli.intents( jsonFormat=True )
-
-            main.step(
-                "Check MultiPointToSinglePointIntent intents installed" )
-            # routeIntentsExpected are generated when generating routes
-            # get route intents from ONOS CLI
-            routeIntentsActual = \
-                main.QuaggaCliHost3.extractActualRouteIntents(
-                    getIntentsResult )
-            # routeIntentsStrExpected = str( sorted( routeIntentsExpected ) )
-            routeIntentsStrActual = str(
-                routeIntentsActual ).replace( 'u', "" )
-            main.log.info( "MultiPointToSinglePoint intents expected:" )
-            main.log.info( routeIntentsStrExpected )
-            main.log.info(
-                "MultiPointToSinglePoint intents get from ONOS CLI:" )
-            main.log.info( routeIntentsStrActual )
-            utilities.assertEquals(
-                expect=True,
-                actual=eq( routeIntentsStrExpected, routeIntentsStrActual ),
-                onpass="***MultiPointToSinglePoint Intents in SDN-IP are \
-                correct!***",
-                onfail="***MultiPointToSinglePoint Intents in SDN-IP are \
-                wrong!***" )
-
-            if( eq( routeIntentsStrExpected, routeIntentsStrActual ) ):
-                main.log.report(
-                    "***MultiPointToSinglePoint Intents after adding routes \
-                    correct!***" )
-            else:
-                main.log.report(
-                    "***MultiPointToSinglePoint Intents after adding routes \
-                    wrong!***" )
-
-            #============================= Ping Test ========================
-            # wait until all MultiPointToSinglePoint
-            time.sleep( 20 )
-            # pingTestScript = "~/SDNIP/SdnIpIntentDemo/CASE1-ping-as2host.sh"
-            pingTestResultsFile = \
-                "~/SDNIP/SdnIpIntentDemo/log/CASE2-Round" \
-                + str( roundNum ) + "-ping-results-before-delete-routes-" \
-                + strftime( "%Y-%m-%d_%H:%M:%S", localtime() ) + ".txt"
-            pingTestResults = main.QuaggaCliHost.pingTest(
-                "1.168.30.100", pingTestScript, pingTestResultsFile )
-            main.log.info( pingTestResults )
-            # ping test
-
-            #============================= Deleting Routes ==================
-            main.step( "Check deleting routes installed" )
-            main.log.info( "Delete routes to Quagga on host3" )
-            main.QuaggaCliHost3.deleteRoutes( prefixesHost3, 1 )
-            main.log.info( "Delete routes to Quagga on host4" )
-            main.QuaggaCliHost4.deleteRoutes( prefixesHost4, 1 )
-
-            getRoutesResult = main.ONOScli.routes( jsonFormat=True )
-            allRoutesActual = \
-                main.QuaggaCliHost3.extractActualRoutes( getRoutesResult )
-            main.log.info( "allRoutes_actual = " )
-            main.log.info( allRoutesActual )
-
-            utilities.assertEquals(
-                expect="[]", actual=str( allRoutesActual ),
-                onpass="***Route number in SDN-IP is 0, correct!***",
-                onfail="***Routes number in SDN-IP is not 0, wrong!***" )
-
-            if( eq( allRoutesStrExpected, allRoutesStrActual ) ):
-                main.log.report(
-                    "***Routes in SDN-IP after deleting correct!***" )
-            else:
-                main.log.report(
-                    "***Routes in SDN-IP after deleting wrong!***" )
-
-            main.step( "Check intents after deleting routes" )
-            getIntentsResult = main.ONOScli.intents( jsonFormat=True )
-            routeIntentsActual = \
-                main.QuaggaCliHost3.extractActualRouteIntents(
-                    getIntentsResult )
-            main.log.info( "main.ONOScli.intents()= " )
-            main.log.info( routeIntentsActual )
-            utilities.assertEquals(
-                expect="[]", actual=str( routeIntentsActual ),
-                onpass=
-                "***MultiPointToSinglePoint Intents number in SDN-IP \
-                is 0, correct!***",
-                onfail="***MultiPointToSinglePoint Intents number in SDN-IP \
-                is 0, wrong!***" )
-
-            if( eq( routeIntentsStrExpected, routeIntentsStrActual ) ):
-                main.log.report(
-                    "***MultiPointToSinglePoint Intents after deleting \
-                    routes correct!***" )
-            else:
-                main.log.report(
-                    "***MultiPointToSinglePoint Intents after deleting \
-                    routes wrong!***" )
-
-            time.sleep( 20 )
-            # pingTestScript = "~/SDNIP/SdnIpIntentDemo/CASE1-ping-as2host.sh"
-            pingTestResultsFile = \
-                "~/SDNIP/SdnIpIntentDemo/log/CASE2-Round" \
-                + str( roundNum ) + "-ping-results-after-delete-routes-" \
-                + strftime( "%Y-%m-%d_%H:%M:%S", localtime() ) + ".txt"
-            pingTestResults = main.QuaggaCliHost.pingTest(
-                "1.168.30.100", pingTestScript, pingTestResultsFile )
-            main.log.info( pingTestResults )
-            time.sleep( 30 )
-
diff --git a/TestON/tests/PeeringRouter/PeeringRouter.topo b/TestON/tests/PeeringRouter/PeeringRouter.topo
deleted file mode 100755
index df9f7d2..0000000
--- a/TestON/tests/PeeringRouter/PeeringRouter.topo
+++ /dev/null
@@ -1,73 +0,0 @@
-<TOPOLOGY>
-    <COMPONENT>
-
-        <ONOSbench>
-            <host>127.0.0.1</host>
-            <user>sdnip</user>
-            <password>sdnip</password>
-            <type>OnosDriver</type>
-            <connect_order>1</connect_order>
-            <COMPONENTS> 
-                <home>~/onos</home>
-            </COMPONENTS>
-        </ONOSbench>
-
-        <ONOScli>
-            <host>127.0.0.1</host>
-            <user>sdnip</user>
-            <password>sdnip</password>
-            <type>OnosCliDriver</type>
-            <connect_order>2</connect_order>
-            <COMPONENTS> 
-                <home>~/onos</home>
-            </COMPONENTS>
-        </ONOScli>
-
-        <ONOS1>
-            <host>127.0.0.1</host>
-            <user>sdnip</user>
-            <password>sdnip</password>
-            <type>OnosDriver</type>
-            <connect_order>3</connect_order>
-            <COMPONENTS> 
-                <home>~/onos</home>
-            </COMPONENTS>
-        </ONOS1>
-
-        <QuaggaCliHost3>
-            <host>1.168.30.2</host>
-            <user>sdnip</user>
-            <password>sdnip</password>
-            <type>QuaggaCliDriver</type>
-            <connect_order>4</connect_order>
-            <COMPONENTS> </COMPONENTS>
-        </QuaggaCliHost3>
-        <QuaggaCliHost4>
-            <host>1.168.30.3</host>
-            <user>sdnip</user>
-            <password>sdnip</password>
-            <type>QuaggaCliDriver</type>
-            <connect_order>5</connect_order>
-            <COMPONENTS> </COMPONENTS>
-        </QuaggaCliHost4>
-        <QuaggaCliHost5>
-            <host>1.168.30.5</host>
-            <user>sdnip</user>
-            <password>sdnip</password>
-            <type>QuaggaCliDriver</type>
-            <connect_order>6</connect_order>
-            <COMPONENTS> </COMPONENTS>
-        </QuaggaCliHost5>
-        <QuaggaCliHost>
-            <host>1.168.30.100</host>
-            <user>sdnip</user>
-            <password>sdnip</password>
-            <type>QuaggaCliDriver</type>
-            <connect_order>7</connect_order>
-            <COMPONENTS> </COMPONENTS>
-        </QuaggaCliHost>
-
-
-    </COMPONENT>
-</TOPOLOGY>
-
diff --git a/TestON/tests/PeeringRouter/__init__.py b/TestON/tests/PeeringRouter/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/TestON/tests/PeeringRouter/__init__.py
+++ /dev/null
diff --git a/TestON/tests/PeeringRouter/addresses.json b/TestON/tests/PeeringRouter/addresses.json
deleted file mode 100644
index c1f6dd5..0000000
--- a/TestON/tests/PeeringRouter/addresses.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "addresses" : [
-		{
-		    "dpid" : "00:00:00:00:00:00:00:a1",
-		    "port" : "1",
-		    "ips" : ["192.168.10.101/24"],
-                    "mac" : "00:00:00:00:00:01"
-			
-		},
-		{
-		    "dpid" : "00:00:00:00:00:00:00:a1",
-		    "port" : "2",
-		    "ips" : ["192.168.20.101/24"],
-		    "mac" : "00:00:00:00:00:01"
-		},
-		{
-		    "dpid" : "00:00:00:00:00:00:00:a1",
-		    "port" : "3",
-		    "ips" : ["192.168.30.101/24"],
-		    "mac" : "00:00:00:00:00:01"
-		},
-		{
-		    "dpid" : "00:00:00:00:00:00:00:a1",
-		    "port" : "4",
-		    "ips" : ["192.168.60.101/24"],
-		    "mac" : "00:00:00:00:00:01"
-		}
-
-    ]
-}
diff --git a/TestON/tests/PeeringRouter/intents.json b/TestON/tests/PeeringRouter/intents.json
deleted file mode 100644
index d17715f..0000000
--- a/TestON/tests/PeeringRouter/intents.json
+++ /dev/null
@@ -1,1468 +0,0 @@
-[  
-   {  
-      "id":"0xffffffffcb2cb6ec",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.10.101/32}, IPV4_DST{ip=192.168.10.1/32}, IP_PROTO{protocol=1}, ETH_TYPE{ethType=800}]",
-      "ingress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a3",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0x140a3304",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a3, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.10.101/32}, IPV4_DST{ip=192.168.10.1/32}, IP_PROTO{protocol=1}, ETH_TYPE{ethType=800}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a3, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0xffffffffcb2d9828",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.10.1/32}, IPV4_DST{ip=192.168.10.101/32}, IP_PROTO{protocol=1}, ETH_TYPE{ethType=800}]",
-      "ingress":{  
-         "device":"of:00000000000000a3",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0x1a89f138",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a3, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.10.1/32}, IPV4_DST{ip=192.168.10.101/32}, IP_PROTO{protocol=1}, ETH_TYPE{ethType=800}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a3, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0xffffffffd1418988",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.30.101/32}, IPV4_DST{ip=192.168.30.1/32}, IP_PROTO{protocol=6}, ETH_TYPE{ethType=800}, TCP_DST{tcpPort=179}]",
-      "ingress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a2",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0x2cd85684",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a2, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.30.101/32}, IPV4_DST{ip=192.168.30.1/32}, IP_PROTO{protocol=6}, ETH_TYPE{ethType=800}, TCP_DST{tcpPort=179}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a2, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0x3122a56b",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.40.101/32}, IPV4_DST{ip=192.168.40.1/32}, IP_PROTO{protocol=1}, ETH_TYPE{ethType=800}]",
-      "ingress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a6",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0x5874487",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a5, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a5, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a6, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a6, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.40.101/32}, IPV4_DST{ip=192.168.40.1/32}, IP_PROTO{protocol=1}, ETH_TYPE{ethType=800}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a5, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a5, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a6, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a6, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0x6ae96523",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.10.101/32}, IPV4_DST{ip=192.168.10.1/32}, IP_PROTO{protocol=6}, TCP_SRC{tcpPort=179}, ETH_TYPE{ethType=800}]",
-      "ingress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a3",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0x217361ed",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a3, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.10.101/32}, IPV4_DST{ip=192.168.10.1/32}, IP_PROTO{protocol=6}, TCP_SRC{tcpPort=179}, ETH_TYPE{ethType=800}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a3, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0xffffffffaee31428",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.30.1/32}, IPV4_DST{ip=192.168.30.101/32}, IP_PROTO{protocol=6}, TCP_SRC{tcpPort=179}, ETH_TYPE{ethType=800}]",
-      "ingress":{  
-         "device":"of:00000000000000a2",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0x68cad35c",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a2, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.30.1/32}, IPV4_DST{ip=192.168.30.101/32}, IP_PROTO{protocol=6}, TCP_SRC{tcpPort=179}, ETH_TYPE{ethType=800}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a2, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0xffffffffed2b21fa",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.20.1/32}, IPV4_DST{ip=192.168.20.101/32}, IP_PROTO{protocol=1}, ETH_TYPE{ethType=800}]",
-      "ingress":{  
-         "device":"of:00000000000000a5",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0xffffffffa5dbcf50",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a5, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a5, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.20.1/32}, IPV4_DST{ip=192.168.20.101/32}, IP_PROTO{protocol=1}, ETH_TYPE{ethType=800}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a5, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a5, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0x373774a3",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.60.101/32}, IPV4_DST{ip=192.168.60.1/32}, IP_PROTO{protocol=6}, ETH_TYPE{ethType=800}, TCP_DST{tcpPort=179}]",
-      "ingress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a4",
-         "port":"4"
-      },
-      "installable":[  
-         {  
-            "id":"0x5a75d509",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a2, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a4, portNumber=1}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a4, portNumber=4}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.60.101/32}, IPV4_DST{ip=192.168.60.1/32}, IP_PROTO{protocol=6}, ETH_TYPE{ethType=800}, TCP_DST{tcpPort=179}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a2, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a4, portNumber=1}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a4, portNumber=4}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0xffffffff8d492c5d",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.10.1/32}, IPV4_DST{ip=192.168.10.101/32}, IP_PROTO{protocol=6}, ETH_TYPE{ethType=800}, TCP_DST{tcpPort=179}]",
-      "ingress":{  
-         "device":"of:00000000000000a3",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0xffffffffef408263",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a3, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.10.1/32}, IPV4_DST{ip=192.168.10.101/32}, IP_PROTO{protocol=6}, ETH_TYPE{ethType=800}, TCP_DST{tcpPort=179}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a3, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0xffffffff8ce7d031",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.20.1/32}, IPV4_DST{ip=192.168.20.101/32}, IP_PROTO{protocol=6}, TCP_SRC{tcpPort=179}, ETH_TYPE{ethType=800}]",
-      "ingress":{  
-         "device":"of:00000000000000a5",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0xffffffffb344fe39",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a5, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a5, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.20.1/32}, IPV4_DST{ip=192.168.20.101/32}, IP_PROTO{protocol=6}, TCP_SRC{tcpPort=179}, ETH_TYPE{ethType=800}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a5, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a5, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0xf2665f1",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.30.1/32}, IPV4_DST{ip=192.168.30.101/32}, IP_PROTO{protocol=1}, ETH_TYPE{ethType=800}]",
-      "ingress":{  
-         "device":"of:00000000000000a2",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0x5b61a473",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a2, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.30.1/32}, IPV4_DST{ip=192.168.30.101/32}, IP_PROTO{protocol=1}, ETH_TYPE{ethType=800}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a2, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0xffffffffd0e186b8",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.40.1/32}, IPV4_DST{ip=192.168.40.101/32}, IP_PROTO{protocol=6}, TCP_SRC{tcpPort=179}, ETH_TYPE{ethType=800}]",
-      "ingress":{  
-         "device":"of:00000000000000a6",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0x4d8d4942",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a6, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a6, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a4, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a4, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.40.1/32}, IPV4_DST{ip=192.168.40.101/32}, IP_PROTO{protocol=6}, TCP_SRC{tcpPort=179}, ETH_TYPE{ethType=800}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a6, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a6, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a4, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a4, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0x3738d163",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.60.1/32}, IPV4_DST{ip=192.168.60.101/32}, IP_PROTO{protocol=6}, ETH_TYPE{ethType=800}, TCP_DST{tcpPort=179}]",
-      "ingress":{  
-         "device":"of:00000000000000a4",
-         "port":"4"
-      },
-      "egress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0xffffffff993b0fc9",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a4, portNumber=4}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a4, portNumber=1}, dst=ConnectPoint{elementId=of:00000000000000a2, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.60.1/32}, IPV4_DST{ip=192.168.60.101/32}, IP_PROTO{protocol=6}, ETH_TYPE{ethType=800}, TCP_DST{tcpPort=179}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a4, portNumber=4}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a4, portNumber=1}, dst=ConnectPoint{elementId=of:00000000000000a2, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0xfffffffff33e39a0",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.40.101/32}, IPV4_DST{ip=192.168.40.1/32}, IP_PROTO{protocol=6}, ETH_TYPE{ethType=800}, TCP_DST{tcpPort=179}]",
-      "ingress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a6",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0xffffffffda3dd5b2",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a5, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a5, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a6, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a6, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.40.101/32}, IPV4_DST{ip=192.168.40.1/32}, IP_PROTO{protocol=6}, ETH_TYPE{ethType=800}, TCP_DST{tcpPort=179}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a5, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a5, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a6, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a6, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0xffffffff8ce60db9",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.20.101/32}, IPV4_DST{ip=192.168.20.1/32}, IP_PROTO{protocol=6}, TCP_SRC{tcpPort=179}, ETH_TYPE{ethType=800}]",
-      "ingress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a5",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0xfeca8b9",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a5, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a5, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.20.101/32}, IPV4_DST{ip=192.168.20.1/32}, IP_PROTO{protocol=6}, TCP_SRC{tcpPort=179}, ETH_TYPE{ethType=800}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a5, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a5, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0x3124d881",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.40.1/32}, IPV4_DST{ip=192.168.40.101/32}, IP_PROTO{protocol=1}, ETH_TYPE{ethType=800}]",
-      "ingress":{  
-         "device":"of:00000000000000a6",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0x40241a59",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a6, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a6, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a4, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a4, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.40.1/32}, IPV4_DST{ip=192.168.40.101/32}, IP_PROTO{protocol=1}, ETH_TYPE{ethType=800}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a6, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a6, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a4, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a4, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0xffffffffd141fa26",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.30.1/32}, IPV4_DST{ip=192.168.30.101/32}, IP_PROTO{protocol=6}, ETH_TYPE{ethType=800}, TCP_DST{tcpPort=179}]",
-      "ingress":{  
-         "device":"of:00000000000000a2",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0x3018359e",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a2, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.30.1/32}, IPV4_DST{ip=192.168.30.101/32}, IP_PROTO{protocol=6}, ETH_TYPE{ethType=800}, TCP_DST{tcpPort=179}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a2, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0xffffffffaee2a38a",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.30.101/32}, IPV4_DST{ip=192.168.30.1/32}, IP_PROTO{protocol=6}, TCP_SRC{tcpPort=179}, ETH_TYPE{ethType=800}]",
-      "ingress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a2",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0x658af442",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a2, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.30.101/32}, IPV4_DST{ip=192.168.30.1/32}, IP_PROTO{protocol=6}, TCP_SRC{tcpPort=179}, ETH_TYPE{ethType=800}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a2, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0xffffffffaf46b62f",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.20.1/32}, IPV4_DST{ip=192.168.20.101/32}, IP_PROTO{protocol=6}, ETH_TYPE{ethType=800}, TCP_DST{tcpPort=179}]",
-      "ingress":{  
-         "device":"of:00000000000000a5",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0x7a92607b",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a5, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a5, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.20.1/32}, IPV4_DST{ip=192.168.20.101/32}, IP_PROTO{protocol=6}, ETH_TYPE{ethType=800}, TCP_DST{tcpPort=179}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a5, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a5, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0xffffffff8d484b21",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.10.101/32}, IPV4_DST{ip=192.168.10.1/32}, IP_PROTO{protocol=6}, ETH_TYPE{ethType=800}, TCP_DST{tcpPort=179}]",
-      "ingress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a3",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0xffffffffe8c0c42f",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a3, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.10.101/32}, IPV4_DST{ip=192.168.10.1/32}, IP_PROTO{protocol=6}, ETH_TYPE{ethType=800}, TCP_DST{tcpPort=179}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a3, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0xffffffffed295f82",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.20.101/32}, IPV4_DST{ip=192.168.20.1/32}, IP_PROTO{protocol=1}, ETH_TYPE{ethType=800}]",
-      "ingress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a5",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0x28379d0",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a5, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a5, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.20.101/32}, IPV4_DST{ip=192.168.20.1/32}, IP_PROTO{protocol=1}, ETH_TYPE{ethType=800}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a5, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a5, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },  
-   {  
-      "id":"0xffffffffdba23bce",
-      "type":"MultiPointToSinglePointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_DST{ip=172.16.30.0/24}, ETH_TYPE{ethType=800}]",
-      "treatment":"[ETH_DST{mac=00:00:00:00:03:01}]",
-      "ingress":[  
-         {  
-            "device":"of:00000000000000a3",
-            "port":"1"
-         },
-         {  
-            "device":"of:00000000000000a4",
-            "port":"4"
-         },
-         {  
-            "device":"of:00000000000000a6",
-            "port":"1"
-         },
-         {  
-            "device":"of:00000000000000a5",
-            "port":"1"
-         }
-      ],
-      "egress":{  
-         "device":"of:00000000000000a2",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0x5e70036",
-            "type":"LinkCollectionIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a4, portNumber=1}, dst=ConnectPoint{elementId=of:00000000000000a2, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a5, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a6, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a4, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a4, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_DST{ip=172.16.30.0/24}, ETH_TYPE{ethType=800}]",
-            "treatment":"[ETH_DST{mac=00:00:00:00:03:01}]",
-            "links":[  
-               {  
-                  "src":{  
-                     "device":"of:00000000000000a4",
-                     "port":"1"
-                  },
-                  "dst":{  
-                     "device":"of:00000000000000a2",
-                     "port":"3"
-                  },
-                  "type":"DIRECT",
-                  "state":"ACTIVE",
-                  "annotations":{  
-
-                  }
-               },
-               {  
-                  "src":{  
-                     "device":"of:00000000000000a5",
-                     "port":"2"
-                  },
-                  "dst":{  
-                     "device":"of:00000000000000a3",
-                     "port":"4"
-                  },
-                  "type":"DIRECT",
-                  "state":"ACTIVE",
-                  "annotations":{  
-
-                  }
-               },
-               {  
-                  "src":{  
-                     "device":"of:00000000000000a6",
-                     "port":"3"
-                  },
-                  "dst":{  
-                     "device":"of:00000000000000a4",
-                     "port":"3"
-                  },
-                  "type":"DIRECT",
-                  "state":"ACTIVE",
-                  "annotations":{  
-
-                  }
-               },
-               {  
-                  "src":{  
-                     "device":"of:00000000000000a3",
-                     "port":"3"
-                  },
-                  "dst":{  
-                     "device":"of:00000000000000a4",
-                     "port":"2"
-                  },
-                  "type":"DIRECT",
-                  "state":"ACTIVE",
-                  "annotations":{  
-
-                  }
-               }
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0xffffffffaf44f3b7",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.20.101/32}, IPV4_DST{ip=192.168.20.1/32}, IP_PROTO{protocol=6}, ETH_TYPE{ethType=800}, TCP_DST{tcpPort=179}]",
-      "ingress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a5",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0xffffffffd73a0afb",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a5, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a5, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.20.101/32}, IPV4_DST{ip=192.168.20.1/32}, IP_PROTO{protocol=6}, ETH_TYPE{ethType=800}, TCP_DST{tcpPort=179}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a5, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a5, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0x751d3d2e",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.60.1/32}, IPV4_DST{ip=192.168.60.101/32}, IP_PROTO{protocol=1}, ETH_TYPE{ethType=800}]",
-      "ingress":{  
-         "device":"of:00000000000000a4",
-         "port":"4"
-      },
-      "egress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0xffffffffc4847e9e",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a4, portNumber=4}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a4, portNumber=1}, dst=ConnectPoint{elementId=of:00000000000000a2, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.60.1/32}, IPV4_DST{ip=192.168.60.101/32}, IP_PROTO{protocol=1}, ETH_TYPE{ethType=800}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a4, portNumber=4}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a4, portNumber=1}, dst=ConnectPoint{elementId=of:00000000000000a2, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0x3fb23806",
-      "type":"MultiPointToSinglePointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_DST{ip=2.0.0.0/24}, ETH_TYPE{ethType=800}]",
-      "treatment":"[ETH_DST{mac=00:00:00:00:03:01}]",
-      "ingress":[  
-         {  
-            "device":"of:00000000000000a3",
-            "port":"1"
-         },
-         {  
-            "device":"of:00000000000000a4",
-            "port":"4"
-         },
-         {  
-            "device":"of:00000000000000a6",
-            "port":"1"
-         },
-         {  
-            "device":"of:00000000000000a5",
-            "port":"1"
-         }
-      ],
-      "egress":{  
-         "device":"of:00000000000000a2",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0x23d68afe",
-            "type":"LinkCollectionIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a4, portNumber=1}, dst=ConnectPoint{elementId=of:00000000000000a2, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a5, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a6, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a4, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a4, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_DST{ip=2.0.0.0/24}, ETH_TYPE{ethType=800}]",
-            "treatment":"[ETH_DST{mac=00:00:00:00:03:01}]",
-            "links":[  
-               {  
-                  "src":{  
-                     "device":"of:00000000000000a4",
-                     "port":"1"
-                  },
-                  "dst":{  
-                     "device":"of:00000000000000a2",
-                     "port":"3"
-                  },
-                  "type":"DIRECT",
-                  "state":"ACTIVE",
-                  "annotations":{  
-
-                  }
-               },
-               {  
-                  "src":{  
-                     "device":"of:00000000000000a5",
-                     "port":"2"
-                  },
-                  "dst":{  
-                     "device":"of:00000000000000a3",
-                     "port":"4"
-                  },
-                  "type":"DIRECT",
-                  "state":"ACTIVE",
-                  "annotations":{  
-
-                  }
-               },
-               {  
-                  "src":{  
-                     "device":"of:00000000000000a6",
-                     "port":"3"
-                  },
-                  "dst":{  
-                     "device":"of:00000000000000a4",
-                     "port":"3"
-                  },
-                  "type":"DIRECT",
-                  "state":"ACTIVE",
-                  "annotations":{  
-
-                  }
-               },
-               {  
-                  "src":{  
-                     "device":"of:00000000000000a3",
-                     "port":"3"
-                  },
-                  "dst":{  
-                     "device":"of:00000000000000a4",
-                     "port":"2"
-                  },
-                  "type":"DIRECT",
-                  "state":"ACTIVE",
-                  "annotations":{  
-
-                  }
-               }
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0x751be06e",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.60.101/32}, IPV4_DST{ip=192.168.60.1/32}, IP_PROTO{protocol=1}, ETH_TYPE{ethType=800}]",
-      "ingress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a4",
-         "port":"4"
-      },
-      "installable":[  
-         {  
-            "id":"0xffffffff85bf43de",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a2, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a4, portNumber=1}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a4, portNumber=4}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.60.101/32}, IPV4_DST{ip=192.168.60.1/32}, IP_PROTO{protocol=1}, ETH_TYPE{ethType=800}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a2, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a4, portNumber=1}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a4, portNumber=4}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0x6aea465f",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.10.1/32}, IPV4_DST{ip=192.168.10.101/32}, IP_PROTO{protocol=6}, TCP_SRC{tcpPort=179}, ETH_TYPE{ethType=800}]",
-      "ingress":{  
-         "device":"of:00000000000000a3",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0x27f32021",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a3, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.10.1/32}, IPV4_DST{ip=192.168.10.101/32}, IP_PROTO{protocol=6}, TCP_SRC{tcpPort=179}, ETH_TYPE{ethType=800}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a3, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0xf25f553",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.30.101/32}, IPV4_DST{ip=192.168.30.1/32}, IP_PROTO{protocol=1}, ETH_TYPE{ethType=800}]",
-      "ingress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a2",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0x5821c559",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a2, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.30.101/32}, IPV4_DST{ip=192.168.30.1/32}, IP_PROTO{protocol=1}, ETH_TYPE{ethType=800}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a2, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0xfffffffff3406cb6",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.40.1/32}, IPV4_DST{ip=192.168.40.101/32}, IP_PROTO{protocol=6}, ETH_TYPE{ethType=800}, TCP_DST{tcpPort=179}]",
-      "ingress":{  
-         "device":"of:00000000000000a6",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0x14daab84",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a6, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a6, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a4, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a4, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.40.1/32}, IPV4_DST{ip=192.168.40.101/32}, IP_PROTO{protocol=6}, ETH_TYPE{ethType=800}, TCP_DST{tcpPort=179}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a6, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a6, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a4, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a4, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0xffffffffd7d10b27",
-      "type":"MultiPointToSinglePointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_DST{ip=1.0.0.0/24}, ETH_TYPE{ethType=800}]",
-      "treatment":"[ETH_DST{mac=00:00:00:00:03:01}]",
-      "ingress":[  
-         {  
-            "device":"of:00000000000000a3",
-            "port":"1"
-         },
-         {  
-            "device":"of:00000000000000a4",
-            "port":"4"
-         },
-         {  
-            "device":"of:00000000000000a6",
-            "port":"1"
-         },
-         {  
-            "device":"of:00000000000000a5",
-            "port":"1"
-         }
-      ],
-      "egress":{  
-         "device":"of:00000000000000a2",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0xffffffff8f921bfd",
-            "type":"LinkCollectionIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a4, portNumber=1}, dst=ConnectPoint{elementId=of:00000000000000a2, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a5, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a6, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a4, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a4, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_DST{ip=1.0.0.0/24}, ETH_TYPE{ethType=800}]",
-            "treatment":"[ETH_DST{mac=00:00:00:00:03:01}]",
-            "links":[  
-               {  
-                  "src":{  
-                     "device":"of:00000000000000a4",
-                     "port":"1"
-                  },
-                  "dst":{  
-                     "device":"of:00000000000000a2",
-                     "port":"3"
-                  },
-                  "type":"DIRECT",
-                  "state":"ACTIVE",
-                  "annotations":{  
-
-                  }
-               },
-               {  
-                  "src":{  
-                     "device":"of:00000000000000a5",
-                     "port":"2"
-                  },
-                  "dst":{  
-                     "device":"of:00000000000000a3",
-                     "port":"4"
-                  },
-                  "type":"DIRECT",
-                  "state":"ACTIVE",
-                  "annotations":{  
-
-                  }
-               },
-               {  
-                  "src":{  
-                     "device":"of:00000000000000a6",
-                     "port":"3"
-                  },
-                  "dst":{  
-                     "device":"of:00000000000000a4",
-                     "port":"3"
-                  },
-                  "type":"DIRECT",
-                  "state":"ACTIVE",
-                  "annotations":{  
-
-                  }
-               },
-               {  
-                  "src":{  
-                     "device":"of:00000000000000a3",
-                     "port":"3"
-                  },
-                  "dst":{  
-                     "device":"of:00000000000000a4",
-                     "port":"2"
-                  },
-                  "type":"DIRECT",
-                  "state":"ACTIVE",
-                  "annotations":{  
-
-                  }
-               }
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0xffffffffa79364e5",
-      "type":"MultiPointToSinglePointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_DST{ip=3.0.0.0/24}, ETH_TYPE{ethType=800}]",
-      "treatment":"[ETH_DST{mac=00:00:00:00:03:01}]",
-      "ingress":[  
-         {  
-            "device":"of:00000000000000a3",
-            "port":"1"
-         },
-         {  
-            "device":"of:00000000000000a4",
-            "port":"4"
-         },
-         {  
-            "device":"of:00000000000000a6",
-            "port":"1"
-         },
-         {  
-            "device":"of:00000000000000a5",
-            "port":"1"
-         }
-      ],
-      "egress":{  
-         "device":"of:00000000000000a2",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0xffffffffb81af9ff",
-            "type":"LinkCollectionIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a4, portNumber=1}, dst=ConnectPoint{elementId=of:00000000000000a2, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a5, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a6, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a4, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a4, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_DST{ip=3.0.0.0/24}, ETH_TYPE{ethType=800}]",
-            "treatment":"[ETH_DST{mac=00:00:00:00:03:01}]",
-            "links":[  
-               {  
-                  "src":{  
-                     "device":"of:00000000000000a4",
-                     "port":"1"
-                  },
-                  "dst":{  
-                     "device":"of:00000000000000a2",
-                     "port":"3"
-                  },
-                  "type":"DIRECT",
-                  "state":"ACTIVE",
-                  "annotations":{  
-
-                  }
-               },
-               {  
-                  "src":{  
-                     "device":"of:00000000000000a5",
-                     "port":"2"
-                  },
-                  "dst":{  
-                     "device":"of:00000000000000a3",
-                     "port":"4"
-                  },
-                  "type":"DIRECT",
-                  "state":"ACTIVE",
-                  "annotations":{  
-
-                  }
-               },
-               {  
-                  "src":{  
-                     "device":"of:00000000000000a6",
-                     "port":"3"
-                  },
-                  "dst":{  
-                     "device":"of:00000000000000a4",
-                     "port":"3"
-                  },
-                  "type":"DIRECT",
-                  "state":"ACTIVE",
-                  "annotations":{  
-
-                  }
-               },
-               {  
-                  "src":{  
-                     "device":"of:00000000000000a3",
-                     "port":"3"
-                  },
-                  "dst":{  
-                     "device":"of:00000000000000a4",
-                     "port":"2"
-                  },
-                  "type":"DIRECT",
-                  "state":"ACTIVE",
-                  "annotations":{  
-
-                  }
-               }
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0x14d9eb65",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.60.1/32}, IPV4_DST{ip=192.168.60.101/32}, IP_PROTO{protocol=6}, TCP_SRC{tcpPort=179}, ETH_TYPE{ethType=800}]",
-      "ingress":{  
-         "device":"of:00000000000000a4",
-         "port":"4"
-      },
-      "egress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0xffffffffd1edad87",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a4, portNumber=4}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a4, portNumber=1}, dst=ConnectPoint{elementId=of:00000000000000a2, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.60.1/32}, IPV4_DST{ip=192.168.60.101/32}, IP_PROTO{protocol=6}, TCP_SRC{tcpPort=179}, ETH_TYPE{ethType=800}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a4, portNumber=4}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a4, portNumber=1}, dst=ConnectPoint{elementId=of:00000000000000a2, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, dst=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a1, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0x14d88ea5",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.60.101/32}, IPV4_DST{ip=192.168.60.1/32}, IP_PROTO{protocol=6}, TCP_SRC{tcpPort=179}, ETH_TYPE{ethType=800}]",
-      "ingress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a4",
-         "port":"4"
-      },
-      "installable":[  
-         {  
-            "id":"0xffffffff932872c7",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a2, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a4, portNumber=1}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a4, portNumber=4}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.60.101/32}, IPV4_DST{ip=192.168.60.1/32}, IP_PROTO{protocol=6}, TCP_SRC{tcpPort=179}, ETH_TYPE{ethType=800}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a2, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a2, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a4, portNumber=1}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a4, portNumber=4}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   },
-   {  
-      "id":"0xffffffffd0df53a2",
-      "type":"PointToPointIntent",
-      "appId":"org.onlab.onos.sdnip",
-      "state":"INSTALLED",
-      "selector":"[IPV4_SRC{ip=192.168.40.101/32}, IPV4_DST{ip=192.168.40.1/32}, IP_PROTO{protocol=6}, TCP_SRC{tcpPort=179}, ETH_TYPE{ethType=800}]",
-      "ingress":{  
-         "device":"of:00000000000000a1",
-         "port":"1"
-      },
-      "egress":{  
-         "device":"of:00000000000000a6",
-         "port":"1"
-      },
-      "installable":[  
-         {  
-            "id":"0x12f07370",
-            "type":"PathIntent",
-            "appId":"org.onlab.onos.sdnip",
-            "resources":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a5, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a5, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a6, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a6, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ],
-            "selector":"[IPV4_SRC{ip=192.168.40.101/32}, IPV4_DST{ip=192.168.40.1/32}, IP_PROTO{protocol=6}, TCP_SRC{tcpPort=179}, ETH_TYPE{ethType=800}]",
-            "path":[  
-               "DefaultEdgeLink{src=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, dst=HostLocation{elementId=of:00000000000000a1, portNumber=1}, type=EDGE, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a1, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a3, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a3, portNumber=4}, dst=ConnectPoint{elementId=of:00000000000000a5, portNumber=2}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultLink{src=ConnectPoint{elementId=of:00000000000000a5, portNumber=3}, dst=ConnectPoint{elementId=of:00000000000000a6, portNumber=4}, type=DIRECT, state=ACTIVE, durable=false}",
-               "DefaultEdgeLink{src=HostLocation{elementId=of:00000000000000a6, portNumber=1}, dst=ConnectPoint{elementId=00:00:00:00:00:00/-1, portNumber=0}, type=EDGE, state=ACTIVE, durable=false}"
-            ]
-         }
-      ]
-   }
-]
\ No newline at end of file
diff --git a/TestON/tests/PeeringRouter/sdnip.json b/TestON/tests/PeeringRouter/sdnip.json
deleted file mode 100644
index cc4ed7d..0000000
--- a/TestON/tests/PeeringRouter/sdnip.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-   
-    "bgpPeers" : [
-		{
-		    "attachmentDpid" : "00:00:00:00:00:00:00:a1",
-		    "attachmentPort" : "1",
-		    "ipAddress" : "192.168.10.1"
-		},
-		{
-		    "attachmentDpid" : "00:00:00:00:00:00:00:a1",
-		    "attachmentPort" : "2",
-		    "ipAddress" : "192.168.20.1"
-		},
-		{
-		    "attachmentDpid" : "00:00:00:00:00:00:00:a1",
-		    "attachmentPort" : "3",
-		    "ipAddress" : "192.168.30.1"
-		},
-		{
-		    "attachmentDpid" : "00:00:00:00:00:00:00:a1",
-		    "attachmentPort" : "4",
-		    "ipAddress" : "192.168.60.2"
-		}
-
-    ],
-    "bgpSpeakers" : [
-	    {
-	    	 "name" : "bgpSpeaker1",
-	    	 "attachmentDpid" : "00:00:00:00:00:00:00:a2",
-	         "attachmentPort" : "1",
-	         "macAddress" : "00:00:00:00:00:02",
-	         "interfaceAddresses" : [
-				{
-				    "interfaceDpid" : "00:00:00:00:00:00:00:a1",
-		  		    "interfacePort" : "1",
-				    "ipAddress" : "192.168.10.101"
-				},
-				{
-				    "interfaceDpid" : "00:00:00:00:00:00:00:a1",
-		       		    "interfacePort" : "2",
-				    "ipAddress" : "192.168.20.101"
-				},
-				{
-				    "interfaceDpid" : "00:00:00:00:00:00:00:a1",
-		       		    "interfacePort" : "3",
-				    "ipAddress" : "192.168.30.101"
-				},
-				{
-				    "interfaceDpid" : "00:00:00:00:00:00:00:a1",
-		       		    "interfacePort" : "4",
-				    "ipAddress" : "192.168.60.101"
-				}
-		
-		    ]
-	         
-	    }
-   	
-    ]
-}
diff --git a/TestON/tests/PeeringRouter/topology/quagga-as6-rs.conf b/TestON/tests/PeeringRouter/topology/quagga-as6-rs.conf
deleted file mode 100644
index 1eac0dd..0000000
--- a/TestON/tests/PeeringRouter/topology/quagga-as6-rs.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-! -*- bgp -*-
-!
-! BGPd sample configuratin file
-!
-! $Id: bgpd.conf.sample,v 1.1 2002/12/13 20:15:29 paul Exp $
-!
-hostname bgpd
-password hello
-!enable password please-set-at-here
-!
-!bgp mulitple-instance
-!
-router bgp 64520
-  bgp router-id 192.168.60.1
-  neighbor 192.168.60.101 remote-as 64513
-  neighbor 192.168.60.101 route-server-client
-  neighbor 192.168.60.2 remote-as 64521 
-  neighbor 192.168.60.2 route-server-client
-! network 172.16.60.0/24
-! neighbor 10.0.0.2 route-map set-nexthop out
-! neighbor 10.0.0.2 ebgp-multihop
-! neighbor 10.0.0.2 next-hop-self
-!
-! access-list all permit any
-!
-!route-map set-nexthop permit 10
-! match ip address all
-! set ip next-hop 10.0.0.1
-!
-!log file /usr/local/var/log/quagga/bgpd.log
-!
-log stdout
diff --git a/TestON/tests/PeeringRouter/topology/quagga-as6.conf b/TestON/tests/PeeringRouter/topology/quagga-as6.conf
deleted file mode 100644
index 434f983..0000000
--- a/TestON/tests/PeeringRouter/topology/quagga-as6.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-! -*- bgp -*-
-!
-! BGPd sample configuratin file
-!
-! $Id: bgpd.conf.sample,v 1.1 2002/12/13 20:15:29 paul Exp $
-!
-hostname bgpd
-password hello
-!enable password please-set-at-here
-!
-!bgp mulitple-instance
-!
-router bgp 64521
-  bgp router-id 192.168.60.2
-  neighbor 192.168.60.101 remote-as 64513
-! neighbor 192.168.60.1 remote-as 64520
-! neighbor 192.168.60.3 remote-as 64520
-!  network 172.16.60.0/24
-!  network 172.16.70.4/30
- ! network 172.16.70.8/30
- ! network 172.16.70.12/30
- ! network 172.16.70.16/30
- ! network 172.16.70.20/30
- ! network 172.16.70.24/30
- ! network 172.16.70.28/30
- ! network 172.16.70.32/30
-! neighbor 10.0.0.2 route-map set-nexthop out
-! neighbor 10.0.0.2 ebgp-multihop
-! neighbor 10.0.0.2 next-hop-self
-!
-! access-list all permit any
-!
-!route-map set-nexthop permit 10
-! match ip address all
-! set ip next-hop 10.0.0.1
-!
-!log file /usr/local/var/log/quagga/bgpd.log
-!
-log stdout
diff --git a/TestON/tests/PeeringRouter/topology/quagga-sdn-modified.conf b/TestON/tests/PeeringRouter/topology/quagga-sdn-modified.conf
deleted file mode 100644
index d334c2a..0000000
--- a/TestON/tests/PeeringRouter/topology/quagga-sdn-modified.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-! -*- bgp -*-
-!
-! BGPd sample configuratin file
-!
-! $Id: bgpd.conf.sample,v 1.1 2002/12/13 20:15:29 paul Exp $
-!
-hostname bgpd
-password hello
-!enable password please-set-at-here
-!
-!bgp mulitple-instance
-!
-route-map AS65000 permit 1
-  set as-path prepend 65000
-!
-router bgp 64513
-  bgp router-id 192.168.10.101
-  timers bgp 1 3
-  !timers bgp 3 9 
-  neighbor 192.168.10.1 remote-as 64514
-  neighbor 192.168.10.1 ebgp-multihop
-  neighbor 192.168.10.1 timers connect 5
-  neighbor 192.168.20.1 remote-as 64514
-  neighbor 192.168.20.1 ebgp-multihop
-  neighbor 192.168.20.1 timers connect 5
-  neighbor 192.168.20.1 route-map AS65000 in
-  neighbor 192.168.30.1 remote-as 64516
-  neighbor 192.168.30.1 ebgp-multihop
-  neighbor 192.168.30.1 timers connect 5
-  neighbor 192.168.60.2 remote-as 64521
-  neighbor 192.168.60.2 ebgp-multihop
-  neighbor 192.168.60.2 timers connect 5
-  neighbor 1.1.1.2 remote-as 64513
-  neighbor 1.1.1.2 port 2000
-  neighbor 1.1.1.2 timers connect 5
-
-
-
-  network 172.16.10.0/24
-!
-! access-list all permit any
-!
-!route-map set-nexthop permit 10
-! match ip address all
-! set ip next-hop 10.0.0.1
-!
-!log file /usr/local/var/log/quagga/bgpd.log
-!
-log stdout
diff --git a/TestON/tests/PeeringRouter/topology/quagga-sdn.conf b/TestON/tests/PeeringRouter/topology/quagga-sdn.conf
deleted file mode 100644
index 77392a6..0000000
--- a/TestON/tests/PeeringRouter/topology/quagga-sdn.conf
+++ /dev/null
@@ -1,349 +0,0 @@
-! -*- bgp -*-
-!
-! BGPd sample configuratin file
-!
-! $Id: bgpd.conf.sample,v 1.1 2002/12/13 20:15:29 paul Exp $
-!
-hostname bgpd
-password hello
-!enable password please-set-at-here
-!
-!bgp mulitple-instance
-!
-route-map AS65000 permit 1
-  set as-path prepend 65000
-!
-router bgp 64513
-  bgp router-id 192.168.10.101
-  timers bgp 1 3
-  !timers bgp 3 9 
-  neighbor 192.168.10.1 remote-as 64514
-  neighbor 192.168.10.1 ebgp-multihop
-  neighbor 192.168.10.1 timers connect 5
-  neighbor 192.168.20.1 remote-as 64514
-  neighbor 192.168.20.1 ebgp-multihop
-  neighbor 192.168.20.1 timers connect 5
-  neighbor 192.168.20.1 route-map AS65000 in
-  neighbor 192.168.30.1 remote-as 64516
-  neighbor 192.168.30.1 ebgp-multihop
-  neighbor 192.168.30.1 timers connect 5
-  neighbor 192.168.60.1 remote-as 64520
-  neighbor 192.168.60.1 ebgp-multihop
-  neighbor 192.168.60.1 timers connect 5
-  neighbor 1.1.1.2 remote-as 64513
-  neighbor 1.1.1.2 port 2000
-  neighbor 1.1.1.2 timers connect 5
-
-
-neighbor 192.168.40.1 remote-as 65001
-neighbor 192.168.40.1 ebgp-multihop
-neighbor 192.168.40.1 timers connect 10
-neighbor 192.168.40.2 remote-as 65002
-neighbor 192.168.40.2 ebgp-multihop
-neighbor 192.168.40.2 timers connect 10
-neighbor 192.168.40.3 remote-as 65003
-neighbor 192.168.40.3 ebgp-multihop
-neighbor 192.168.40.3 timers connect 10
-neighbor 192.168.40.4 remote-as 65004
-neighbor 192.168.40.4 ebgp-multihop
-neighbor 192.168.40.4 timers connect 10
-neighbor 192.168.40.5 remote-as 65005
-neighbor 192.168.40.5 ebgp-multihop
-neighbor 192.168.40.5 timers connect 10
-neighbor 192.168.40.6 remote-as 65006
-neighbor 192.168.40.6 ebgp-multihop
-neighbor 192.168.40.6 timers connect 10
-neighbor 192.168.40.7 remote-as 65007
-neighbor 192.168.40.7 ebgp-multihop
-neighbor 192.168.40.7 timers connect 10
-neighbor 192.168.40.8 remote-as 65008
-neighbor 192.168.40.8 ebgp-multihop
-neighbor 192.168.40.8 timers connect 10
-neighbor 192.168.40.9 remote-as 65009
-neighbor 192.168.40.9 ebgp-multihop
-neighbor 192.168.40.9 timers connect 10
-neighbor 192.168.40.10 remote-as 65010
-neighbor 192.168.40.10 ebgp-multihop
-neighbor 192.168.40.10 timers connect 10
-neighbor 192.168.40.11 remote-as 65011
-neighbor 192.168.40.11 ebgp-multihop
-neighbor 192.168.40.11 timers connect 10
-neighbor 192.168.40.12 remote-as 65012
-neighbor 192.168.40.12 ebgp-multihop
-neighbor 192.168.40.12 timers connect 10
-neighbor 192.168.40.13 remote-as 65013
-neighbor 192.168.40.13 ebgp-multihop
-neighbor 192.168.40.13 timers connect 10
-neighbor 192.168.40.14 remote-as 65014
-neighbor 192.168.40.14 ebgp-multihop
-neighbor 192.168.40.14 timers connect 10
-neighbor 192.168.40.15 remote-as 65015
-neighbor 192.168.40.15 ebgp-multihop
-neighbor 192.168.40.15 timers connect 10
-neighbor 192.168.40.16 remote-as 65016
-neighbor 192.168.40.16 ebgp-multihop
-neighbor 192.168.40.16 timers connect 10
-neighbor 192.168.40.17 remote-as 65017
-neighbor 192.168.40.17 ebgp-multihop
-neighbor 192.168.40.17 timers connect 10
-neighbor 192.168.40.18 remote-as 65018
-neighbor 192.168.40.18 ebgp-multihop
-neighbor 192.168.40.18 timers connect 10
-neighbor 192.168.40.19 remote-as 65019
-neighbor 192.168.40.19 ebgp-multihop
-neighbor 192.168.40.19 timers connect 10
-neighbor 192.168.40.20 remote-as 65020
-neighbor 192.168.40.20 ebgp-multihop
-neighbor 192.168.40.20 timers connect 10
-neighbor 192.168.40.21 remote-as 65021
-neighbor 192.168.40.21 ebgp-multihop
-neighbor 192.168.40.21 timers connect 10
-neighbor 192.168.40.22 remote-as 65022
-neighbor 192.168.40.22 ebgp-multihop
-neighbor 192.168.40.22 timers connect 10
-neighbor 192.168.40.23 remote-as 65023
-neighbor 192.168.40.23 ebgp-multihop
-neighbor 192.168.40.23 timers connect 10
-neighbor 192.168.40.24 remote-as 65024
-neighbor 192.168.40.24 ebgp-multihop
-neighbor 192.168.40.24 timers connect 10
-neighbor 192.168.40.25 remote-as 65025
-neighbor 192.168.40.25 ebgp-multihop
-neighbor 192.168.40.25 timers connect 10
-neighbor 192.168.40.26 remote-as 65026
-neighbor 192.168.40.26 ebgp-multihop
-neighbor 192.168.40.26 timers connect 10
-neighbor 192.168.40.27 remote-as 65027
-neighbor 192.168.40.27 ebgp-multihop
-neighbor 192.168.40.27 timers connect 10
-neighbor 192.168.40.28 remote-as 65028
-neighbor 192.168.40.28 ebgp-multihop
-neighbor 192.168.40.28 timers connect 10
-neighbor 192.168.40.29 remote-as 65029
-neighbor 192.168.40.29 ebgp-multihop
-neighbor 192.168.40.29 timers connect 10
-neighbor 192.168.40.30 remote-as 65030
-neighbor 192.168.40.30 ebgp-multihop
-neighbor 192.168.40.30 timers connect 10
-neighbor 192.168.40.31 remote-as 65031
-neighbor 192.168.40.31 ebgp-multihop
-neighbor 192.168.40.31 timers connect 10
-neighbor 192.168.40.32 remote-as 65032
-neighbor 192.168.40.32 ebgp-multihop
-neighbor 192.168.40.32 timers connect 10
-neighbor 192.168.40.33 remote-as 65033
-neighbor 192.168.40.33 ebgp-multihop
-neighbor 192.168.40.33 timers connect 10
-neighbor 192.168.40.34 remote-as 65034
-neighbor 192.168.40.34 ebgp-multihop
-neighbor 192.168.40.34 timers connect 10
-neighbor 192.168.40.35 remote-as 65035
-neighbor 192.168.40.35 ebgp-multihop
-neighbor 192.168.40.35 timers connect 10
-neighbor 192.168.40.36 remote-as 65036
-neighbor 192.168.40.36 ebgp-multihop
-neighbor 192.168.40.36 timers connect 10
-neighbor 192.168.40.37 remote-as 65037
-neighbor 192.168.40.37 ebgp-multihop
-neighbor 192.168.40.37 timers connect 10
-neighbor 192.168.40.38 remote-as 65038
-neighbor 192.168.40.38 ebgp-multihop
-neighbor 192.168.40.38 timers connect 10
-neighbor 192.168.40.39 remote-as 65039
-neighbor 192.168.40.39 ebgp-multihop
-neighbor 192.168.40.39 timers connect 10
-neighbor 192.168.40.40 remote-as 65040
-neighbor 192.168.40.40 ebgp-multihop
-neighbor 192.168.40.40 timers connect 10
-neighbor 192.168.40.41 remote-as 65041
-neighbor 192.168.40.41 ebgp-multihop
-neighbor 192.168.40.41 timers connect 10
-neighbor 192.168.40.42 remote-as 65042
-neighbor 192.168.40.42 ebgp-multihop
-neighbor 192.168.40.42 timers connect 10
-neighbor 192.168.40.43 remote-as 65043
-neighbor 192.168.40.43 ebgp-multihop
-neighbor 192.168.40.43 timers connect 10
-neighbor 192.168.40.44 remote-as 65044
-neighbor 192.168.40.44 ebgp-multihop
-neighbor 192.168.40.44 timers connect 10
-neighbor 192.168.40.45 remote-as 65045
-neighbor 192.168.40.45 ebgp-multihop
-neighbor 192.168.40.45 timers connect 10
-neighbor 192.168.40.46 remote-as 65046
-neighbor 192.168.40.46 ebgp-multihop
-neighbor 192.168.40.46 timers connect 10
-neighbor 192.168.40.47 remote-as 65047
-neighbor 192.168.40.47 ebgp-multihop
-neighbor 192.168.40.47 timers connect 10
-neighbor 192.168.40.48 remote-as 65048
-neighbor 192.168.40.48 ebgp-multihop
-neighbor 192.168.40.48 timers connect 10
-neighbor 192.168.40.49 remote-as 65049
-neighbor 192.168.40.49 ebgp-multihop
-neighbor 192.168.40.49 timers connect 10
-neighbor 192.168.40.50 remote-as 65050
-neighbor 192.168.40.50 ebgp-multihop
-neighbor 192.168.40.50 timers connect 10
-neighbor 192.168.40.51 remote-as 65051
-neighbor 192.168.40.51 ebgp-multihop
-neighbor 192.168.40.51 timers connect 10
-neighbor 192.168.40.52 remote-as 65052
-neighbor 192.168.40.52 ebgp-multihop
-neighbor 192.168.40.52 timers connect 10
-neighbor 192.168.40.53 remote-as 65053
-neighbor 192.168.40.53 ebgp-multihop
-neighbor 192.168.40.53 timers connect 10
-neighbor 192.168.40.54 remote-as 65054
-neighbor 192.168.40.54 ebgp-multihop
-neighbor 192.168.40.54 timers connect 10
-neighbor 192.168.40.55 remote-as 65055
-neighbor 192.168.40.55 ebgp-multihop
-neighbor 192.168.40.55 timers connect 10
-neighbor 192.168.40.56 remote-as 65056
-neighbor 192.168.40.56 ebgp-multihop
-neighbor 192.168.40.56 timers connect 10
-neighbor 192.168.40.57 remote-as 65057
-neighbor 192.168.40.57 ebgp-multihop
-neighbor 192.168.40.57 timers connect 10
-neighbor 192.168.40.58 remote-as 65058
-neighbor 192.168.40.58 ebgp-multihop
-neighbor 192.168.40.58 timers connect 10
-neighbor 192.168.40.59 remote-as 65059
-neighbor 192.168.40.59 ebgp-multihop
-neighbor 192.168.40.59 timers connect 10
-neighbor 192.168.40.60 remote-as 65060
-neighbor 192.168.40.60 ebgp-multihop
-neighbor 192.168.40.60 timers connect 10
-neighbor 192.168.40.61 remote-as 65061
-neighbor 192.168.40.61 ebgp-multihop
-neighbor 192.168.40.61 timers connect 10
-neighbor 192.168.40.62 remote-as 65062
-neighbor 192.168.40.62 ebgp-multihop
-neighbor 192.168.40.62 timers connect 10
-neighbor 192.168.40.63 remote-as 65063
-neighbor 192.168.40.63 ebgp-multihop
-neighbor 192.168.40.63 timers connect 10
-neighbor 192.168.40.64 remote-as 65064
-neighbor 192.168.40.64 ebgp-multihop
-neighbor 192.168.40.64 timers connect 10
-neighbor 192.168.40.65 remote-as 65065
-neighbor 192.168.40.65 ebgp-multihop
-neighbor 192.168.40.65 timers connect 10
-neighbor 192.168.40.66 remote-as 65066
-neighbor 192.168.40.66 ebgp-multihop
-neighbor 192.168.40.66 timers connect 10
-neighbor 192.168.40.67 remote-as 65067
-neighbor 192.168.40.67 ebgp-multihop
-neighbor 192.168.40.67 timers connect 10
-neighbor 192.168.40.68 remote-as 65068
-neighbor 192.168.40.68 ebgp-multihop
-neighbor 192.168.40.68 timers connect 10
-neighbor 192.168.40.69 remote-as 65069
-neighbor 192.168.40.69 ebgp-multihop
-neighbor 192.168.40.69 timers connect 10
-neighbor 192.168.40.70 remote-as 65070
-neighbor 192.168.40.70 ebgp-multihop
-neighbor 192.168.40.70 timers connect 10
-neighbor 192.168.40.71 remote-as 65071
-neighbor 192.168.40.71 ebgp-multihop
-neighbor 192.168.40.71 timers connect 10
-neighbor 192.168.40.72 remote-as 65072
-neighbor 192.168.40.72 ebgp-multihop
-neighbor 192.168.40.72 timers connect 10
-neighbor 192.168.40.73 remote-as 65073
-neighbor 192.168.40.73 ebgp-multihop
-neighbor 192.168.40.73 timers connect 10
-neighbor 192.168.40.74 remote-as 65074
-neighbor 192.168.40.74 ebgp-multihop
-neighbor 192.168.40.74 timers connect 10
-neighbor 192.168.40.75 remote-as 65075
-neighbor 192.168.40.75 ebgp-multihop
-neighbor 192.168.40.75 timers connect 10
-neighbor 192.168.40.76 remote-as 65076
-neighbor 192.168.40.76 ebgp-multihop
-neighbor 192.168.40.76 timers connect 10
-neighbor 192.168.40.77 remote-as 65077
-neighbor 192.168.40.77 ebgp-multihop
-neighbor 192.168.40.77 timers connect 10
-neighbor 192.168.40.78 remote-as 65078
-neighbor 192.168.40.78 ebgp-multihop
-neighbor 192.168.40.78 timers connect 10
-neighbor 192.168.40.79 remote-as 65079
-neighbor 192.168.40.79 ebgp-multihop
-neighbor 192.168.40.79 timers connect 10
-neighbor 192.168.40.80 remote-as 65080
-neighbor 192.168.40.80 ebgp-multihop
-neighbor 192.168.40.80 timers connect 10
-neighbor 192.168.40.81 remote-as 65081
-neighbor 192.168.40.81 ebgp-multihop
-neighbor 192.168.40.81 timers connect 10
-neighbor 192.168.40.82 remote-as 65082
-neighbor 192.168.40.82 ebgp-multihop
-neighbor 192.168.40.82 timers connect 10
-neighbor 192.168.40.83 remote-as 65083
-neighbor 192.168.40.83 ebgp-multihop
-neighbor 192.168.40.83 timers connect 10
-neighbor 192.168.40.84 remote-as 65084
-neighbor 192.168.40.84 ebgp-multihop
-neighbor 192.168.40.84 timers connect 10
-neighbor 192.168.40.85 remote-as 65085
-neighbor 192.168.40.85 ebgp-multihop
-neighbor 192.168.40.85 timers connect 10
-neighbor 192.168.40.86 remote-as 65086
-neighbor 192.168.40.86 ebgp-multihop
-neighbor 192.168.40.86 timers connect 10
-neighbor 192.168.40.87 remote-as 65087
-neighbor 192.168.40.87 ebgp-multihop
-neighbor 192.168.40.87 timers connect 10
-neighbor 192.168.40.88 remote-as 65088
-neighbor 192.168.40.88 ebgp-multihop
-neighbor 192.168.40.88 timers connect 10
-neighbor 192.168.40.89 remote-as 65089
-neighbor 192.168.40.89 ebgp-multihop
-neighbor 192.168.40.89 timers connect 10
-neighbor 192.168.40.90 remote-as 65090
-neighbor 192.168.40.90 ebgp-multihop
-neighbor 192.168.40.90 timers connect 10
-neighbor 192.168.40.91 remote-as 65091
-neighbor 192.168.40.91 ebgp-multihop
-neighbor 192.168.40.91 timers connect 10
-neighbor 192.168.40.92 remote-as 65092
-neighbor 192.168.40.92 ebgp-multihop
-neighbor 192.168.40.92 timers connect 10
-neighbor 192.168.40.93 remote-as 65093
-neighbor 192.168.40.93 ebgp-multihop
-neighbor 192.168.40.93 timers connect 10
-neighbor 192.168.40.94 remote-as 65094
-neighbor 192.168.40.94 ebgp-multihop
-neighbor 192.168.40.94 timers connect 10
-neighbor 192.168.40.95 remote-as 65095
-neighbor 192.168.40.95 ebgp-multihop
-neighbor 192.168.40.95 timers connect 10
-neighbor 192.168.40.96 remote-as 65096
-neighbor 192.168.40.96 ebgp-multihop
-neighbor 192.168.40.96 timers connect 10
-neighbor 192.168.40.97 remote-as 65097
-neighbor 192.168.40.97 ebgp-multihop
-neighbor 192.168.40.97 timers connect 10
-neighbor 192.168.40.98 remote-as 65098
-neighbor 192.168.40.98 ebgp-multihop
-neighbor 192.168.40.98 timers connect 10
-neighbor 192.168.40.99 remote-as 65099
-neighbor 192.168.40.99 ebgp-multihop
-neighbor 192.168.40.99 timers connect 10
-neighbor 192.168.40.100 remote-as 65100
-neighbor 192.168.40.100 ebgp-multihop
-neighbor 192.168.40.100 timers connect 10  
-
-  network 172.16.10.0/24
-!
-! access-list all permit any
-!
-!route-map set-nexthop permit 10
-! match ip address all
-! set ip next-hop 10.0.0.1
-!
-!log file /usr/local/var/log/quagga/bgpd.log
-!
-log stdout
diff --git a/TestON/tests/PeeringRouter/topology/quagga1.conf b/TestON/tests/PeeringRouter/topology/quagga1.conf
deleted file mode 100644
index 264f85e..0000000
--- a/TestON/tests/PeeringRouter/topology/quagga1.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-!
-! Zebra configuration saved from vty
-!   2014/11/25 11:22:24
-!
-hostname bgpd
-password hello
-log stdout
-!
-router bgp 64514
- bgp router-id 192.168.10.1
-! network 3.0.0.0/24
-! network 3.0.1.0/24
-! network 3.0.2.0/24
-! network 3.0.3.0/24
-! network 3.0.4.0/24
-! network 3.0.5.0/24
-! network 3.0.6.0/24
-! network 3.0.7.0/24
-! network 3.0.8.0/24
-! network 3.0.9.0/24
- neighbor 192.168.20.101 remote-as 64513
- neighbor 192.168.20.101 route-map PREPEND2 in
- neighbor 192.168.20.101 route-map PREPEND2 out
-!
-route-map PREPEND1 permit 1
- set as-path prepend 64514
-!
-route-map PREPEND2 permit 2
- set as-path prepend 64514 64514
-!
-line vty
-!
diff --git a/TestON/tests/PeeringRouter/topology/quagga2.conf b/TestON/tests/PeeringRouter/topology/quagga2.conf
deleted file mode 100644
index 20ca9e4..0000000
--- a/TestON/tests/PeeringRouter/topology/quagga2.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-! -*- bgp -*-
-!
-! BGPd sample configuratin file
-!
-! $Id: bgpd.conf.sample,v 1.1 2002/12/13 20:15:29 paul Exp $
-!
-hostname bgpd
-password hello
-!enable password please-set-at-here
-!
-!bgp mulitple-instance
-!
-router bgp 64516
-  bgp router-id 192.168.30.1
-!  timers bgp 1 3
-  neighbor 192.168.30.101 remote-as 64513
-! neighbor 192.168.50.2   remote-as 65001
-! network 172.16.30.0/24
-! neighbor 10.0.0.2 route-map set-nexthop out
-! neighbor 10.0.0.2 ebgp-multihop
-! neighbor 10.0.0.2 next-hop-self
-!
-! access-list all permit any
-!
-!route-map set-nexthop permit 10
-! match ip address all
-! set ip next-hop 10.0.0.1
-!
-!log file /usr/local/var/log/quagga/bgpd.log
-!
-log stdout
diff --git a/TestON/tests/PeeringRouter/topology/zebra.conf b/TestON/tests/PeeringRouter/topology/zebra.conf
deleted file mode 100644
index 0f8e3a2..0000000
--- a/TestON/tests/PeeringRouter/topology/zebra.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-! -*- zebra -*-
-!
-! zebra sample configuration file
-!
-! $Id: zebra.conf.sample,v 1.1 2002/12/13 20:15:30 paul Exp $
-!
-hostname zebra 
-password hello
-enable password 0fw0rk
-log stdout
-!
-! Interfaces description.
-!
-!interface lo
-! description test of desc.
-!
-!interface sit0
-! multicast
-
-!
-! Static default route sample.
-!
-!ip route 0.0.0.0/0 203.181.89.241
-!
-
-!log file /usr/local/var/log/quagga/zebra.log
diff --git a/TestON/tests/PeeringRouterTest/PeeringRouterTest.py b/TestON/tests/PeeringRouterTest/PeeringRouterTest.py
old mode 100644
new mode 100755
index 331520e..e4a482b
--- a/TestON/tests/PeeringRouterTest/PeeringRouterTest.py
+++ b/TestON/tests/PeeringRouterTest/PeeringRouterTest.py
@@ -1,6 +1,6 @@
 # from cupshelpers.config import prefix
 
-# Testing the basic functionality of ONOS Peering Router/BGP Router
+# Testing the basic functionality of SDN-IP
 
 
 class PeeringRouterTest:
@@ -38,9 +38,8 @@
 
         main.case("The test case is to help to setup the TestON environment \
             and test new drivers" )
-        # SDNIPJSONFILEPATH = "../tests/SdnIpTest/sdnip.json"
         SDNIPJSONFILEPATH = \
-            "/home/tutorial1/TestON/tests/PeeringRouterTest/sdnip.json"
+            "/home/sdnip/TestON/tests/PeeringRouter/sdnip.json"
         # all expected routes for all BGP peers
         allRoutesExpected = []
         main.step( "Start to generate routes for all BGP peers" )
@@ -95,7 +94,7 @@
             options="-f", node=ONOS1Ip )
 
         main.step( "Checking if ONOS is up yet" )
-        time.sleep( 60 )
+        time.sleep( 20 )
         onos1Isup = main.ONOSbench.isup( ONOS1Ip )
         if not onos1Isup:
             main.log.report( "ONOS1 didn't start!" )
@@ -108,8 +107,8 @@
         listResult = main.ONOScli.devices( jsonFormat=False )
         main.log.info( listResult )
         time.sleep( 10 )
-        main.log.info( "Installing sdn-ip feature" )
-        main.ONOScli.featureInstall( "onos-app-sdnip" )
+        main.log.info( "Installing gbprouter feature" )
+        main.ONOScli.featureInstall( "onos-app-bgprouter" )
         time.sleep( 10 )
         main.step( "Login all BGP peers and add routes into peers" )
 
@@ -134,7 +133,7 @@
         main.log.info( "Add routes to Quagga on host5" )
         main.QuaggaCliHost5.addRoutes( prefixesHost5, 1 )
 
-        time.sleep( 60 )
+        time.sleep( 30 )
 
         # get routes inside SDN-IP
         getRoutesResult = main.ONOScli.routes( jsonFormat=True )
@@ -219,12 +218,15 @@
             main.log.report(
                 "***PointToPointIntent Intents in SDN-IP are wrong!***" )
 
+        main.log.info( "Ping Test Start" )
+        time.sleep(1000000)
+
         #============================= Ping Test ========================
         # wait until all MultiPointToSinglePoint
         time.sleep( 20 )
-        pingTestScript = "~/SDNIP/test-tools/CASE4-ping-as2host.sh"
+        pingTestScript = "CASE4-ping-as2host.sh"
         pingTestResultsFile = \
-        "~/SDNIP/SdnIpIntentDemo/log/CASE4-ping-results-before-delete-routes-" \
+        "~/CASE4-ping-results-before-delete-routes-" \
             + strftime( "%Y-%m-%d_%H:%M:%S", localtime() ) + ".txt"
         pingTestResults = main.QuaggaCliHost.pingTest(
             "1.168.30.100", pingTestScript, pingTestResultsFile )
@@ -275,9 +277,9 @@
             deleting routes wrong!***" )
 
         time.sleep( 20 )
-        pingTestScript = "~/SDNIP/test-tools/CASE4-ping-as2host.sh"
+        pingTestScript = "CASE4-ping-as2host.sh"
         pingTestResultsFile = \
-        "~/SDNIP/SdnIpIntentDemo/log/CASE4-ping-results-after-delete-routes-" \
+        "~/CASE4-ping-results-after-delete-routes-" \
             + strftime( "%Y-%m-%d_%H:%M:%S", localtime() ) + ".txt"
         pingTestResults = main.QuaggaCliHost.pingTest(
             "1.168.30.100", pingTestScript, pingTestResultsFile )
diff --git a/TestON/tests/PeeringRouterTest/addresses.json b/TestON/tests/PeeringRouterTest/addresses.json
index 203de9b..ee83480 100644
--- a/TestON/tests/PeeringRouterTest/addresses.json
+++ b/TestON/tests/PeeringRouterTest/addresses.json
@@ -1,27 +1,27 @@
 {
     "addresses" : [
 		{
-		    "dpid" : "00:00:00:00:00:00:00:a1",
-		    "port" : "2",
+		    "dpid" : "00:00:00:00:00:00:00:01",
+		    "port" : "1",
 		    "ips" : ["192.168.10.101/24"],
                     "mac" : "00:00:00:00:00:01"
 			
 		},
 		{
-		    "dpid" : "00:00:00:00:00:00:00:a1",
-		    "port" : "3",
+		    "dpid" : "00:00:00:00:00:00:00:01",
+		    "port" : "2",
 		    "ips" : ["192.168.20.101/24"],
 		    "mac" : "00:00:00:00:00:01"
 		},
 		{
-		    "dpid" : "00:00:00:00:00:00:00:a1",
-		    "port" : "4",
+		    "dpid" : "00:00:00:00:00:00:00:01",
+		    "port" : "3",
 		    "ips" : ["192.168.30.101/24"],
 		    "mac" : "00:00:00:00:00:01"
 		},
 		{
-		    "dpid" : "00:00:00:00:00:00:00:a1",
-		    "port" : "5",
+		    "dpid" : "00:00:00:00:00:00:00:01",
+		    "port" : "4",
 		    "ips" : ["192.168.60.101/24"],
 		    "mac" : "00:00:00:00:00:01"
 		}
diff --git a/TestON/tests/PeeringRouter/topology/PeeringRouterMininet.py b/TestON/tests/PeeringRouterTest/mininet/PeeringRouterMininet.py
similarity index 98%
rename from TestON/tests/PeeringRouter/topology/PeeringRouterMininet.py
rename to TestON/tests/PeeringRouterTest/mininet/PeeringRouterMininet.py
index 99d026f..9ab4bf1 100755
--- a/TestON/tests/PeeringRouter/topology/PeeringRouterMininet.py
+++ b/TestON/tests/PeeringRouterTest/mininet/PeeringRouterMininet.py
@@ -38,8 +38,8 @@
         numHost101 = 101
         numHost200 = 200
         Topo.__init__( self, *args, **kwargs )
-        sw1 = self.addSwitch('sw1', dpid='00000000000000a1')
-        sw2 = self.addSwitch('sw2', dpid='00000000000000a2')
+        sw1 = self.addSwitch('sw1', dpid='0000000000000001')
+        sw2 = self.addSwitch('sw2', dpid='0000000000000002')
         #sw3 = self.addSwitch('sw3', dpid='00000000000000a3')
         #sw4 = self.addSwitch('sw4', dpid='00000000000000a4')
         #sw5 = self.addSwitch('sw5', dpid='00000000000000a5')
diff --git a/TestON/tests/PeeringRouterTest/mininet/SdnIpWithOneSwitchMininet.py b/TestON/tests/PeeringRouterTest/mininet/SdnIpWithOneSwitchMininet.py
deleted file mode 100644
index e05ba3d..0000000
--- a/TestON/tests/PeeringRouterTest/mininet/SdnIpWithOneSwitchMininet.py
+++ /dev/null
@@ -1,333 +0,0 @@
-#!/usr/bin/python
-
-"""
-Start up the SDN-IP demo topology
-"""
-
-"""
-AS1 = 64513, (SDN AS)
-AS2 = 64514, reachable by 192.168.10.1, 192.168.20.1
-AS3 = 64516, reachable by 192.168.30.1
-AS4 = 64517, reachable by 192.168.40.1
-AS6 = 64520, reachable by 192.168.60.2, (route server 192.168.60.1)
-"""
-
-from mininet.net import Mininet
-from mininet.node import Controller, RemoteController
-from mininet.log import setLogLevel, info
-from mininet.cli import CLI
-from mininet.topo import Topo
-from mininet.util import quietRun
-from mininet.moduledeps import pathCheck
-
-import os.path
-import time
-from subprocess import Popen, STDOUT, PIPE
-
-QUAGGA_DIR = '/usr/lib/quagga'
-#QUAGGA_DIR = '/usr/local/sbin'
-QUAGGA_RUN_DIR = '/usr/local/var/run/quagga'
-
-
-class SdnIpWithOneSwitchTopo( Topo ):
-    "SDN Ip Modified Topology"
-    
-    def __init__( self, *args, **kwargs ):
-        global numHost101 
-        global numHost200
-        numHost101 = 101
-        numHost200 = 200
-        Topo.__init__( self, *args, **kwargs )
-        sw1 = self.addSwitch('sw1', dpid='00000000000000a1')
-        #sw2 = self.addSwitch('sw2', dpid='00000000000000a2')
-        #sw3 = self.addSwitch('sw3', dpid='00000000000000a3')
-        #sw4 = self.addSwitch('sw4', dpid='00000000000000a4')
-        #sw5 = self.addSwitch('sw5', dpid='00000000000000a5')
-        #sw6 = self.addSwitch('sw6', dpid='00000000000000a6')
-        #add a switch for 3 quagga hosts
-        swTestOn = self.addSwitch('swTestOn', dpid='0000000000000102')
-        #Note this switch isn't part of the SDN topology
-        #We'll use the ovs-controller to turn this into a learning switch
-        as6sw = self.addSwitch('as6sw', dpid='00000000000000a7')
-
-        host1 = self.addHost( 'host1' )
-        root1 = self.addHost( 'root1', inNamespace=False , ip='0')
-        rootTestOn = self.addHost( 'rootTestOn', inNamespace=False, ip='0' )
-
-        #AS2 host
-        host3 = self.addHost( 'host3' )
-        as2host = self.addHost( 'as2host' )
-        #AS3 host
-        host4 = self.addHost( 'host4' )
-        as3host = self.addHost( 'as3host' )
-        #AS6 host
-        host5 = self.addHost( 'host5' )
-        as6host = self.addHost( 'as6host' )
-
-        self.addLink( host1, sw1 )
-        #Links to the multihomed AS
-        self.addLink( host3, sw1 )
-        self.addLink( host3, sw1 )
-        self.addLink( as2host, host3 )
-        #Single links to the remaining two ASes
-        self.addLink( host4, sw1 )
-        self.addLink( as3host, host4 )
-          
-        #AS3-AS4 link
-        #self.addLink( host4, host5)
-        #Add new AS6 to its bridge
-        self.addLink( host5, as6sw )
-        self.addLink( as6host, host5 )
-        #test the host behind the router(behind the router server)
-#        for i in range(1, 10):
- #           host = self.addHost('as6host%d' % i)
-  #          self.addLink(host, as6router)
-
-        ## Internal Connection To Hosts ##
-        self.addLink( root1, host1 )
-
- #       self.addLink( sw1, sw2 )
- #       self.addLink( sw1, sw3 )
- #       self.addLink( sw2, sw4 )
- #       self.addLink( sw3, sw4 )
- #       self.addLink( sw3, sw5 )
- #       self.addLink( sw4, sw6 )
- #       self.addLink( sw5, sw6 )
-        self.addLink( as6sw, sw1 )
-        
-        
-        self.addLink(swTestOn, rootTestOn)
-        #self.addLink(swTestOn, host1)
-        self.addLink(swTestOn, host3)
-        self.addLink(swTestOn, host4)
-        self.addLink(swTestOn, host5)
-        self.addLink(swTestOn, as2host)
-        
-        
-        #self.addLink(rootTestOn, host4)
-
-def startsshd( host ):
-    "Start sshd on host"
-    info( '*** Starting sshd\n' )
-    name, intf, ip = host.name, host.defaultIntf(), host.IP()
-    banner = '/tmp/%s.banner' % name
-    host.cmd( 'echo "Welcome to %s at %s" >  %s' % ( name, ip, banner ) )
-    host.cmd( '/usr/sbin/sshd -o "Banner %s"' % banner, '-o "UseDNS no"' )
-    info( '***', host.name, 'is running sshd on', intf, 'at', ip, '\n' )
-
-def startsshds ( hosts ):
-    for h in hosts:
-        startsshd( h )
-
-def stopsshd( ):
-    "Stop *all* sshd processes with a custom banner"
-    info( '*** Shutting down stale sshd/Banner processes ',
-          quietRun( "pkill -9 -f Banner" ), '\n' )
-
-def startquagga( host, num, config_file ):
-    info( '*** Starting Quagga on %s\n' % host )
-    zebra_cmd = 'sudo %s/zebra -d -f  zebra.conf -z %s/zserv%s.api -i %s/zebra%s.pid' % (QUAGGA_DIR, QUAGGA_RUN_DIR, num, QUAGGA_RUN_DIR, num)
-    quagga_cmd = 'sudo %s/bgpd -d -f %s -z %s/zserv%s.api -i %s/bgpd%s.pid' % (QUAGGA_DIR, config_file, QUAGGA_RUN_DIR, num, QUAGGA_RUN_DIR, num)
-    
-    print zebra_cmd
-    print quagga_cmd
-
-    host.cmd( zebra_cmd )
-    host.cmd( quagga_cmd )
-    
-def startquaggahost5( host, num ):
-    info( '*** Starting Quagga on %s\n' % host )
-    zebra_cmd = 'sudo %s/zebra -d -f zebra.conf -z %s/zserv%s.api -i %s/zebra%s.pid' % (QUAGGA_DIR, QUAGGA_RUN_DIR, num, QUAGGA_RUN_DIR, num)
-    quagga_cmd = 'sudo %s/bgpd -d -f ./as4quaggas/quagga%s.conf -z %s/zserv%s.api -i %s/bgpd%s.pid' % (QUAGGA_DIR, num, QUAGGA_RUN_DIR, num, QUAGGA_RUN_DIR, num)
-   
-    host.cmd( zebra_cmd )
-    host.cmd( quagga_cmd )    
-    
-
-def stopquagga( ):
-    quietRun( 'sudo pkill -9 -f bgpd' )
-    quietRun( 'sudo pkill -9 -f zebra' )
-
-def sdn1net():
-    topo = SdnIpWithOneSwitchTopo()
-    info( '*** Creating network\n' )
-    net = Mininet( topo=topo, controller=RemoteController )
-    net = Mininet( topo=topo, controller=RemoteController )
-
-    host1, host3, host4, host5 = net.get( 'host1', 'host3', 'host4', 'host5' )
-    
-        #host100.setIP('1.168.30.' + str(i), 24, str(host100) + "-eth2")  
-         
-        #host500.setMAC('00:00:00:00:04:%d' % (i-101), 'host%d-eth0' %(i))
-        #add IP prefixes
-        #for j in range(0,121):
-            #host100.cmd('sudo ip addr add %s.0.40.%s/24 dev host%s-eth0' %(i,j,i))
-
-    ## Adding 2nd, 3rd and 4th interface to host1 connected to sw1 (for another BGP peering)
-    #sw1 = net.get('sw1')
-    host1.setMAC('00:00:00:00:00:01', 'host1-eth0')
-    host1.cmd('ip addr add 192.168.20.101/24 dev host1-eth0')
-    host1.cmd('ip addr add 192.168.30.101/24 dev host1-eth0')
-    #host1.cmd('ip addr add 192.168.40.101/24 dev host1-eth0')
-    host1.cmd('ip addr add 192.168.60.101/24 dev host1-eth0')
-
-    # Net has to be start after adding the above link
-    net.start()
-
-    # Set up as6sw as a learning switch as quickly as possible so it 
-    # hopefully doesn't connect to the actual controller
-    # TODO figure out how to change controller before starting switch
-    as6sw = net.get('as6sw')
-    as6sw.cmd('ovs-vsctl set-controller as6sw none')
-    as6sw.cmd('ovs-vsctl set-fail-mode as6sw standalone')
-
-
-    sw1 = net.get('sw1')
-    sw1.cmd('ovs-vsctl set-controller sw1 tcp:127.0.0.1:6633')
-#    sw2.cmd('ovs-vsctl set-controller sw2 tcp:127.0.0.1:6633')
-#    sw3.cmd('ovs-vsctl set-controller sw3 tcp:127.0.0.1:6633')
-#    sw4.cmd('ovs-vsctl set-controller sw4 tcp:127.0.0.1:6633')
-#    sw5.cmd('ovs-vsctl set-controller sw5 tcp:127.0.0.1:6633')
-#    sw6.cmd('ovs-vsctl set-controller sw6 tcp:127.0.0.1:6633')
-
-    
-    swTestOn = net.get('swTestOn')
-    swTestOn.cmd('ovs-vsctl set-controller swTestOn none')
-    swTestOn.cmd('ovs-vsctl set-fail-mode swTestOn standalone')
-
-    host1.defaultIntf().setIP('192.168.10.101/24') 
-    # Run BGPd
-    #host1.cmd('%s -d -f %s' % (BGPD, BGPD_CONF))
-    #host1.cmd('/sbin/route add default gw 192.168.10.254 dev %s-eth0' % (host1.name))
-    
-    # Configure new host interfaces
-    #host2.defaultIntf().setIP('172.16.10.2/24')
-    #host2.defaultIntf().setMAC('00:00:00:00:01:02') 
-    #host2.cmd('/sbin/route add default gw 172.16.10.254 dev %s-eth0' % (host2.name))
-
-    # Set up AS2
-    host3.setIP('192.168.10.1', 24, 'host3-eth0')
-    #host3.cmd('sudo ip addr add 172.16.20.1/24 dev host3-eth0')
-    host3.setIP('192.168.20.1', 24, 'host3-eth1')
-    host3.setMAC('00:00:00:00:02:01', 'host3-eth0')
-    host3.setMAC('00:00:00:00:02:02', 'host3-eth1')
-    #host3.setIP('172.16.20.254', 24, 'host3-eth2')
-    host3.setIP('3.0.0.254', 8, 'host3-eth2')
-    host3.cmd('sysctl net.ipv4.conf.all.forwarding=1')
-    
-    host3.setIP('1.168.30.2', 24, 'host3-eth3')   
-    host3.cmd('sysctl net.ipv4.conf.all.arp_ignore=1')
-    host3.cmd('sysctl net.ipv4.conf.all.arp_announce=1')
-    as2host = net.get('as2host')
-    #as2host.defaultIntf().setIP('172.16.20.1/24')
-    for i in range(0, 20):
-        as2host.cmd('sudo ip addr add 3.0.%d.1/24 dev as2host-eth0' %i)
-    as2host.setIP('1.168.30.100', 24, 'as2host-eth1')
-    
-    as2host.cmd('ip route add default via 3.0.0.254')
-    
-    # Set up AS3
-    host4.setIP('192.168.30.1', 24, 'host4-eth0')
-    host4.setMAC('00:00:00:00:03:01', 'host4-eth0')
-    host4.setIP('4.0.0.254', 8, 'host4-eth1')
-    host4.setMAC('00:00:00:00:03:99', 'host4-eth1')
-    host4.cmd('sysctl net.ipv4.conf.all.forwarding=1')
-    as3host = net.get('as3host')
-    for i in range(0, 20):
-        as3host.cmd('sudo ip addr add 4.0.%d.1/24 dev as3host-eth0' %i)
-    as3host.cmd('ip route add default via 4.0.0.254')
-    
-    #root space
-    host4.setIP('1.168.30.3', 24, 'host4-eth2')
-    host4.setMAC('00:00:00:00:03:03', 'host4-eth2')
-    
-    # Set up AS4
-    #as4host = net.get('as4host')
-    #as4host.defaultIntf().setIP('172.16.40.1/24')
-    #as4host.cmd('ip route add default via 172.16.40.254')
-    
-    # setup interface address for 100 quagga hosts
-    time.sleep(10)
-    #for i in range(numHost101, numHost200 + 1):
-        #host100 = net.get('host' + str(i))
-        #host100.cmd(str(i)+'.0.1.254', 24, 'host'+str(i)+'-eth1')
-        #as4host100 = net.get('as4host%s' %(i))
-        #as4host100.defaultIntf().setIP(str(i) + '.0.0.1/24')
-        #as4host100.cmd('ip route add default via ' + str(i) + '.0.0.254')
-        #for j in range(0, 100):
-            #as4host100.cmd('sudo ip addr add %d.0.%d.1/24 dev %s-eth0' %(i, j, as4host100))
-
-    # Set up AS6 - This has a router and a route server
-    #as6rs, host5 = net.get('as6rs', 'host5')
-    host5 = net.get('host5')
-    #as6rs.setIP('192.168.60.1', 24, 'as6rs-eth0')
-    #as6rs.setMAC('00:00:00:00:06:01', 'as6rs-eth0')
-    host5.setIP('192.168.60.2', 24, 'host5-eth0')
-    host5.setMAC('00:00:00:00:06:02', 'host5-eth0')
-    #as6router.setIP('172.16.60.254', 24, 'as6router-eth1')
-    host5.setIP('5.0.0.254', 8, 'host5-eth1')
-    host5.cmd('sysctl net.ipv4.conf.all.forwarding=1')
-    host5.setIP('1.168.30.5', 24, 'host5-eth2')
-    host5.setMAC('00:00:00:00:06:05', 'host5-eth2')
-
-    as6host = net.get('as6host')
-    #as6host.defaultIntf().setIP('5.0.0.1/24')
-    for i in range(0, 10):
-        as6host.cmd('sudo ip addr add 5.0.%d.1/24 dev as6host-eth0' %i)
-    as6host.cmd('ip route add default via 5.0.0.254')
-
-    # test the host in the as6
-    #for i in range(1, 10):
-    #    baseip = (i-1)*4
-    #    host = net.get('as6host%d' % i)
-    #    host.defaultIntf().setIP('172.16.70.%d/24' % (baseip+1))
-    #    host.cmd('ip route add default via 172.16.70.%d' % (baseip+2))
-     #   as6router.setIP('172.16.70.%d' % (baseip+2), 30, 'as6router-eth%d' % (i+1))
-
-    # Start Quagga on border routers
-    startquagga(host3, 1, 'quagga1.conf')
-    startquagga(host4, 2, 'quagga2.conf')
-    #for i in range(numHost101, numHost200 + 1):
-        #host100=net.get('host%d' % (i))
-        #startquaggahost5(host100, i)
-
-    #startquagga(as6rs, 4, 'quagga-as6-rs.conf')
-    startquagga(host5, 5, 'quagga-as6.conf')
-
-    #root1, root2, rootTestOn  = net.get( 'root1', 'root2', 'rootTestOn' )
-    root1, rootTestOn  = net.get( 'root1', 'rootTestOn' )
-    host1.intf('host1-eth1').setIP('1.1.1.1/24')
-    root1.intf('root1-eth0').setIP('1.1.1.2/24')
-    #host2.intf('host2-eth1').setIP('1.1.2.1/24')
-    #root2.intf('root2-eth0').setIP('1.1.2.2/24')
-    
-    #rootTestOn.cmd('ip addr add 1.168.30.102/24 dev rootTestOn-eth0')
-    rootTestOn.cmd('ip addr add 1.168.30.99/24 dev rootTestOn-eth0')
-    
-    stopsshd()    
-
-    startquagga(host1, 100, 'quagga-sdn-modified.conf')    
-    hosts = [ host1, host3, host4, host5, as2host ];
-    #sshdHosts = sshdHosts + hosts
-    startsshds( hosts )
-    #
-    onos1 = '127.0.0.1'
-    forwarding1 = '%s:2000:%s:2000' % ('1.1.1.2', onos1)
-    root1.cmd( 'ssh -nNT -o "PasswordAuthentication no" -o "StrictHostKeyChecking no" -l sdn -L %s %s & ' % (forwarding1, onos1) )
-
-    # Forward 2605 to root namespace for easier access to SDN domain BGPd
-    # If root can ssh to itself without a password this should work
-    root1.cmd('ssh -N -o "PasswordAuthentication no" -o "StrictHostKeyChecking no" -L 2605:1.1.1.1:2605 1.1.1.1 &')
-    #time.sleep(3000000000)
-    CLI( net )
-
-    # Close the ssh port forwarding
-    #quietRun('sudo pkill -f 1.1.1.1')
-
-    stopsshd()
-    stopquagga()
-    net.stop()
-
-if __name__ == '__main__':
-    setLogLevel( 'debug' )
-    sdn1net()
diff --git a/TestON/tests/PeeringRouterTest/sdnip.json b/TestON/tests/PeeringRouterTest/sdnip.json
index 6f719cf..5b61d05 100644
--- a/TestON/tests/PeeringRouterTest/sdnip.json
+++ b/TestON/tests/PeeringRouterTest/sdnip.json
@@ -2,23 +2,23 @@
    
     "bgpPeers" : [
 		{
-		    "attachmentDpid" : "00:00:00:00:00:00:00:a1",
-		    "attachmentPort" : "2",
+		    "attachmentDpid" : "00:00:00:00:00:00:00:01",
+		    "attachmentPort" : "1",
 		    "ipAddress" : "192.168.10.1"
 		},
 		{
-		    "attachmentDpid" : "00:00:00:00:00:00:00:a1",
-		    "attachmentPort" : "3",
+		    "attachmentDpid" : "00:00:00:00:00:00:00:01",
+		    "attachmentPort" : "2",
 		    "ipAddress" : "192.168.20.1"
 		},
 		{
-		    "attachmentDpid" : "00:00:00:00:00:00:00:a1",
-		    "attachmentPort" : "4",
+		    "attachmentDpid" : "00:00:00:00:00:00:00:01",
+		    "attachmentPort" : "3",
 		    "ipAddress" : "192.168.30.1"
 		},
 		{
-		    "attachmentDpid" : "00:00:00:00:00:00:00:a1",
-		    "attachmentPort" : "5",
+		    "attachmentDpid" : "00:00:00:00:00:00:00:01",
+		    "attachmentPort" : "4",
 		    "ipAddress" : "192.168.60.2"
 		}
 
@@ -26,28 +26,28 @@
     "bgpSpeakers" : [
 	    {
 	    	 "name" : "bgpSpeaker1",
-	    	 "attachmentDpid" : "00:00:00:00:00:00:00:a1",
+	    	 "attachmentDpid" : "00:00:00:00:00:00:00:02",
 	         "attachmentPort" : "1",
-	         "macAddress" : "00:00:00:00:00:01",
+	         "macAddress" : "00:00:00:00:00:02",
 	         "interfaceAddresses" : [
 				{
-				    "interfaceDpid" : "00:00:00:00:00:00:00:a1",
-		  		    "interfacePort" : "2",
+				    "interfaceDpid" : "00:00:00:00:00:00:00:01",
+		  		    "interfacePort" : "1",
 				    "ipAddress" : "192.168.10.101"
 				},
 				{
-				    "interfaceDpid" : "00:00:00:00:00:00:00:a1",
-		       		    "interfacePort" : "3",
+				    "interfaceDpid" : "00:00:00:00:00:00:00:01",
+		       		    "interfacePort" : "2",
 				    "ipAddress" : "192.168.20.101"
 				},
 				{
-				    "interfaceDpid" : "00:00:00:00:00:00:00:a1",
-		       		    "interfacePort" : "4",
+				    "interfaceDpid" : "00:00:00:00:00:00:00:01",
+		       		    "interfacePort" : "3",
 				    "ipAddress" : "192.168.30.101"
 				},
 				{
-				    "interfaceDpid" : "00:00:00:00:00:00:00:a1",
-		       		    "interfacePort" : "5",
+				    "interfaceDpid" : "00:00:00:00:00:00:00:01",
+		       		    "interfacePort" : "4",
 				    "ipAddress" : "192.168.60.101"
 				}