Gitiles
Code Review Sign In
gerrit.onosproject.org / OnosSystemTest / ac02b14daba09b4a407faa3ea7477bee11a667d0^! / . / TestON / tests / USECASE / SegmentRouting / dependencies
commitac02b14daba09b4a407faa3ea7477bee11a667d0[log] [tgz]
authorYou Wang <you@opennetworking.org>Fri Jan 26 14:57:28 2018 -0800
committerYou Wang <you@opennetworking.org>Mon Jan 29 12:22:52 2018 -0800
tree6a2a51c74e53748d2a84943d0cd5208916195192
parent767586e9a8b657fcfbecc9159c99a96cd6b18a50 [diff]
Move dependency files for SRBridging test

Change-Id: Ic28e527085fd674ca89d8216e635ba330b6b4868

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/SRBridgingTest.py b/TestON/tests/USECASE/SegmentRouting/dependencies/SRBridgingTest.py
deleted file mode 100644
index 1523811..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/SRBridgingTest.py
+++ /dev/null

@@ -1,80 +0,0 @@
-"""
-Copyright 2017 Open Networking Foundation ( ONF )
-
-Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
-the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
-or the System Testing Guide page at <https://wiki.onosproject.org/x/WYQg>
-
-    TestON is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 2 of the License, or
-    ( at your option ) any later version.
-
-    TestON is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with TestON.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-from Testcaselib import Testcaselib as run
-
-class SRBridgingTest ():
-
-    def __init__( self ):
-        self.default = ''
-
-    @staticmethod
-    def runTest( main, test_idx, topology, onosNodes, description, vlan = [] ):
-        topo = dict()
-        # (number of spine switch, number of leaf switch, dual-homed, description, minFlowCount - leaf)
-        topo[ '0x1' ] = ( 0, 1, False, 'single ToR', 28 )
-        topo[ '0x2' ] = ( 0, 2, True, 'dual-homed ToR', 37 )
-        topo[ '2x2' ] = ( 2, 2, False, '2x2 leaf-spine topology', 37 )
-        # TODO: Implement 2x3 topology
-        # topo[ '2x3' ] = ( 2, 3, True, '2x3 leaf-spine topology with dual ToR and single ToR', 28 )
-        topo[ '2x4' ] = ( 2, 4, True, '2x4 dual-homed leaf-spine topology', 53 )
-
-        skipPackage = False
-        init = False
-        if not hasattr( main, 'apps' ):
-            init = True
-            run.initTest( main )
-        # Skip onos packaging if the clusrer size stays the same
-        if not init and onosNodes == main.Cluster.numCtrls:
-            skipPackage = True
-
-        main.case( '%s, with %s and %d ONOS instance%s' %
-                   ( description, topo[ topology ][ 3 ], onosNodes, 's' if onosNodes > 1 else '' ) )
-
-        main.cfgName = 'CASE%01d%01d' % ( test_idx / 10, ( ( test_idx - 1 ) % 10 ) % 4 + 1 )
-        main.resultFileName = 'CASE%02d' % test_idx
-        main.Cluster.setRunningNode( onosNodes )
-        run.installOnos( main, skipPackage=skipPackage, cliSleep=5 )
-        if hasattr( main, 'Mininet1' ):
-            # Run the test with Mininet
-            mininet_args = ' --spine=%d --leaf=%d' % ( topo[ topology ][ 0 ], topo[ topology ][ 1 ] )
-            if topo[ topology ][ 2 ]:
-                mininet_args += ' --dual-homed'
-            if len( vlan ) > 0 :
-                mininet_args += ' --vlan=%s' % ( ','.join( ['%d' % vlanId for vlanId in vlan ] ) )
-
-            run.startMininet( main, 'trellis_fabric.py', args=mininet_args )
-        else:
-            # Run the test with physical devices
-            # TODO: connect TestON to the physical network
-            pass
-
-        run.checkFlows( main, minFlowCount=topo[ topology ][ 4 ] * topo[ topology ][ 1 ], sleep=5 )
-        leaf_dpid = [ "of:%016d" % ( ls + 1 ) for ls in range( topo[ topology ][ 1 ] ) ]
-        for dpid in leaf_dpid:
-            run.checkFlowsByDpid( main, dpid, topo[ topology ][ 4 ], sleep=5 )
-        run.pingAll( main, 'CASE%02d' % test_idx )
-
-        if hasattr( main, 'Mininet1' ):
-            run.cleanup( main )
-        else:
-            # TODO: disconnect TestON from the physical network
-            pass

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
index ba4e0d7..5198dbe 100644
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py

@@ -58,7 +58,8 @@
             main.apps = main.params[ 'ENV' ][ 'cellApps' ]
             main.diff = main.params[ 'ENV' ][ 'diffApps' ]
             main.path = os.path.dirname( main.testFile )
-            main.dependencyPath = main.path + "/../dependencies/"
+            main.topoPath = main.path + "/../dependencies/"
+            main.configPath = main.path + "/../dependencies/"
             main.topology = main.params[ 'DEPENDENCY' ][ 'topology' ]
             wrapperFile1 = main.params[ 'DEPENDENCY' ][ 'wrapper1' ]
             main.scale = ( main.params[ 'SCALE' ][ 'size' ] ).split( "," )
@@ -113,10 +114,10 @@
                                  onfail="ONOS summary command failed" )
 
         with open( "%s/json/%s.json" % (
-                main.dependencyPath, main.cfgName ) ) as cfg:
+                main.configPath, main.cfgName ) ) as cfg:
             main.Cluster.active( 0 ).REST.setNetCfg( json.load( cfg ) )
         with open( "%s/json/%s.chart" % (
-                main.dependencyPath, main.cfgName ) ) as chart:
+                main.configPath, main.cfgName ) ) as chart:
             main.pingChart = json.load( chart )
         if not ready:
             main.log.error( "ONOS startup failed!" )
@@ -132,17 +133,17 @@
     def startMininet( main, topology, args="" ):
         try:
             copyResult1 = main.ONOSbench.scp( main.Mininet1,
-                                              main.dependencyPath +
+                                              main.topoPath +
                                               main.topology,
                                               main.Mininet1.home,
                                               direction="to" )
             copyResult2 = main.ONOSbench.scp( main.Mininet1,
-                                              main.dependencyPath +
+                                              main.topoPath +
                                               main.topologyLib1,
                                               main.Mininet1.home,
                                               direction="to" )
             copyResult3 = main.ONOSbench.scp( main.Mininet1,
-                                              main.dependencyPath +
+                                              main.topoPath +
                                               main.topologyLib2,
                                               main.Mininet1.home,
                                               direction="to" )
@@ -540,7 +541,7 @@
         """
         import json
         hostCfg = {}
-        with open( main.dependencyPath + "/json/extra.json" ) as template:
+        with open( main.configPath + "/json/extra.json" ) as template:
             hostCfg = json.load( template )
         main.pingChart[ 'ip' ][ 'hosts' ] += [ 'in1' ]
         main.step( "Pushing new configuration" )
@@ -577,7 +578,7 @@
         """
         import json
         hostCfg = {}
-        with open( main.dependencyPath + "/json/extra.json" ) as template:
+        with open( main.configPath + "/json/extra.json" ) as template:
             hostCfg = json.load( template )
         main.step( "Removing host configuration" )
         main.pingChart[ 'ip' ][ 'expect' ] = 0

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE01.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE01.chart
deleted file mode 100644
index 4438f56..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE01.chart
+++ /dev/null

@@ -1,4 +0,0 @@
-{
-  "leaf1": {"expect": "True",
-    "hosts":["h1", "h2"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE01.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE01.json
deleted file mode 100644
index 7cbb5e1..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE01.json
+++ /dev/null

@@ -1,34 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE02.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE02.chart
deleted file mode 100644
index 4438f56..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE02.chart
+++ /dev/null

@@ -1,4 +0,0 @@
-{
-  "leaf1": {"expect": "True",
-    "hosts":["h1", "h2"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE02.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE02.json
deleted file mode 100644
index f0460f9..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE02.json
+++ /dev/null

@@ -1,80 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        }
-    },
-    "hosts": {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/2", "of:0000000000000002/2"]
-            }
-        },
-        "00:AA:00:00:00:02/None": {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/3", "of:0000000000000002/3"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE03.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE03.chart
deleted file mode 100644
index 0102621..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE03.chart
+++ /dev/null

@@ -1,6 +0,0 @@
-{
-  "leaf1": {"expect": "True",
-    "hosts":["h1", "h2"]},
-  "leaf2": {"expect": "True",
-    "hosts":["h3", "h4"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE03.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE03.json
deleted file mode 100644
index 6dc183a..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE03.json
+++ /dev/null

@@ -1,86 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE04.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE04.chart
deleted file mode 100644
index 0102621..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE04.chart
+++ /dev/null

@@ -1,6 +0,0 @@
-{
-  "leaf1": {"expect": "True",
-    "hosts":["h1", "h2"]},
-  "leaf2": {"expect": "True",
-    "hosts":["h3", "h4"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE04.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE04.json
deleted file mode 100644
index 443975d..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE04.json
+++ /dev/null

@@ -1,176 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        }
-    },
-    "hosts": {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/6", "of:0000000000000002/6"]
-            }
-        },
-        "00:AA:00:00:00:02/None": {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/7", "of:0000000000000002/7"]
-            }
-        },
-        "00:AA:00:00:00:03/None": {
-            "basic": {
-                "ips": ["10.0.3.1"],
-                "locations": ["of:0000000000000003/6", "of:0000000000000004/6"]
-            }
-        },
-        "00:AA:00:00:00:04/None": {
-            "basic": {
-                "ips": ["10.0.3.2"],
-                "locations": ["of:0000000000000003/7", "of:0000000000000004/7"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000004",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000003",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE11.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE11.chart
deleted file mode 100644
index 4438f56..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE11.chart
+++ /dev/null

@@ -1,4 +0,0 @@
-{
-  "leaf1": {"expect": "True",
-    "hosts":["h1", "h2"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE11.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE11.json
deleted file mode 100644
index 42f58c3..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE11.json
+++ /dev/null

@@ -1,46 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:aa:00:00:00:01/10" : {
-            "basic": {
-                "locations": ["of:0000000000000001/1"]
-            }
-        },
-        "00:aa:00:00:00:02/10" : {
-            "basic": {
-                "locations": ["of:0000000000000001/2"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE12.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE12.chart
deleted file mode 100644
index 4438f56..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE12.chart
+++ /dev/null

@@ -1,4 +0,0 @@
-{
-  "leaf1": {"expect": "True",
-    "hosts":["h1", "h2"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE12.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE12.json
deleted file mode 100644
index 8ce1a02..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE12.json
+++ /dev/null

@@ -1,80 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:AA:00:00:00:01/10" : {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/2", "of:0000000000000002/2"]
-            }
-        },
-        "00:AA:00:00:00:02/10" : {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/3", "of:0000000000000002/3"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE13.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE13.chart
deleted file mode 100644
index 0102621..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE13.chart
+++ /dev/null

@@ -1,6 +0,0 @@
-{
-  "leaf1": {"expect": "True",
-    "hosts":["h1", "h2"]},
-  "leaf2": {"expect": "True",
-    "hosts":["h3", "h4"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE13.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE13.json
deleted file mode 100644
index 7835cf3..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE13.json
+++ /dev/null

@@ -1,108 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:aa:00:00:00:01/10" : {
-            "basic": {
-                "locations": ["of:0000000000000001/3"]
-            }
-        },
-        "00:aa:00:00:00:02/10" : {
-            "basic": {
-                "locations": ["of:0000000000000001/4"]
-            }
-        },
-        "00:aa:00:00:00:03/20" : {
-            "basic": {
-                "locations": ["of:0000000000000002/3"]
-            }
-        },
-        "00:aa:00:00:00:04/20" : {
-            "basic": {
-                "locations": ["of:0000000000000002/4"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE14.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE14.chart
deleted file mode 100644
index 0102621..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE14.chart
+++ /dev/null

@@ -1,6 +0,0 @@
-{
-  "leaf1": {"expect": "True",
-    "hosts":["h1", "h2"]},
-  "leaf2": {"expect": "True",
-    "hosts":["h3", "h4"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE14.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE14.json
deleted file mode 100644
index aa969dd..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE14.json
+++ /dev/null

@@ -1,176 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:aa:00:00:00:01/10" : {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/6", "of:0000000000000002/6"]
-            }
-        },
-        "00:aa:00:00:00:02/10" : {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/7", "of:0000000000000002/7"]
-            }
-        },
-        "00:aa:00:00:00:03/20" : {
-            "basic": {
-                "ips": ["10.0.3.1"],
-                "locations": ["of:0000000000000003/6", "of:0000000000000004/6"]
-            }
-        },
-        "00:aa:00:00:00:04/20" : {
-            "basic": {
-                "ips": ["10.0.3.2"],
-                "locations": ["of:0000000000000003/7", "of:0000000000000004/7"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000004",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000003",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE21.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE21.chart
deleted file mode 100644
index 4438f56..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE21.chart
+++ /dev/null

@@ -1,4 +0,0 @@
-{
-  "leaf1": {"expect": "True",
-    "hosts":["h1", "h2"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE21.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE21.json
deleted file mode 100644
index 391d6a8..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE21.json
+++ /dev/null

@@ -1,36 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE22.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE22.chart
deleted file mode 100644
index 4438f56..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE22.chart
+++ /dev/null

@@ -1,4 +0,0 @@
-{
-  "leaf1": {"expect": "True",
-    "hosts":["h1", "h2"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE22.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE22.json
deleted file mode 100644
index 50c4289..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE22.json
+++ /dev/null

@@ -1,84 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        }
-    },
-    "hosts": {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/2", "of:0000000000000002/2"]
-            }
-        },
-        "00:AA:00:00:00:02/None": {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/3", "of:0000000000000002/3"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE23.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE23.chart
deleted file mode 100644
index 0102621..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE23.chart
+++ /dev/null

@@ -1,6 +0,0 @@
-{
-  "leaf1": {"expect": "True",
-    "hosts":["h1", "h2"]},
-  "leaf2": {"expect": "True",
-    "hosts":["h3", "h4"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE23.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE23.json
deleted file mode 100644
index 26f3678..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE23.json
+++ /dev/null

@@ -1,90 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30],
-                    "vlan-native": 40
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30],
-                    "vlan-native": 40
-                }
-            ]
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE24.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE24.chart
deleted file mode 100644
index 0102621..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE24.chart
+++ /dev/null

@@ -1,6 +0,0 @@
-{
-  "leaf1": {"expect": "True",
-    "hosts":["h1", "h2"]},
-  "leaf2": {"expect": "True",
-    "hosts":["h3", "h4"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE24.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE24.json
deleted file mode 100644
index 6d39eca..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE24.json
+++ /dev/null

@@ -1,184 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30],
-                    "vlan-native": 40
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30],
-                    "vlan-native": 40
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30],
-                    "vlan-native": 40
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30],
-                    "vlan-native": 40
-                }
-            ]
-        }
-    },
-    "hosts": {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/6", "of:0000000000000002/6"]
-            }
-        },
-        "00:AA:00:00:00:02/None": {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/7", "of:0000000000000002/7"]
-            }
-        },
-        "00:AA:00:00:00:03/None": {
-            "basic": {
-                "ips": ["10.0.3.1"],
-                "locations": ["of:0000000000000003/6", "of:0000000000000004/6"]
-            }
-        },
-        "00:AA:00:00:00:04/None": {
-            "basic": {
-                "ips": ["10.0.3.2"],
-                "locations": ["of:0000000000000003/7", "of:0000000000000004/7"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000004",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000003",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE31.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE31.chart
deleted file mode 100644
index 4438f56..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE31.chart
+++ /dev/null

@@ -1,4 +0,0 @@
-{
-  "leaf1": {"expect": "True",
-    "hosts":["h1", "h2"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE31.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE31.json
deleted file mode 100644
index d96fbd4..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE31.json
+++ /dev/null

@@ -1,35 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE32.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE32.chart
deleted file mode 100644
index 4438f56..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE32.chart
+++ /dev/null

@@ -1,4 +0,0 @@
-{
-  "leaf1": {"expect": "True",
-    "hosts":["h1", "h2"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE32.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE32.json
deleted file mode 100644
index 797ca0d..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE32.json
+++ /dev/null

@@ -1,82 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        }
-    },
-    "hosts": {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/2", "of:0000000000000002/2"]
-            }
-        },
-        "00:AA:00:00:00:02/None": {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/3", "of:0000000000000002/3"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE33.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE33.chart
deleted file mode 100644
index 0102621..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE33.chart
+++ /dev/null

@@ -1,6 +0,0 @@
-{
-  "leaf1": {"expect": "True",
-    "hosts":["h1", "h2"]},
-  "leaf2": {"expect": "True",
-    "hosts":["h3", "h4"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE33.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE33.json
deleted file mode 100644
index 8752708..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE33.json
+++ /dev/null

@@ -1,88 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30],
-                    "vlan-native": 40
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE34.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE34.chart
deleted file mode 100644
index 0102621..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE34.chart
+++ /dev/null

@@ -1,6 +0,0 @@
-{
-  "leaf1": {"expect": "True",
-    "hosts":["h1", "h2"]},
-  "leaf2": {"expect": "True",
-    "hosts":["h3", "h4"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE34.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE34.json
deleted file mode 100644
index c82b944..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE34.json
+++ /dev/null

@@ -1,180 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30],
-                    "vlan-native": 40
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30],
-                    "vlan-native": 40
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        }
-    },
-    "hosts": {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/6", "of:0000000000000002/6"]
-            }
-        },
-        "00:AA:00:00:00:02/None": {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/7", "of:0000000000000002/7"]
-            }
-        },
-        "00:AA:00:00:00:03/None": {
-            "basic": {
-                "ips": ["10.0.3.1"],
-                "locations": ["of:0000000000000003/6", "of:0000000000000004/6"]
-            }
-        },
-        "00:AA:00:00:00:04/None": {
-            "basic": {
-                "ips": ["10.0.3.2"],
-                "locations": ["of:0000000000000003/7", "of:0000000000000004/7"]
-            }
-        }
-    },
-     "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000004",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000003",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE41.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE41.chart
deleted file mode 100644
index 4438f56..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE41.chart
+++ /dev/null

@@ -1,4 +0,0 @@
-{
-  "leaf1": {"expect": "True",
-    "hosts":["h1", "h2"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE41.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE41.json
deleted file mode 100644
index 9940a3d..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE41.json
+++ /dev/null

@@ -1,41 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:aa:00:00:00:02/10" : {
-            "basic": {
-                "locations": ["of:0000000000000001/2"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE42.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE42.chart
deleted file mode 100644
index 4438f56..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE42.chart
+++ /dev/null

@@ -1,4 +0,0 @@
-{
-  "leaf1": {"expect": "True",
-    "hosts":["h1", "h2"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE42.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE42.json
deleted file mode 100644
index 6e14c7e..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE42.json
+++ /dev/null

@@ -1,80 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/2", "of:0000000000000002/2"]
-            }
-        },
-        "00:AA:00:00:00:02/10" : {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/3", "of:0000000000000002/3"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE43.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE43.chart
deleted file mode 100644
index 0102621..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE43.chart
+++ /dev/null

@@ -1,6 +0,0 @@
-{
-  "leaf1": {"expect": "True",
-    "hosts":["h1", "h2"]},
-  "leaf2": {"expect": "True",
-    "hosts":["h3", "h4"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE43.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE43.json
deleted file mode 100644
index 514b1fb..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE43.json
+++ /dev/null

@@ -1,98 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:aa:00:00:00:02/10" : {
-            "basic": {
-                "locations": ["of:0000000000000001/4"]
-            }
-        },
-        "00:aa:00:00:00:04/20" : {
-            "basic": {
-                "locations": ["of:0000000000000002/4"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE44.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE44.chart
deleted file mode 100644
index 0102621..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE44.chart
+++ /dev/null

@@ -1,6 +0,0 @@
-{
-  "leaf1": {"expect": "True",
-    "hosts":["h1", "h2"]},
-  "leaf2": {"expect": "True",
-    "hosts":["h3", "h4"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE44.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE44.json
deleted file mode 100644
index 9579f7a..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE44.json
+++ /dev/null

@@ -1,176 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/6", "of:0000000000000002/6"]
-            }
-        },
-        "00:AA:00:00:00:02/10" : {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/7", "of:0000000000000002/7"]
-            }
-        },
-        "00:AA:00:00:00:03/None": {
-            "basic": {
-                "ips": ["10.0.3.1"],
-                "locations": ["of:0000000000000003/6", "of:0000000000000004/6"]
-            }
-        },
-        "00:AA:00:00:00:04/20" : {
-            "basic": {
-                "ips": ["10.0.3.2"],
-                "locations": ["of:0000000000000003/7", "of:0000000000000004/7"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000004",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000003",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE51.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE51.chart
deleted file mode 100644
index ff7036f..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE51.chart
+++ /dev/null

@@ -1,4 +0,0 @@
-{
-  "leaf1": {"expect": "False",
-    "hosts":["h1", "h2"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE51.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE51.json
deleted file mode 100644
index ea6fc80..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE51.json
+++ /dev/null

@@ -1,34 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE52.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE52.chart
deleted file mode 100644
index ff7036f..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE52.chart
+++ /dev/null

@@ -1,4 +0,0 @@
-{
-  "leaf1": {"expect": "False",
-    "hosts":["h1", "h2"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE52.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE52.json
deleted file mode 100644
index 170c2d7..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE52.json
+++ /dev/null

@@ -1,80 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        }
-    },
-    "hosts": {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/2", "of:0000000000000002/2"]
-            }
-        },
-        "00:AA:00:00:00:02/None": {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/3", "of:0000000000000002/3"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE53.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE53.chart
deleted file mode 100644
index ba520ce..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE53.chart
+++ /dev/null

@@ -1,6 +0,0 @@
-{
-  "leaf1": {"expect": "False",
-    "hosts":["h1", "h2"]},
-  "leaf2": {"expect": "False",
-    "hosts":["h3", "h4"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE53.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE53.json
deleted file mode 100644
index f9475db..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE53.json
+++ /dev/null

@@ -1,86 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE54.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE54.chart
deleted file mode 100644
index ba520ce..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE54.chart
+++ /dev/null

@@ -1,6 +0,0 @@
-{
-  "leaf1": {"expect": "False",
-    "hosts":["h1", "h2"]},
-  "leaf2": {"expect": "False",
-    "hosts":["h3", "h4"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE54.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE54.json
deleted file mode 100644
index b428fd4..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE54.json
+++ /dev/null

@@ -1,176 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        }
-    },
-    "hosts": {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/6", "of:0000000000000002/6"]
-            }
-        },
-        "00:AA:00:00:00:02/None": {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/7", "of:0000000000000002/7"]
-            }
-        },
-        "00:AA:00:00:00:03/None": {
-            "basic": {
-                "ips": ["10.0.3.1"],
-                "locations": ["of:0000000000000003/6", "of:0000000000000004/6"]
-            }
-        },
-        "00:AA:00:00:00:04/None": {
-            "basic": {
-                "ips": ["10.0.3.2"],
-                "locations": ["of:0000000000000003/7", "of:0000000000000004/7"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000004",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000003",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE61.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE61.chart
deleted file mode 100644
index ff7036f..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE61.chart
+++ /dev/null

@@ -1,4 +0,0 @@
-{
-  "leaf1": {"expect": "False",
-    "hosts":["h1", "h2"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE61.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE61.json
deleted file mode 100644
index 6f78265..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE61.json
+++ /dev/null

@@ -1,46 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:aa:00:00:00:01/10" : {
-            "basic": {
-                "locations": ["of:0000000000000001/1"]
-            }
-        },
-        "00:aa:00:00:00:02/20" : {
-            "basic": {
-                "locations": ["of:0000000000000001/2"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE62.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE62.chart
deleted file mode 100644
index ff7036f..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE62.chart
+++ /dev/null

@@ -1,4 +0,0 @@
-{
-  "leaf1": {"expect": "False",
-    "hosts":["h1", "h2"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE62.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE62.json
deleted file mode 100644
index e030388..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE62.json
+++ /dev/null

@@ -1,80 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:AA:00:00:00:01/10" : {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/2", "of:0000000000000002/2"]
-            }
-        },
-        "00:AA:00:00:00:02/20" : {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/3", "of:0000000000000002/3"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE63.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE63.chart
deleted file mode 100644
index ba520ce..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE63.chart
+++ /dev/null

@@ -1,6 +0,0 @@
-{
-  "leaf1": {"expect": "False",
-    "hosts":["h1", "h2"]},
-  "leaf2": {"expect": "False",
-    "hosts":["h3", "h4"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE63.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE63.json
deleted file mode 100644
index a971ba7..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE63.json
+++ /dev/null

@@ -1,108 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:aa:00:00:00:01/10": {
-            "basic": {
-                "locations": ["of:0000000000000001/3"]
-            }
-        },
-        "00:aa:00:00:00:02/20": {
-            "basic": {
-                "locations": ["of:0000000000000001/4"]
-            }
-        },
-        "00:aa:00:00:00:03/30": {
-            "basic": {
-                "locations": ["of:0000000000000002/3"]
-            }
-        },
-        "00:aa:00:00:00:04/40": {
-            "basic": {
-                "locations": ["of:0000000000000002/4"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE64.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE64.chart
deleted file mode 100644
index ba520ce..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE64.chart
+++ /dev/null

@@ -1,6 +0,0 @@
-{
-  "leaf1": {"expect": "False",
-    "hosts":["h1", "h2"]},
-  "leaf2": {"expect": "False",
-    "hosts":["h3", "h4"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE64.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE64.json
deleted file mode 100644
index be8fa2f..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE64.json
+++ /dev/null

@@ -1,176 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:AA:00:00:00:01/10": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/6","of:0000000000000002/6"]
-            }
-        },
-        "00:AA:00:00:00:02/20": {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/7", "of:0000000000000002/7"]
-            }
-        },
-        "00:AA:00:00:00:03/30": {
-            "basic": {
-                "ips": ["10.0.3.1"],
-                "locations": ["of:0000000000000003/6", "of:0000000000000004/6"]
-            }
-        },
-        "00:AA:00:00:00:04/40": {
-            "basic": {
-                "ips": ["10.0.3.2"],
-                "locations": ["of:0000000000000003/7", "of:0000000000000004/7"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000004",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000003",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE71.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE71.chart
deleted file mode 100644
index ff7036f..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE71.chart
+++ /dev/null

@@ -1,4 +0,0 @@
-{
-  "leaf1": {"expect": "False",
-    "hosts":["h1", "h2"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE71.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE71.json
deleted file mode 100644
index 6d989ad..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE71.json
+++ /dev/null

@@ -1,41 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:aa:00:00:00:02/20" : {
-            "basic": {
-                "locations": ["of:0000000000000001/2"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE72.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE72.chart
deleted file mode 100644
index ff7036f..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE72.chart
+++ /dev/null

@@ -1,4 +0,0 @@
-{
-  "leaf1": {"expect": "False",
-    "hosts":["h1", "h2"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE72.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE72.json
deleted file mode 100644
index 0fcb6a4..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE72.json
+++ /dev/null

@@ -1,80 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/2", "of:0000000000000002/2"]
-            }
-        },
-        "00:AA:00:00:00:02/20" : {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/3", "of:0000000000000002/3"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE73.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE73.chart
deleted file mode 100644
index ba520ce..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE73.chart
+++ /dev/null

@@ -1,6 +0,0 @@
-{
-  "leaf1": {"expect": "False",
-    "hosts":["h1", "h2"]},
-  "leaf2": {"expect": "False",
-    "hosts":["h3", "h4"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE73.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE73.json
deleted file mode 100644
index 01173a0..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE73.json
+++ /dev/null

@@ -1,98 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:aa:00:00:00:02/20" : {
-            "basic": {
-                "locations": ["of:0000000000000001/4"]
-            }
-        },
-        "00:aa:00:00:00:04/40" : {
-            "basic": {
-                "locations": ["of:0000000000000002/4"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE74.chart b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE74.chart
deleted file mode 100644
index ba520ce..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE74.chart
+++ /dev/null

@@ -1,6 +0,0 @@
-{
-  "leaf1": {"expect": "False",
-    "hosts":["h1", "h2"]},
-  "leaf2": {"expect": "False",
-    "hosts":["h3", "h4"]}
-}
\ No newline at end of file

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE74.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE74.json
deleted file mode 100644
index 68ae34c..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE74.json
+++ /dev/null

@@ -1,176 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/6", "of:0000000000000002/6"]
-            }
-        },
-        "00:AA:00:00:00:02/20" : {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/7", "of:0000000000000002/7"]
-            }
-        },
-        "00:AA:00:00:00:03/None": {
-            "basic": {
-                "ips": ["10.0.3.1"],
-                "locations": ["of:0000000000000003/6", "of:0000000000000004/6"]
-            }
-        },
-        "00:AA:00:00:00:04/40" : {
-            "basic": {
-                "ips": ["10.0.3.2"],
-                "locations": ["of:0000000000000003/7", "of:0000000000000004/7"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000004",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000003",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    }
-}