diff --git a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/SRMulticastTest.py b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/SRMulticastTest.py
index 8d69443..27b6dd0 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/SRMulticastTest.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/SRMulticastTest.py
@@ -37,7 +37,7 @@
     lib.installOnos( main, skipPackage=skipPackage, cliSleep=5 )
     # Load configuration files
     main.step( "Load configurations" )
-    main.cfgName = "TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1"
+    main.cfgName = "TEST_CONFIG_ipv4=1_ipv6=1"
     lib.loadJson( main )
     time.sleep( float( main.params[ "timers" ][ "loadNetcfgSleep" ] ) )
     main.cfgName = "common"
diff --git a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/conf/zebradbgp1.conf b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/conf/zebradbgp1.conf
index 34472bb..d4f09ea 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/conf/zebradbgp1.conf
+++ b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/conf/zebradbgp1.conf
@@ -6,4 +6,4 @@
 !
 ip route 0.0.0.0/0 172.16.0.1
 !
-fpm connection ip 10.192.19.121 port 2620
+fpm connection ip 10.128.100.67 port 2620
diff --git a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/conf/zebradbgp2.conf b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/conf/zebradbgp2.conf
index 9c6e3f4..95e97fd 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/conf/zebradbgp2.conf
+++ b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/conf/zebradbgp2.conf
@@ -6,4 +6,4 @@
 !
 ip route 0.0.0.0/0 172.16.0.1
 !
-fpm connection ip 10.192.19.122 port 2620
+fpm connection ip 10.128.100.69 port 2620
diff --git a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/host/common.host b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/host/common.host
index c0dd913..bdcf863 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/host/common.host
+++ b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/host/common.host
@@ -4,7 +4,7 @@
         "00:AA:00:00:00:02/None": "10.2.0.1",
         "00:AA:00:00:00:03/None": "10.2.30.1",
         "00:AA:00:00:00:06/None": "10.3.0.1",
-        "00:AA:00:00:00:08/40": "10.3.30.1",
+        "00:AA:00:00:00:08/60": "10.3.30.1",
         "00:BB:00:00:00:01/None": "1000::3fe",
         "00:BB:00:00:00:02/None": "1002::3fe"
     },
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.json b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1.json
similarity index 85%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.json
rename to TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1.json
index d1ed5c3..3098edf 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1.json
@@ -4,7 +4,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1011::3ff/120" ],
-                    "vlan-tagged": [10]
+                    "vlan-tagged": [127]
                 }
             ]
         },
@@ -12,7 +12,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1012::3ff/120" ],
-                    "vlan-untagged": 20
+                    "vlan-untagged": 26
                 }
             ]
         },       
@@ -20,7 +20,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.5.10.254/24" ],
-                    "vlan-tagged": [10]
+                    "vlan-tagged": [80]
                 }
             ]
         },
@@ -28,16 +28,47 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.5.20.254/24" ],
-                    "vlan-untagged": 20
+                    "vlan-untagged": 35
                 }
             ]
         },
-    
+        "of:0000000000000002/5" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "1003::3ff/120" , "1004::3ff/120", "10.2.30.254/24", "10.2.20.254/24"],
+                    "vlan-tagged": [ 121 , 30 ]
+                }
+            ]
+        },
+        "of:0000000000000003/5" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "1003::3ff/120" , "1004::3ff/120", "10.2.30.254/24", "10.2.20.254/24"],
+                    "vlan-tagged": [ 121, 30 ]
+                }
+            ]
+        },
+        "of:0000000000000004/5" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "1008::3ff/120", "1009::3ff/120", "10.3.10.254/24", "10.3.30.254/24" ],
+                    "vlan-tagged": [ 124, 125, 50, 60 ]
+                }
+            ]
+        },
+        "of:0000000000000005/5" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "1008::3ff/120", "1009::3ff/120", "10.3.10.254/24", "10.3.30.254/24" ],
+                    "vlan-tagged": [ 124, 125, 50, 60 ]
+                }
+            ]
+        },
         "of:0000000000000001/3" : {
             "interfaces" : [
                 {
                     "ips" : [ "1000::3ff/120" ],
-                    "vlan-untagged": 10
+                    "vlan-untagged": 21
                 }
             ]
         },
@@ -45,7 +76,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1001::3ff/120" ],
-                    "vlan-untagged": 10
+                    "vlan-untagged": 22
                 }
             ]
         },
@@ -61,7 +92,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.1.10.254/24" ],
-                    "vlan-untagged": 10
+                    "vlan-untagged": 11
                 }
             ]
         },
@@ -69,7 +100,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1002::3ff/120" ],
-                    "vlan-untagged": 10
+                    "vlan-untagged": 23
                 }
             ]
         },
@@ -77,7 +108,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 15
+                    "vlan-untagged": 24
                 }
             ]
         },
@@ -85,7 +116,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [30]
+                    "vlan-tagged": [121]
                 }
             ]
         },
@@ -93,7 +124,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.2.0.254/24" ],
-                    "vlan-untagged": 10
+                    "vlan-untagged": 12
                 }
             ]
         },
@@ -117,7 +148,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 15
+                    "vlan-untagged": 24
                 }
             ]
         },
@@ -125,7 +156,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [30]
+                    "vlan-tagged": [121]
                 }
             ]
         }, 
@@ -133,7 +164,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1005::3ff/120" ],
-                    "vlan-tagged": [20]
+                    "vlan-tagged": [122]
                 }
             ]
         },
@@ -141,7 +172,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1006::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [123]
                 }
             ]
         },
@@ -149,7 +180,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 15
+                    "vlan-untagged": 16
                 }
             ]
         },
@@ -181,7 +212,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1007::3ff/120" ],
-                    "vlan-untagged": 30
+                    "vlan-untagged": 25
                 }
             ]
         },
@@ -189,7 +220,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [124]
                 }
             ]
         },
@@ -197,7 +228,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [125]
                 }
             ]
         },
@@ -205,7 +236,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.0.254/24" ],
-                    "vlan-untagged": 30
+                    "vlan-untagged": 25
                 }
             ]
         },
@@ -213,7 +244,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [50]
                 }
             ]
         },
@@ -221,7 +252,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [60]
                 }
             ]
         },
@@ -256,7 +287,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [124]
                 }
             ]
         },
@@ -264,7 +295,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [125]
                 }
             ]
         },
@@ -272,7 +303,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1010::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [126]
                 }
             ]
         },
@@ -280,7 +311,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [50]
                 }
             ]
         },
@@ -288,7 +319,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [60]
                 }
             ]
         },
@@ -296,7 +327,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.20.254/24" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [70]
                 }
             ]
         },
@@ -334,43 +365,43 @@
         }
     },
     "hosts" : { 
-	"00:BB:00:00:01:0A/10" : {
+	"00:BB:00:00:01:0A/127" : {
 		"basic": {
 			"locations": ["of:0000000000000006/3"],
 			"ips": ["1011::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:04/30" : {
+	"00:bb:00:00:00:04/121" : {
 		"basic": {
 			"locations": ["of:0000000000000003/7","of:0000000000000002/8"],
 			"ips": ["1004::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:05/20" : {
+	"00:bb:00:00:00:05/122" : {
 		"basic": {
 			"locations": ["of:0000000000000003/8"],
 			"ips": ["1005::3fe"]
 		     }
 	    },
-	"00:bb:00:00:01:05/40" : {
+	"00:bb:00:00:01:05/123" : {
 		"basic": {
 			"locations": ["of:0000000000000003/9"],
 			"ips": ["1006::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:07/40" : {
+	"00:bb:00:00:00:07/124" : {
 		"basic": {
 			"locations": ["of:0000000000000005/6", "of:0000000000000004/7"],
 			"ips": ["1008::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:08/40" : {
+	"00:bb:00:00:00:08/125" : {
 		"basic": {
 			"locations": ["of:0000000000000004/8","of:0000000000000005/7"],
 			"ips": ["1009::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:0A/40" : {
+	"00:bb:00:00:00:0A/126" : {
 		"basic": {
 			"locations": ["of:0000000000000005/8"],
 			"ips": ["1010::3fe"]
diff --git a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.json b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.json
deleted file mode 100644
index 7c6b51e..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.json
+++ /dev/null
@@ -1,580 +0,0 @@
-{
-    "ports" : {
-         "of:0000000000000006/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1011::3ff/120" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000006/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1012::3ff/120" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-	"of:0000000000000006/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.5.10.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000006/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.5.20.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1000::3ff/120" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1001::3ff/120" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.1.0.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.1.10.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1002::3ff/120" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000002/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.0.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/10" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 16
-                }
-            ]
-        },
-        "of:0000000000000002/11" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.20.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000003/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1005::3ff/120" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-	"of:0000000000000003/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1006::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000003/10" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        },
-        "of:0000000000000003/11" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.20.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000003/12" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.10.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-	"of:0000000000000003/13" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.40.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1007::3ff/120" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.0.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000004/10" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/11" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/12" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.1.254/24", "10.0.7.254/24", "2000::1ff/120", "2000::7ff/120" ],
-			"vlan-tagged": [110, 170]
-
-                }
-            ]
-        },
-        "of:0000000000000004/13" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.1.254/24", "2000::1ff/120"],
-			"vlan-untagged": 110
-
-                }
-            ]
-        },
-        "of:0000000000000004/14" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.7.254/24", "2000::7ff/120" ],
-			"vlan-untagged": 170
-
-                }
-            ]
-        },
-        "of:0000000000000005/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1010::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/10" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/11" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.20.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/12" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.5.254/24", "10.0.6.254/24", "2000::5ff/120", "2000::6ff/120" ],
-	               "vlan-tagged": [150, 160]
-                }
-            ]
-        },
-        "of:0000000000000005/13" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.5.254/24", "2000::5ff/120"],
-	               "vlan-untagged": 150
-                }
-            ]
-        },
-        "of:0000000000000005/14" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.6.254/24", "2000::6ff/120" ],
-	               "vlan-untagged": 160
-                }
-            ]
-        },
-        "of:0000000000000005/15" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        }
-    },
-    "hosts" : {
-	"00:BB:00:00:01:0A/10" : {
-		"basic": {
-			"locations": ["of:0000000000000006/3"],
-			"ips": ["1011::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:04/30" : {
-		"basic": {
-			"locations": ["of:0000000000000003/7","of:0000000000000002/8"],
-			"ips": ["1004::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:05/20" : {
-		"basic": {
-			"locations": ["of:0000000000000003/8"],
-			"ips": ["1005::3fe"]
-		     }
-	    },
-	"00:bb:00:00:01:05/40" : {
-		"basic": {
-			"locations": ["of:0000000000000003/9"],
-			"ips": ["1006::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:07/40" : {
-		"basic": {
-			"locations": ["of:0000000000000005/6", "of:0000000000000004/7"],
-			"ips": ["1008::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:08/40" : {
-		"basic": {
-			"locations": ["of:0000000000000004/8","of:0000000000000005/7"],
-			"ips": ["1009::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:0A/40" : {
-		"basic": {
-			"locations": ["of:0000000000000005/8"],
-			"ips": ["1010::3fe"]
-		     }
-	    }
-    },
-    "devices" : {
-	"of:0000000000000006" : {
-            "segmentrouting" : {
-                "name" : "s006",
-                "ipv4NodeSid" : 1006,
-		"ipv6NodeSid" : 2006,
-		"ipv6Loopback" : "2000::c0a8:0006",
-                "ipv4Loopback" : "192.168.0.6",
-                "routerMac" : "00:00:00:00:00:06",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s006",
-                "driver" : "ofdpa-ovs",
-		"latitude":30,
-		"longitude":-110
-            }
-        },
-        "of:0000000000000103" : {
-            "segmentrouting" : {
-                "name" : "s103",
-                "ipv4NodeSid" : 1103,
-                "ipv4Loopback" : "192.168.0.103",
-		"ipv6NodeSid" : 2103,
-		"ipv6Loopback" : "2000::c0a8:0203",
-                "routerMac" : "00:00:00:00:01:03",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                 "name" : "s103",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":35,
-		 "longitude":-115
-            }
-        },
-        "of:0000000000000104" : {
-            "segmentrouting" : {
-                "name" : "s104",
-                "ipv4NodeSid" : 1104,
-                "ipv4Loopback" : "192.168.0.104",
-		"ipv6NodeSid" : 2104,
-		"ipv6Loopback" : "2000::c0a8:0204",
-                "routerMac" : "00:00:00:00:01:04",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s104",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":35,
-		 "longitude":-110
-            }
-    	},
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "name" : "s001",
-                "ipv4NodeSid" : 1001,
-		"ipv6NodeSid" : 2001,
-		"ipv6Loopback" : "2000::c0a8:0001",
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s001",
-                "driver" : "ofdpa-ovs",
-		"latitude":30,
-		"longitude":-105
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "name" : "s002",
-                "ipv4NodeSid" : 1002,
-                "ipv4Loopback" : "192.168.0.2",
-		"ipv6NodeSid" : 2002,
-		"ipv6Loopback" : "2000::c0a8:0002",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000003",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s002",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,
-		"longitude":-95
-            }
-        },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "name" : "s003",
-                "ipv4NodeSid" : 1003,
-                "ipv4Loopback" : "192.168.0.3",
-        	"ipv6NodeSid" : 2003,
-		"ipv6Loopback" : "2000::c0a8:0003",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000002",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s003",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,
-		"longitude":-90
-            }
-        },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "name" : "s004",
-                "ipv4NodeSid" : 1004,
-                "ipv4Loopback" : "192.168.0.4",
-		"ipv6NodeSid" : 2004,
-		"ipv6Loopback" : "2000::c0a8:0004",
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000005",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s004",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,
-		"longitude":-85
-            }
-        },
-        "of:0000000000000005" : {
-            "segmentrouting" : {
-                "name" : "s005",
-                "ipv4NodeSid" : 1005,
-                "ipv4Loopback" : "192.168.0.5",
-		"ipv6NodeSid" : 2005,
-		"ipv6Loopback" : "2000::c0a8:0005",
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000004",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s005",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,
-		"longitude":-80
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "name" : "s101",
-                "ipv4NodeSid" : 1101,
-                "ipv4Loopback" : "192.168.0.101",
-		"ipv6NodeSid" : 2101,
-		"ipv6Loopback" : "2000::c0a8:0101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s101",
-                "driver" : "ofdpa-ovs",
-		"latitude":42,
-                "longitude":-100
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "name" : "s102",
-                "ipv4NodeSid" : 1102,
-                "ipv4Loopback" : "192.168.0.102",
-		"ipv6NodeSid" : 2102,
-		"ipv6Loopback" : "2000::c0a8:0202",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s102",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":42,
-		 "longitude":-95
-            }
-        }
-    },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
-                {
-                    "dhcpServerConnectPoint": "of:0000000000000005/15",
-                    "serverIps": ["10.0.3.253", "2000::3fd"]
-                }
-            ]
-        }
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/multicast/common.multicastConfig b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/multicast/common.multicastConfig
index 4d06609..dada847 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/multicast/common.multicastConfig
+++ b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/multicast/common.multicastConfig
@@ -29,7 +29,7 @@
             },
             {
                 "host": "h10v4",
-                "id": "00:AA:00:00:00:08/40",
+                "id": "00:AA:00:00:00:08/60",
                 "dualHomed": "True"
             }
         ]
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/SRRoutingTest.py b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/SRRoutingTest.py
index 90e8129..c391c22 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/SRRoutingTest.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/SRRoutingTest.py
@@ -52,10 +52,8 @@
     lib.installOnos( main, skipPackage=skipPackage, cliSleep=5, parallel=False )
 
     # Load configuration files
-    main.cfgName = 'TEST_CONFIG_ipv4={}_ipv6={}_dhcp=1_routers=1{}{}'.format( 1 if ipv4 else 0,
-                                                                              1 if ipv6 else 0,
-                                                                              "_external=1" if external else "",
-                                                                              "_static=1" if static else "" )
+    main.cfgName = 'TEST_CONFIG_ipv4={}_ipv6={}'.format( 1 if ipv4 else 0,
+                                                         1 if ipv6 else 0)
     lib.loadJson( main )
     time.sleep( float( main.params[ 'timers' ][ 'loadNetcfgSleep' ] ) )
     lib.loadHost( main )
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=0_routers=0.chart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=0_routers=0.chart
deleted file mode 100644
index 1da27d3..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=0_routers=0.chart
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "ipv6": {"expect": "True",
-   "hosts":["h1v6", "h2v6" ,"h3v6", "h4v6", "h5v6", "h6v6", "h7v6", "h8v6", "h9v6", "h10v6", "h11v6" ,"h12v6" ,"h13v6"]}
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=0.chart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=0.chart
deleted file mode 100644
index 1da27d3..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=0.chart
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "ipv6": {"expect": "True",
-   "hosts":["h1v6", "h2v6" ,"h3v6", "h4v6", "h5v6", "h6v6", "h7v6", "h8v6", "h9v6", "h10v6", "h11v6" ,"h12v6" ,"h13v6"]}
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.chart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.chart
deleted file mode 100644
index 3a0c315..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.chart
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "ipv6": { "expect": "True",
-            "hosts": ["h1v6", "h2v6" ,"h3v6", "h4v6", "h5v6", "h6v6", "h7v6", "h8v6", "h9v6", "h10v6", "h11v6" ,"h12v6" ,"h13v6"] }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.chart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.chart
deleted file mode 100644
index ae2bd4a..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.chart
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "ipv6": { "expect": "True",
-            "hosts": ["h1v6", "h2v6" ,"h3v6", "h4v6", "h5v6", "h6v6", "h7v6", "h8v6", "h9v6", "h10v6", "h11v6" ,"h12v6" ,"h13v6"] },
-  "ipv6-remote": { "expect": "Unidirectional",
-                   "src": ["h1v6", "h2v6" ,"h3v6", "h4v6", "h5v6", "h6v6", "h7v6", "h8v6", "h9v6", "h10v6", "h11v6" ,"h12v6" ,"h13v6"],
-                   "dst": ["rh1v6", "rh11v6", "rh2v6", "rh22v6"] }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.chart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.chart
deleted file mode 100644
index 99a8901..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.chart
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "ipv6-remote": { "expect": "Unidirectional",
-                   "src": ["h1v6", "h2v6" ,"h3v6", "h4v6", "h5v6", "h6v6", "h7v6", "h8v6", "h9v6", "h10v6", "h11v6" ,"h12v6" ,"h13v6"],
-                   "dst": ["rh5v6"] }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=0_routers=0.chart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=0_routers=0.chart
deleted file mode 100644
index ea0672c..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=0_routers=0.chart
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "ipv4": {"expect": "True",
-    "hosts":["h1v4", "h2v4" ,"h3v4", "h4v4", "h5v4", "h6v4", "h7v4", "h8v4", "h9v4", "h10v4", "h11v4" ,"h12v4" ,"h13v4"]}
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=0.chart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=0.chart
deleted file mode 100644
index ea0672c..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=0.chart
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "ipv4": {"expect": "True",
-    "hosts":["h1v4", "h2v4" ,"h3v4", "h4v4", "h5v4", "h6v4", "h7v4", "h8v4", "h9v4", "h10v4", "h11v4" ,"h12v4" ,"h13v4"]}
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.chart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.chart
deleted file mode 100644
index 5c2ab2a..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.chart
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "ipv4": { "expect": "True",
-            "hosts": ["h1v4", "h2v4" ,"h3v4", "h4v4", "h5v4", "h6v4", "h7v4", "h8v4", "h9v4", "h10v4", "h11v4" ,"h12v4" ,"h13v4"] }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.chart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.chart
deleted file mode 100644
index ec9e0d2..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.chart
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "ipv4": { "expect": "True",
-            "hosts": ["h1v4", "h2v4" ,"h3v4", "h4v4", "h5v4", "h6v4", "h7v4", "h8v4", "h9v4", "h10v4", "h11v4" ,"h12v4" ,"h13v4"] },
-  "ipv4-remote": { "expect": "Unidirectional",
-                   "src": ["h1v4", "h2v4" ,"h3v4", "h4v4", "h5v4", "h6v4", "h7v4", "h8v4", "h9v4", "h10v4", "h11v4" ,"h12v4" ,"h13v4"],
-                   "dst": ["rh1v4", "rh2v4"] }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.chart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.chart
deleted file mode 100644
index c26664b..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.chart
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "ipv4-remote": { "expect": "Unidirectional",
-                   "src": ["h1v4", "h2v4" ,"h3v4", "h4v4", "h5v4", "h6v4", "h7v4", "h8v4", "h9v4", "h10v4", "h11v4" ,"h12v4" ,"h13v4"],
-                   "dst": ["rh5v4"] }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=0_routers=0.chart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=0_routers=0.chart
deleted file mode 100644
index f22f4a8..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=0_routers=0.chart
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "ipv4": {"expect": "True",
-    "hosts":["h1v4", "h2v4" ,"h3v4", "h4v4", "h5v4", "h6v4", "h7v4", "h8v4", "h9v4", "h10v4", "h11v4" ,"h12v4" ,"h13v4"]}
-  "ipv6": {"expect": "True",
-    "hosts":["h1v6", "h2v6" ,"h3v6", "h4v6", "h5v6", "h6v6", "h7v6", "h8v6", "h9v6", "h10v6", "h11v6" ,"h12v6" ,"h13v6"]}
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=0.chart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=0.chart
deleted file mode 100644
index a4f8f4c..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=0.chart
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "ipv6": {"expect": "True",
-	   "hosts": ["h1v6", "h2v6" ,"h3v6", "h4v6", "h5v6", "h6v6", "h7v6", "h8v6", "h9v6", "h10v6", "h11v6" ,"h12v6" ,"h13v6"]},
-  "ipv4": {"expect": "True",
-           "hosts": ["h1v4", "h2v4" ,"h3v4", "h4v4", "h5v4", "h6v4", "h7v4", "h8v4", "h9v4", "h10v4", "h11v4" ,"h12v4" ,"h13v4"]}
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.chart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.chart
deleted file mode 100644
index f39fb26..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.chart
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "ipv4": { "expect": "True",
-            "hosts": ["h1v4", "h2v4" ,"h3v4", "h4v4", "h5v4", "h6v4", "h7v4", "h8v4", "h9v4", "h10v4", "h11v4" ,"h12v4" ,"h13v4"] },
-  "ipv6": { "expect": "True",
-            "hosts": ["h1v6", "h2v6" ,"h3v6", "h4v6", "h5v6", "h6v6", "h7v6", "h8v6", "h9v6", "h10v6", "h11v6" ,"h12v6" ,"h13v6"] }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.chart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.chart
deleted file mode 100644
index 6648fb1..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.chart
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "ipv4": { "expect": "True",
-            "hosts": ["h1v4", "h2v4" ,"h3v4", "h4v4", "h5v4", "h6v4", "h7v4", "h8v4", "h9v4", "h10v4", "h11v4" ,"h12v4" ,"h13v4"] },
-  "ipv4-remote": { "expect": "Unidirectional",
-                   "src": ["h1v4", "h2v4" ,"h3v4", "h4v4", "h5v4", "h6v4", "h7v4", "h8v4", "h9v4", "h10v4", "h11v4" ,"h12v4" ,"h13v4"],
-                   "dst": ["rh1v4", "rh2v4"] },
-  "ipv6": { "expect": "True",
-            "hosts": ["h1v6", "h2v6" ,"h3v6", "h4v6", "h5v6", "h6v6", "h7v6", "h8v6", "h9v6", "h10v6", "h11v6" ,"h12v6" ,"h13v6"] },
-  "ipv6-remote": { "expect": "Unidirectional",
-                   "src": ["h1v6", "h2v6" ,"h3v6", "h4v6", "h5v6", "h6v6", "h7v6", "h8v6", "h9v6", "h10v6", "h11v6" ,"h12v6" ,"h13v6"],
-                   "dst": ["rh1v6", "rh11v6", "rh2v6", "rh22v6"] }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.chart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.chart
deleted file mode 100644
index 492fd36..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.chart
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "ipv4-remote": { "expect": "Unidirectional",
-                   "src": ["h1v4", "h2v4" ,"h3v4", "h4v4", "h5v4", "h6v4", "h7v4", "h8v4", "h9v4", "h10v4", "h11v4" ,"h12v4" ,"h13v4"],
-                   "dst": ["rh5v4"] },
-  "ipv6-remote": { "expect": "Unidirectional",
-                   "src": ["h1v6", "h2v6" ,"h3v6", "h4v6", "h5v6", "h6v6", "h7v6", "h8v6", "h9v6", "h10v6", "h11v6" ,"h12v6" ,"h13v6"],
-                   "dst": ["rh5v6"] }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.host b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=0_ipv6=1.host
similarity index 69%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.host
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=0_ipv6=1.host
index bb0de60..087d1fe 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.host
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=0_ipv6=1.host
@@ -5,14 +5,14 @@
         "00:BB:00:00:01:01/None": "1001::3fe",
         "00:BB:00:00:00:02/None": "1002::3fe",
         "00:BB:00:00:00:03/None": "1003::3fe",
-        "00:BB:00:00:00:04/30": "1004::3fe",
-        "00:BB:00:00:00:05/20": "1005::3fe",
-        "00:BB:00:00:01:05/40": "1006::3fe",
+        "00:BB:00:00:00:04/121": "1004::3fe",
+        "00:BB:00:00:00:05/122": "1005::3fe",
+        "00:BB:00:00:01:05/123": "1006::3fe",
         "00:BB:00:00:00:06/None": "1007::3fe",
-        "00:BB:00:00:00:07/40": "1008::3fe",
-        "00:BB:00:00:00:08/40": "1009::3fe",
-        "00:BB:00:00:00:0A/40": "1010::3fe",
-	"00:BB:00:00:01:0A/10": "1011::3fe",
+        "00:BB:00:00:00:07/124": "1008::3fe",
+        "00:BB:00:00:00:08/125": "1009::3fe",
+        "00:BB:00:00:00:0A/126": "1010::3fe",
+	"00:BB:00:00:01:0A/127": "1011::3fe",
 	"00:BB:00:00:02:0A/None": "1012::3fe"
     },
     "network":
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.host b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.host
deleted file mode 100644
index bb0de60..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.host
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "onos":
-    {
-        "00:BB:00:00:00:01/None": "1000::3fe",
-        "00:BB:00:00:01:01/None": "1001::3fe",
-        "00:BB:00:00:00:02/None": "1002::3fe",
-        "00:BB:00:00:00:03/None": "1003::3fe",
-        "00:BB:00:00:00:04/30": "1004::3fe",
-        "00:BB:00:00:00:05/20": "1005::3fe",
-        "00:BB:00:00:01:05/40": "1006::3fe",
-        "00:BB:00:00:00:06/None": "1007::3fe",
-        "00:BB:00:00:00:07/40": "1008::3fe",
-        "00:BB:00:00:00:08/40": "1009::3fe",
-        "00:BB:00:00:00:0A/40": "1010::3fe",
-	"00:BB:00:00:01:0A/10": "1011::3fe",
-	"00:BB:00:00:02:0A/None": "1012::3fe"
-    },
-    "network":
-    {
-        "h1v6": "1000::3fe",
-        "h2v6": "1001::3fe",
-        "h3v6": "1002::3fe",
-        "h4v6": "1003::3fe",
-        "h5v6": "1004::3fe",
-        "h6v6": "1005::3fe",
-        "h7v6": "1006::3fe",
-        "h8v6": "1007::3fe",
-        "h9v6": "1008::3fe",
-        "h10v6": "1009::3fe",
-        "h11v6": "1010::3fe",
-        "h12v6": "1011::3fe",
-        "h13v6": "1012::3fe"
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.host b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.host
deleted file mode 100644
index bb0de60..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.host
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "onos":
-    {
-        "00:BB:00:00:00:01/None": "1000::3fe",
-        "00:BB:00:00:01:01/None": "1001::3fe",
-        "00:BB:00:00:00:02/None": "1002::3fe",
-        "00:BB:00:00:00:03/None": "1003::3fe",
-        "00:BB:00:00:00:04/30": "1004::3fe",
-        "00:BB:00:00:00:05/20": "1005::3fe",
-        "00:BB:00:00:01:05/40": "1006::3fe",
-        "00:BB:00:00:00:06/None": "1007::3fe",
-        "00:BB:00:00:00:07/40": "1008::3fe",
-        "00:BB:00:00:00:08/40": "1009::3fe",
-        "00:BB:00:00:00:0A/40": "1010::3fe",
-	"00:BB:00:00:01:0A/10": "1011::3fe",
-	"00:BB:00:00:02:0A/None": "1012::3fe"
-    },
-    "network":
-    {
-        "h1v6": "1000::3fe",
-        "h2v6": "1001::3fe",
-        "h3v6": "1002::3fe",
-        "h4v6": "1003::3fe",
-        "h5v6": "1004::3fe",
-        "h6v6": "1005::3fe",
-        "h7v6": "1006::3fe",
-        "h8v6": "1007::3fe",
-        "h9v6": "1008::3fe",
-        "h10v6": "1009::3fe",
-        "h11v6": "1010::3fe",
-        "h12v6": "1011::3fe",
-        "h13v6": "1012::3fe"
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.host b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=0.host
similarity index 82%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.host
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=0.host
index 0175e2a..8b7f5a7 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.host
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=0.host
@@ -9,10 +9,10 @@
         "00:AA:00:00:00:05/20": "10.2.10.1",
         "00:AA:00:00:01:05/40": "10.2.40.1",
         "00:AA:00:00:00:06/None": "10.3.0.1",
-        "00:AA:00:00:00:07/40": "10.3.10.1",
-        "00:AA:00:00:00:08/40": "10.3.30.1",
-        "00:AA:00:00:00:0A/40": "10.3.20.1",
-	"00:AA:00:00:02:01/10": "10.5.10.1",
+        "00:AA:00:00:00:07/50": "10.3.10.1",
+        "00:AA:00:00:00:08/60": "10.3.30.1",
+        "00:AA:00:00:00:0A/70": "10.3.20.1",
+	"00:AA:00:00:02:01/80": "10.5.10.1",
 	"00:AA:00:00:02:02/None": "10.5.20.1"	
     },
     "network":
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.host b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.host
deleted file mode 100644
index 0175e2a..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.host
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "onos":
-    {
-        "00:AA:00:00:00:01/None": "10.1.0.1",
-        "00:AA:00:00:01:01/None": "10.1.10.1",
-        "00:AA:00:00:00:02/None": "10.2.0.1",
-        "00:AA:00:00:00:03/None": "10.2.30.1",
-        "00:AA:00:00:00:04/30": "10.2.20.1",
-        "00:AA:00:00:00:05/20": "10.2.10.1",
-        "00:AA:00:00:01:05/40": "10.2.40.1",
-        "00:AA:00:00:00:06/None": "10.3.0.1",
-        "00:AA:00:00:00:07/40": "10.3.10.1",
-        "00:AA:00:00:00:08/40": "10.3.30.1",
-        "00:AA:00:00:00:0A/40": "10.3.20.1",
-	"00:AA:00:00:02:01/10": "10.5.10.1",
-	"00:AA:00:00:02:02/None": "10.5.20.1"	
-    },
-    "network":
-    {
-        "h1v4": "10.1.0.1",
-        "h2v4": "10.1.10.1",
-        "h3v4": "10.2.0.1",
-        "h4v4": "10.2.30.1",
-        "h5v4": "10.2.20.1",
-        "h6v4": "10.2.10.1",
-        "h7v4": "10.2.40.1",
-        "h8v4": "10.3.0.1",
-        "h9v4": "10.3.10.1",
-        "h10v4": "10.3.30.1",
-        "h11v4": "10.3.20.1",
-	"h12v4": "10.5.10.1",
-	"h13v4": "10.5.20.1"
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.host b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.host
deleted file mode 100644
index 0175e2a..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.host
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "onos":
-    {
-        "00:AA:00:00:00:01/None": "10.1.0.1",
-        "00:AA:00:00:01:01/None": "10.1.10.1",
-        "00:AA:00:00:00:02/None": "10.2.0.1",
-        "00:AA:00:00:00:03/None": "10.2.30.1",
-        "00:AA:00:00:00:04/30": "10.2.20.1",
-        "00:AA:00:00:00:05/20": "10.2.10.1",
-        "00:AA:00:00:01:05/40": "10.2.40.1",
-        "00:AA:00:00:00:06/None": "10.3.0.1",
-        "00:AA:00:00:00:07/40": "10.3.10.1",
-        "00:AA:00:00:00:08/40": "10.3.30.1",
-        "00:AA:00:00:00:0A/40": "10.3.20.1",
-	"00:AA:00:00:02:01/10": "10.5.10.1",
-	"00:AA:00:00:02:02/None": "10.5.20.1"	
-    },
-    "network":
-    {
-        "h1v4": "10.1.0.1",
-        "h2v4": "10.1.10.1",
-        "h3v4": "10.2.0.1",
-        "h4v4": "10.2.30.1",
-        "h5v4": "10.2.20.1",
-        "h6v4": "10.2.10.1",
-        "h7v4": "10.2.40.1",
-        "h8v4": "10.3.0.1",
-        "h9v4": "10.3.10.1",
-        "h10v4": "10.3.30.1",
-        "h11v4": "10.3.20.1",
-	"h12v4": "10.5.10.1",
-	"h13v4": "10.5.20.1"
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.host b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=1.host
similarity index 74%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.host
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=1.host
index 06eccf9..17a78c3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.host
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=1.host
@@ -9,24 +9,25 @@
         "00:AA:00:00:00:05/20": "10.2.10.1",
         "00:AA:00:00:01:05/40": "10.2.40.1",
         "00:AA:00:00:00:06/None": "10.3.0.1",
-        "00:AA:00:00:00:07/40": "10.3.10.1",
-        "00:AA:00:00:00:08/40": "10.3.30.1",
-        "00:AA:00:00:00:0A/40": "10.3.20.1",
-	"00:AA:00:00:02:01/10": "10.5.10.1",
+        "00:AA:00:00:00:07/50": "10.3.10.1",
+        "00:AA:00:00:00:08/60": "10.3.30.1",
+        "00:AA:00:00:00:0A/70": "10.3.20.1",
+	"00:AA:00:00:02:01/80": "10.5.10.1",
 	"00:AA:00:00:02:02/None": "10.5.20.1",
         "00:BB:00:00:00:01/None": "1000::3fe",
         "00:BB:00:00:01:01/None": "1001::3fe",
         "00:BB:00:00:00:02/None": "1002::3fe",
         "00:BB:00:00:00:03/None": "1003::3fe",
-        "00:BB:00:00:00:04/30": "1004::3fe",
-        "00:BB:00:00:00:05/20": "1005::3fe",
-        "00:BB:00:00:01:05/40": "1006::3fe",
+        "00:BB:00:00:00:04/121": "1004::3fe",
+        "00:BB:00:00:00:05/122": "1005::3fe",
+        "00:BB:00:00:01:05/123": "1006::3fe",
         "00:BB:00:00:00:06/None": "1007::3fe",
-        "00:BB:00:00:00:07/40": "1008::3fe",
-        "00:BB:00:00:00:08/40": "1009::3fe",
-        "00:BB:00:00:00:0A/40": "1010::3fe",
-	"00:BB:00:00:01:0A/10": "1011::3fe",
+        "00:BB:00:00:00:07/124": "1008::3fe",
+        "00:BB:00:00:00:08/125": "1009::3fe",
+        "00:BB:00:00:00:0A/126": "1010::3fe",
+	"00:BB:00:00:01:0A/127": "1011::3fe",
 	"00:BB:00:00:02:0A/None": "1012::3fe"
+ 
     },
     "network":
     {
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.host b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.host
deleted file mode 100644
index 06eccf9..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.host
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "onos":
-    {
-        "00:AA:00:00:00:01/None": "10.1.0.1",
-        "00:AA:00:00:01:01/None": "10.1.10.1",
-        "00:AA:00:00:00:02/None": "10.2.0.1",
-        "00:AA:00:00:00:03/None": "10.2.30.1",
-        "00:AA:00:00:00:04/30": "10.2.20.1",
-        "00:AA:00:00:00:05/20": "10.2.10.1",
-        "00:AA:00:00:01:05/40": "10.2.40.1",
-        "00:AA:00:00:00:06/None": "10.3.0.1",
-        "00:AA:00:00:00:07/40": "10.3.10.1",
-        "00:AA:00:00:00:08/40": "10.3.30.1",
-        "00:AA:00:00:00:0A/40": "10.3.20.1",
-	"00:AA:00:00:02:01/10": "10.5.10.1",
-	"00:AA:00:00:02:02/None": "10.5.20.1",
-        "00:BB:00:00:00:01/None": "1000::3fe",
-        "00:BB:00:00:01:01/None": "1001::3fe",
-        "00:BB:00:00:00:02/None": "1002::3fe",
-        "00:BB:00:00:00:03/None": "1003::3fe",
-        "00:BB:00:00:00:04/30": "1004::3fe",
-        "00:BB:00:00:00:05/20": "1005::3fe",
-        "00:BB:00:00:01:05/40": "1006::3fe",
-        "00:BB:00:00:00:06/None": "1007::3fe",
-        "00:BB:00:00:00:07/40": "1008::3fe",
-        "00:BB:00:00:00:08/40": "1009::3fe",
-        "00:BB:00:00:00:0A/40": "1010::3fe",
-	"00:BB:00:00:01:0A/10": "1011::3fe",
-	"00:BB:00:00:02:0A/None": "1012::3fe"
-    },
-    "network":
-    {
-        "h1v4": "10.1.0.1",
-        "h2v4": "10.1.10.1",
-        "h3v4": "10.2.0.1",
-        "h4v4": "10.2.30.1",
-        "h5v4": "10.2.20.1",
-        "h6v4": "10.2.10.1",
-        "h7v4": "10.2.40.1",
-        "h8v4": "10.3.0.1",
-        "h9v4": "10.3.10.1",
-        "h10v4": "10.3.30.1",
-        "h11v4": "10.3.20.1",
-	"h12v4": "10.5.10.1",
-	"h13v4": "10.5.20.1",
-        "h1v6": "1000::3fe",
-        "h2v6": "1001::3fe",
-        "h3v6": "1002::3fe",
-        "h4v6": "1003::3fe",
-        "h5v6": "1004::3fe",
-        "h6v6": "1005::3fe",
-        "h7v6": "1006::3fe",
-        "h8v6": "1007::3fe",
-        "h9v6": "1008::3fe",
-        "h10v6": "1009::3fe",
-        "h11v6": "1010::3fe",
-        "h12v6": "1011::3fe",
-        "h13v6": "1012::3fe"
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.host b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.host
deleted file mode 100644
index 06eccf9..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.host
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "onos":
-    {
-        "00:AA:00:00:00:01/None": "10.1.0.1",
-        "00:AA:00:00:01:01/None": "10.1.10.1",
-        "00:AA:00:00:00:02/None": "10.2.0.1",
-        "00:AA:00:00:00:03/None": "10.2.30.1",
-        "00:AA:00:00:00:04/30": "10.2.20.1",
-        "00:AA:00:00:00:05/20": "10.2.10.1",
-        "00:AA:00:00:01:05/40": "10.2.40.1",
-        "00:AA:00:00:00:06/None": "10.3.0.1",
-        "00:AA:00:00:00:07/40": "10.3.10.1",
-        "00:AA:00:00:00:08/40": "10.3.30.1",
-        "00:AA:00:00:00:0A/40": "10.3.20.1",
-	"00:AA:00:00:02:01/10": "10.5.10.1",
-	"00:AA:00:00:02:02/None": "10.5.20.1",
-        "00:BB:00:00:00:01/None": "1000::3fe",
-        "00:BB:00:00:01:01/None": "1001::3fe",
-        "00:BB:00:00:00:02/None": "1002::3fe",
-        "00:BB:00:00:00:03/None": "1003::3fe",
-        "00:BB:00:00:00:04/30": "1004::3fe",
-        "00:BB:00:00:00:05/20": "1005::3fe",
-        "00:BB:00:00:01:05/40": "1006::3fe",
-        "00:BB:00:00:00:06/None": "1007::3fe",
-        "00:BB:00:00:00:07/40": "1008::3fe",
-        "00:BB:00:00:00:08/40": "1009::3fe",
-        "00:BB:00:00:00:0A/40": "1010::3fe",
-	"00:BB:00:00:01:0A/10": "1011::3fe",
-	"00:BB:00:00:02:0A/None": "1012::3fe"
-    },
-    "network":
-    {
-        "h1v4": "10.1.0.1",
-        "h2v4": "10.1.10.1",
-        "h3v4": "10.2.0.1",
-        "h4v4": "10.2.30.1",
-        "h5v4": "10.2.20.1",
-        "h6v4": "10.2.10.1",
-        "h7v4": "10.2.40.1",
-        "h8v4": "10.3.0.1",
-        "h9v4": "10.3.10.1",
-        "h10v4": "10.3.30.1",
-        "h11v4": "10.3.20.1",
-	"h12v4": "10.5.10.1",
-	"h13v4": "10.5.20.1",
-        "h1v6": "1000::3fe",
-        "h2v6": "1001::3fe",
-        "h3v6": "1002::3fe",
-        "h4v6": "1003::3fe",
-        "h5v6": "1004::3fe",
-        "h6v6": "1005::3fe",
-        "h7v6": "1006::3fe",
-        "h8v6": "1007::3fe",
-        "h9v6": "1008::3fe",
-        "h10v6": "1009::3fe",
-        "h11v6": "1010::3fe",
-        "h12v6": "1011::3fe",
-        "h13v6": "1012::3fe"
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=0_ipv6=1.json
similarity index 85%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.json
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=0_ipv6=1.json
index e2be4d5..1774bf6 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=0_ipv6=1.json
@@ -4,7 +4,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1011::3ff/120" ],
-                    "vlan-tagged": [10]
+                    "vlan-tagged": [127]
                 }
             ]
         },
@@ -12,7 +12,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1012::3ff/120" ],
-                    "vlan-untagged": 20
+                    "vlan-untagged": 26
                 }
             ]
         },  
@@ -20,7 +20,39 @@
             "interfaces" : [
                 {
                     "ips" : [ "1000::3ff/120" ],
-                    "vlan-untagged": 10
+                    "vlan-untagged": 21
+                }
+            ]
+        },
+        "of:0000000000000002/5" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "1003::3ff/120" , "1004::3ff/120"],
+                    "vlan-tagged": [ 121 ]
+                }
+            ]
+        },
+        "of:0000000000000003/5" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "1003::3ff/120" , "1004::3ff/120"],
+                    "vlan-tagged": [ 121 ]
+                }
+            ]
+        },
+        "of:0000000000000004/5" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "1008::3ff/120", "1009::3ff/120" ],
+                    "vlan-tagged": [ 124, 125 ]
+                }
+            ]
+        },
+        "of:0000000000000005/5" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "1008::3ff/120", "1009::3ff/120" ],
+                    "vlan-tagged": [ 124, 125 ]
                 }
             ]
         },
@@ -28,7 +60,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1001::3ff/120" ],
-                    "vlan-untagged": 10
+                    "vlan-untagged": 22
                 }
             ]
         },
@@ -36,7 +68,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1002::3ff/120" ],
-                    "vlan-untagged": 10
+                    "vlan-untagged": 23
                 }
             ]
         },
@@ -44,7 +76,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 15
+                    "vlan-untagged": 24
                 }
             ]
         },
@@ -52,7 +84,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [30]
+                    "vlan-tagged": [121]
                 }
             ]
         },
@@ -60,7 +92,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1005::3ff/120" ],
-                    "vlan-tagged": [20]
+                    "vlan-tagged": [122]
                 }
             ]
         },
@@ -68,7 +100,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1006::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [123]
                 }
             ]
         },
@@ -76,7 +108,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 15
+                    "vlan-untagged": 24
                 }
             ]
         },
@@ -84,7 +116,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [30]
+                    "vlan-tagged": [121]
                 }
             ]
         }, 
@@ -92,7 +124,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1007::3ff/120" ],
-                    "vlan-untagged": 30
+                    "vlan-untagged": 25
                 }
             ]
         },
@@ -100,7 +132,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [124]
                 }
             ]
         },
@@ -108,7 +140,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [125]
                 }
             ]
         },
@@ -116,7 +148,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1010::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [126]
                 }
             ]
         },
@@ -124,7 +156,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [124]
                 }
             ]
         },
@@ -132,7 +164,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [125]
                 }
             ]
         },
@@ -141,7 +173,6 @@
                 {
 			"ips" : [ "10.0.1.254/24", "10.0.7.254/24", "2000::1ff/120", "2000::7ff/120" ],
 			"vlan-tagged": [110, 170]
-
                 }
             ]
         },
@@ -150,7 +181,6 @@
                 {
 			"ips" : [ "10.0.1.254/24", "2000::1ff/120"],
 			"vlan-untagged": 110
-
                 }
             ]
         },
@@ -197,43 +227,43 @@
         }
     },
     "hosts" : { 
-	"00:BB:00:00:01:0A/10" : {
+	"00:BB:00:00:01:0A/127" : {
 		"basic": {
 			"locations": ["of:0000000000000006/3"],
 			"ips": ["1011::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:04/30" : {
+	"00:bb:00:00:00:04/121" : {
 		"basic": {
 			"locations": ["of:0000000000000003/7","of:0000000000000002/8"],
 			"ips": ["1004::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:05/20" : {
+	"00:bb:00:00:00:05/122" : {
 		"basic": {
 			"locations": ["of:0000000000000003/8"],
 			"ips": ["1005::3fe"]
 		     }
 	    },
-	"00:bb:00:00:01:05/40" : {
+	"00:bb:00:00:01:05/123" : {
 		"basic": {
 			"locations": ["of:0000000000000003/9"],
 			"ips": ["1006::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:07/40" : {
+	"00:bb:00:00:00:07/124" : {
 		"basic": {
 			"locations": ["of:0000000000000005/6", "of:0000000000000004/7"],
 			"ips": ["1008::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:08/40" : {
+	"00:bb:00:00:00:08/125" : {
 		"basic": {
 			"locations": ["of:0000000000000004/8","of:0000000000000005/7"],
 			"ips": ["1009::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:0A/40" : {
+	"00:bb:00:00:00:0A/126" : {
 		"basic": {
 			"locations": ["of:0000000000000005/8"],
 			"ips": ["1010::3fe"]
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.json
deleted file mode 100644
index e2be4d5..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.json
+++ /dev/null
@@ -1,443 +0,0 @@
-{
-    "ports" : {
-         "of:0000000000000006/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1011::3ff/120" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000006/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1012::3ff/120" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },  
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1000::3ff/120" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1001::3ff/120" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1002::3ff/120" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000003/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1005::3ff/120" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-	"of:0000000000000003/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1006::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        }, 
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1007::3ff/120" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1010::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/9" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.1.254/24", "10.0.7.254/24", "2000::1ff/120", "2000::7ff/120" ],
-			"vlan-tagged": [110, 170]
-
-                }
-            ]
-        },
-        "of:0000000000000004/10" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.1.254/24", "2000::1ff/120"],
-			"vlan-untagged": 110
-
-                }
-            ]
-        },
-        "of:0000000000000004/11" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.7.254/24", "2000::7ff/120" ],
-			"vlan-untagged": 170
-
-                }
-            ]
-        },
-        "of:0000000000000005/9" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.5.254/24", "10.0.6.254/24", "2000::5ff/120", "2000::6ff/120" ],
-	               "vlan-tagged": [150, 160]
-                }
-            ]
-        },
-        "of:0000000000000005/10" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.5.254/24", "2000::5ff/120"],
-	               "vlan-untagged": 150
-                }
-            ]
-        },
-        "of:0000000000000005/11" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.6.254/24", "2000::6ff/120" ],
-	               "vlan-untagged": 160
-                }
-            ]
-        },
-        "of:0000000000000005/12" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        }
-    },
-    "hosts" : { 
-	"00:BB:00:00:01:0A/10" : {
-		"basic": {
-			"locations": ["of:0000000000000006/3"],
-			"ips": ["1011::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:04/30" : {
-		"basic": {
-			"locations": ["of:0000000000000003/7","of:0000000000000002/8"],
-			"ips": ["1004::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:05/20" : {
-		"basic": {
-			"locations": ["of:0000000000000003/8"],
-			"ips": ["1005::3fe"]
-		     }
-	    },
-	"00:bb:00:00:01:05/40" : {
-		"basic": {
-			"locations": ["of:0000000000000003/9"],
-			"ips": ["1006::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:07/40" : {
-		"basic": {
-			"locations": ["of:0000000000000005/6", "of:0000000000000004/7"],
-			"ips": ["1008::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:08/40" : {
-		"basic": {
-			"locations": ["of:0000000000000004/8","of:0000000000000005/7"],
-			"ips": ["1009::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:0A/40" : {
-		"basic": {
-			"locations": ["of:0000000000000005/8"],
-			"ips": ["1010::3fe"]
-		     }
-	    }
-    },
-    "devices" : {
-	"of:0000000000000006" : {
-            "segmentrouting" : {
-                "name" : "s006",
-                "ipv4NodeSid" : 1006,
-		"ipv6NodeSid" : 2006,
-		"ipv6Loopback" : "2000::c0a8:0006",
-                "ipv4Loopback" : "192.168.0.6",
-                "routerMac" : "00:00:00:00:00:06",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s006",
-                "driver" : "ofdpa-ovs",
-		"latitude":30,	
-		"longitude":-110
-            }
-        },
-        "of:0000000000000103" : {
-            "segmentrouting" : {
-                "name" : "s103",
-                "ipv4NodeSid" : 1103,
-                "ipv4Loopback" : "192.168.0.103",
-		"ipv6NodeSid" : 2103,
-		"ipv6Loopback" : "2000::c0a8:0203",
-                "routerMac" : "00:00:00:00:01:03",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                 "name" : "s103",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":35,
-		 "longitude":-115
-            }
-        },
-        "of:0000000000000104" : {
-            "segmentrouting" : {
-                "name" : "s104",
-                "ipv4NodeSid" : 1104,
-                "ipv4Loopback" : "192.168.0.104",
-		"ipv6NodeSid" : 2104,
-		"ipv6Loopback" : "2000::c0a8:0204",
-                "routerMac" : "00:00:00:00:01:04",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                 "name" : "s104",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":35,
-		 "longitude":-110
-            }
-	},
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "name" : "s001",
-                "ipv4NodeSid" : 1001,
-		"ipv6NodeSid" : 2001,
-		"ipv6Loopback" : "2000::c0a8:0001",
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s001",
-                "driver" : "ofdpa-ovs",
-		"latitude":30,	
-		"longitude":-105
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "name" : "s002",
-                "ipv4NodeSid" : 1002,
-                "ipv4Loopback" : "192.168.0.2",
-		"ipv6NodeSid" : 2002,
-		"ipv6Loopback" : "2000::c0a8:0002",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000003",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s002",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-95
-            }
-        },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "name" : "s003",
-                "ipv4NodeSid" : 1003,
-                "ipv4Loopback" : "192.168.0.3",
-        	"ipv6NodeSid" : 2003,
-		"ipv6Loopback" : "2000::c0a8:0003",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000002",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s003",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-90
-            }
-        },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "name" : "s004",
-                "ipv4NodeSid" : 1004,
-                "ipv4Loopback" : "192.168.0.4",
-		"ipv6NodeSid" : 2004,
-		"ipv6Loopback" : "2000::c0a8:0004",        
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000005",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s004",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-85
-            }
-        },
-        "of:0000000000000005" : {
-            "segmentrouting" : {
-                "name" : "s005",
-                "ipv4NodeSid" : 1005,
-                "ipv4Loopback" : "192.168.0.5",
-		"ipv6NodeSid" : 2005,
-		"ipv6Loopback" : "2000::c0a8:0005", 
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000004",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s005",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-80
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "name" : "s101",
-                "ipv4NodeSid" : 1101,
-                "ipv4Loopback" : "192.168.0.101",
-		"ipv6NodeSid" : 2101,
-		"ipv6Loopback" : "2000::c0a8:0101", 
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s101",
-                "driver" : "ofdpa-ovs",
-		"latitude":42,
-                "longitude":-100
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "name" : "s102",
-                "ipv4NodeSid" : 1102,
-                "ipv4Loopback" : "192.168.0.102",
-		"ipv6NodeSid" : 2102,
-		"ipv6Loopback" : "2000::c0a8:0202",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                 "name" : "s102",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":42,
-		 "longitude":-95
-            }
-        }   
-    },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
-                {
-                    "dhcpServerConnectPoint": "of:0000000000000005/12",
-                    "serverIps": ["2000::3fd"]
-                }
-            ]
-        }
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.json
deleted file mode 100644
index e87f6c1..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.json
+++ /dev/null
@@ -1,443 +0,0 @@
-{
-    "ports" : {
-         "of:0000000000000006/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1011::3ff/120" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000006/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1012::3ff/120" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },  
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1000::3ff/120" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1001::3ff/120" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1002::3ff/120" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000003/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1005::3ff/120" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-	"of:0000000000000003/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1006::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        }, 
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1007::3ff/120" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1010::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/9" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.1.254/24", "10.0.7.254/24", "2000::1ff/120", "2000::7ff/120" ],
-			"vlan-tagged": [110, 170]
-
-                }
-            ]
-        },
-        "of:0000000000000004/10" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.1.254/24", "2000::1ff/120"],
-			"vlan-untagged": 110
-
-                }
-            ]
-        },
-        "of:0000000000000004/11" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.7.254/24", "2000::7ff/120" ],
-			"vlan-untagged": 170
-
-                }
-            ]
-        },
-        "of:0000000000000005/9" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.5.254/24", "10.0.6.254/24", "2000::5ff/120", "2000::6ff/120" ],
-	               "vlan-tagged": [150, 160]
-                }
-            ]
-        },
-        "of:0000000000000005/10" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.5.254/24", "2000::5ff/120"],
-	               "vlan-untagged": 150
-                }
-            ]
-        },
-        "of:0000000000000005/11" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.6.254/24", "2000::6ff/120" ],
-	               "vlan-untagged": 160
-                }
-            ]
-        },
-        "of:0000000000000005/12" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        }
-    },
-    "hosts" : { 
-	"00:BB:00:00:01:0A/10" : {
-		"basic": {
-			"locations": ["of:0000000000000006/3"],
-			"ips": ["1011::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:04/30" : {
-		"basic": {
-			"locations": ["of:0000000000000003/7","of:0000000000000002/8"],
-			"ips": ["1004::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:05/20" : {
-		"basic": {
-			"locations": ["of:0000000000000003/8"],
-			"ips": ["1005::3fe"]
-		     }
-	    },
-	"00:bb:00:00:01:05/40" : {
-		"basic": {
-			"locations": ["of:0000000000000003/9"],
-			"ips": ["1006::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:07/40" : {
-		"basic": {
-			"locations": ["of:0000000000000005/6", "of:0000000000000004/7"],
-			"ips": ["1008::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:08/40" : {
-		"basic": {
-			"locations": ["of:0000000000000004/8","of:0000000000000005/7"],
-			"ips": ["1009::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:0A/40" : {
-		"basic": {
-			"locations": ["of:0000000000000005/8"],
-			"ips": ["1010::3fe"]
-		     }
-	    }
-    },
-    "devices" : {
-	"of:0000000000000006" : {
-            "segmentrouting" : {
-                "name" : "s006",
-                "ipv4NodeSid" : 1006,
-		"ipv6NodeSid" : 2006,
-		"ipv6Loopback" : "2000::c0a8:0006",
-                "ipv4Loopback" : "192.168.0.6",
-                "routerMac" : "00:00:00:00:00:06",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s006",
-                "driver" : "ofdpa-ovs",
-		"latitude":30,	
-		"longitude":-110
-            }
-        },
-        "of:0000000000000103" : {
-            "segmentrouting" : {
-                "name" : "s103",
-                "ipv4NodeSid" : 1103,
-                "ipv4Loopback" : "192.168.0.103",
-		"ipv6NodeSid" : 2103,
-		"ipv6Loopback" : "2000::c0a8:0203",
-                "routerMac" : "00:00:00:00:01:03",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                 "name" : "s103",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":35,
-		 "longitude":-115
-            }
-        },
-        "of:0000000000000104" : {
-            "segmentrouting" : {
-                "name" : "s104",
-                "ipv4NodeSid" : 1104,
-                "ipv4Loopback" : "192.168.0.104",
-		"ipv6NodeSid" : 2104,
-		"ipv6Loopback" : "2000::c0a8:0204",
-                "routerMac" : "00:00:00:00:01:04",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                 "name" : "s104",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":35,
-		 "longitude":-110
-            }
-    	},	    
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "name" : "s001",
-                "ipv4NodeSid" : 1001,
-		"ipv6NodeSid" : 2001,
-		"ipv6Loopback" : "2000::c0a8:0001",
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s001",
-                "driver" : "ofdpa-ovs",
-		"latitude":30,	
-		"longitude":-105
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "name" : "s002",
-                "ipv4NodeSid" : 1002,
-                "ipv4Loopback" : "192.168.0.2",
-		"ipv6NodeSid" : 2002,
-		"ipv6Loopback" : "2000::c0a8:0002",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000003",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s002",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-95
-            }
-        },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "name" : "s003",
-                "ipv4NodeSid" : 1003,
-                "ipv4Loopback" : "192.168.0.3",
-        	"ipv6NodeSid" : 2003,
-		"ipv6Loopback" : "2000::c0a8:0003",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000002",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s003",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-90
-            }
-        },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "name" : "s004",
-                "ipv4NodeSid" : 1004,
-                "ipv4Loopback" : "192.168.0.4",
-		"ipv6NodeSid" : 2004,
-		"ipv6Loopback" : "2000::c0a8:0004",        
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000005",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s004",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-85
-            }
-        },
-        "of:0000000000000005" : {
-            "segmentrouting" : {
-                "name" : "s005",
-                "ipv4NodeSid" : 1005,
-                "ipv4Loopback" : "192.168.0.5",
-		"ipv6NodeSid" : 2005,
-		"ipv6Loopback" : "2000::c0a8:0005", 
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000004",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s005",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-80
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "name" : "s101",
-                "ipv4NodeSid" : 1101,
-                "ipv4Loopback" : "192.168.0.101",
-		"ipv6NodeSid" : 2101,
-		"ipv6Loopback" : "2000::c0a8:0101", 
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s101",
-                "driver" : "ofdpa-ovs",
-		"latitude":42,
-                "longitude":-100
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "name" : "s102",
-                "ipv4NodeSid" : 1102,
-                "ipv4Loopback" : "192.168.0.102",
-		"ipv6NodeSid" : 2102,
-		"ipv6Loopback" : "2000::c0a8:0202",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                 "name" : "s102",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":42,
-		 "longitude":-95
-            }
-        }   
-    },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
-                {
-                    "dhcpServerConnectPoint": "of:0000000000000005/12",
-                    "serverIps": ["2000::3fd"]
-                }
-            ]
-        }
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=0.json
similarity index 87%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.json
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=0.json
index 6021cc6..f7d41ed 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=0.json
@@ -4,7 +4,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.5.10.254/24" ],
-                    "vlan-tagged": [10]
+                    "vlan-tagged": [80]
                 }
             ]
         },
@@ -12,7 +12,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.5.20.254/24" ],
-                    "vlan-untagged": 20
+                    "vlan-untagged": 35
                 }
             ]
         },    
@@ -28,7 +28,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.1.10.254/24" ],
-                    "vlan-untagged": 10
+                    "vlan-untagged": 11
                 }
             ]
         },
@@ -36,7 +36,39 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.2.0.254/24" ],
-                    "vlan-untagged": 10
+                    "vlan-untagged": 12
+                }
+            ]
+        },
+        "of:0000000000000002/5" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.2.30.254/24", "10.2.20.254/24"],
+                    "vlan-tagged": [ 30 ]
+                }
+            ]
+        },
+        "of:0000000000000003/5" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.2.30.254/24", "10.2.20.254/24"],
+                    "vlan-tagged": [ 30 ]
+                }
+            ]
+        },
+        "of:0000000000000004/5" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.3.10.254/24", "10.3.30.254/24"],
+                    "vlan-tagged": [ 50, 60 ]
+                }
+            ]
+        },
+        "of:0000000000000005/5" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.3.10.254/24", "10.3.30.254/24"],
+                    "vlan-tagged": [ 50, 60 ]
                 }
             ]
         },
@@ -44,7 +76,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 15
+                    "vlan-untagged": 16
                 }
             ]
         },
@@ -76,7 +108,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 15
+                    "vlan-untagged": 16
                 }
             ]
         },
@@ -92,7 +124,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.0.254/24" ],
-                    "vlan-untagged": 30
+                    "vlan-untagged": 25
                 }
             ]
         },
@@ -100,7 +132,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [50]
                 }
             ]
         },
@@ -108,7 +140,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [60]
                 }
             ]
         },
@@ -116,7 +148,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.20.254/24" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [70]
                 }
             ]
         },
@@ -124,7 +156,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [50]
                 }
             ]
         },
@@ -132,7 +164,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [60]
                 }
             ]
         },
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.json
deleted file mode 100644
index f5d64be..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.json
+++ /dev/null
@@ -1,385 +0,0 @@
-{
-    "ports" : {
-	"of:0000000000000006/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.5.10.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000006/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.5.20.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        }, 
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.1.0.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.1.10.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.0.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.20.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000003/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.10.254/24" ],
-                    "vlan-tagged": [ 20 ]
-                }
-            ]
-        },
-	"of:0000000000000003/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.40.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.20.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        }, 
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.0.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.20.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/9" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.1.254/24", "10.0.7.254/24", "2000::1ff/120", "2000::7ff/120" ],
-			"vlan-tagged": [110, 170]
-
-                }
-            ]
-        },
-        "of:0000000000000004/10" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.1.254/24", "2000::1ff/120"],
-			"vlan-untagged": 110
-
-                }
-            ]
-        },
-        "of:0000000000000004/11" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.7.254/24", "2000::7ff/120" ],
-			"vlan-untagged": 170
-
-                }
-            ]
-        },
-        "of:0000000000000005/9" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.5.254/24", "10.0.6.254/24", "2000::5ff/120", "2000::6ff/120" ],
-	               "vlan-tagged": [150, 160]
-                }
-            ]
-        },
-        "of:0000000000000005/10" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.5.254/24", "2000::5ff/120"],
-	               "vlan-untagged": 150
-                }
-            ]
-        },
-        "of:0000000000000005/11" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.6.254/24", "2000::6ff/120" ],
-	               "vlan-untagged": 160
-                }
-            ]
-        },
-        "of:0000000000000005/12" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        }
-    },
-    "devices" : {
-	 "of:0000000000000006" : {
-            "segmentrouting" : {
-                "name" : "s006",
-                "ipv4NodeSid" : 1006,
-		"ipv6NodeSid" : 2006,
-		"ipv6Loopback" : "2000::c0a8:0006",
-                "ipv4Loopback" : "192.168.0.6",
-                "routerMac" : "00:00:00:00:00:06",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s006",
-                "driver" : "ofdpa-ovs",
-		"latitude":30,	
-		"longitude":-110
-            }
-        },
-        "of:0000000000000103" : {
-            "segmentrouting" : {
-                "name" : "s103",
-                "ipv4NodeSid" : 1103,
-                "ipv4Loopback" : "192.168.0.103",
-		"ipv6NodeSid" : 2103,
-		"ipv6Loopback" : "2000::c0a8:0203",
-                "routerMac" : "00:00:00:00:01:03",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                 "name" : "s103",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":35,
-		 "longitude":-115
-            }
-        },
-        "of:0000000000000104" : {
-            "segmentrouting" : {
-                "name" : "s104",
-                "ipv4NodeSid" : 1104,
-                "ipv4Loopback" : "192.168.0.104",
-		"ipv6NodeSid" : 2104,
-		"ipv6Loopback" : "2000::c0a8:0204",
-                "routerMac" : "00:00:00:00:01:04",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s104",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":35,
-		 "longitude":-110
-            }
-	},    
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "name" : "s001",
-                "ipv4NodeSid" : 1001,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s001",
-                "driver" : "ofdpa-ovs",
-		"latitude":30,	
-		"longitude":-105
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "name" : "s002",
-                "ipv4NodeSid" : 1002,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000003",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s002",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-95
-            }
-        },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "name" : "s003",
-                "ipv4NodeSid" : 1003,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000002",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s003",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-90
-            }
-        },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "name" : "s004",
-                "ipv4NodeSid" : 1004,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000005",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s004",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-85
-            }
-        },
-        "of:0000000000000005" : {
-            "segmentrouting" : {
-                "name" : "s005",
-                "ipv4NodeSid" : 1005,
-                "ipv4Loopback" : "192.168.0.5",
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000004",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s005",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-80
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "name" : "s101",
-                "ipv4NodeSid" : 1101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s101",
-                "driver" : "ofdpa-ovs",
-		"latitude":42,
-                "longitude":-100
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "name" : "s102",
-                "ipv4NodeSid" : 1102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s102",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":42,
-		 "longitude":-95
-            }
-        }   
-    },
-    "apps" : {
-       "org.onosproject.dhcprelay" : {
-            "default": [
-                {
-                    "dhcpServerConnectPoint": "of:0000000000000005/12",
-                    "serverIps": ["10.0.3.253"]
-                }
-            ]
-        }
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.json
deleted file mode 100644
index 3b6347a..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.json
+++ /dev/null
@@ -1,385 +0,0 @@
-{
-    "ports" : {
-	"of:0000000000000006/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.5.10.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000006/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.5.20.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },    
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.1.0.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.1.10.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.0.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.20.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000003/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.10.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-	"of:0000000000000003/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.40.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.20.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        }, 
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.0.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.20.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/9" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.1.254/24", "10.0.7.254/24", "2000::1ff/120", "2000::7ff/120" ],
-			"vlan-tagged": [110, 170]
-
-                }
-            ]
-        },
-        "of:0000000000000004/10" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.1.254/24", "2000::1ff/120"],
-			"vlan-untagged": 110
-
-                }
-            ]
-        },
-        "of:0000000000000004/11" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.7.254/24", "2000::7ff/120" ],
-			"vlan-untagged": 170
-
-                }
-            ]
-        },
-        "of:0000000000000005/9" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.5.254/24", "10.0.6.254/24", "2000::5ff/120", "2000::6ff/120" ],
-	               "vlan-tagged": [150, 160]
-                }
-            ]
-        },
-        "of:0000000000000005/10" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.5.254/24", "2000::5ff/120"],
-	               "vlan-untagged": 150
-                }
-            ]
-        },
-        "of:0000000000000005/11" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.6.254/24", "2000::6ff/120" ],
-	               "vlan-untagged": 160
-                }
-            ]
-        },
-        "of:0000000000000005/12" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        }
-    },
-    "devices" : {
- 	"of:0000000000000006" : {
-            "segmentrouting" : {
-                "name" : "s006",
-                "ipv4NodeSid" : 1006,
-		"ipv6NodeSid" : 2006,
-		"ipv6Loopback" : "2000::c0a8:0006",
-                "ipv4Loopback" : "192.168.0.6",
-                "routerMac" : "00:00:00:00:00:06",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s006",
-                "driver" : "ofdpa-ovs",
-		"latitude":30,	
-		"longitude":-110
-            }
-        },
-        "of:0000000000000103" : {
-            "segmentrouting" : {
-                "name" : "s103",
-                "ipv4NodeSid" : 1103,
-                "ipv4Loopback" : "192.168.0.103",
-		"ipv6NodeSid" : 2103,
-		"ipv6Loopback" : "2000::c0a8:0203",
-                "routerMac" : "00:00:00:00:01:03",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                 "name" : "s103",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":35,
-		 "longitude":-115
-            }
-        },
-        "of:0000000000000104" : {
-            "segmentrouting" : {
-                "name" : "s104",
-                "ipv4NodeSid" : 1104,
-                "ipv4Loopback" : "192.168.0.104",
-		"ipv6NodeSid" : 2104,
-		"ipv6Loopback" : "2000::c0a8:0204",
-                "routerMac" : "00:00:00:00:01:04",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s104",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":35,
-		 "longitude":-110
-            }
-     	},	    
-	"of:0000000000000001" : {
-            "segmentrouting" : {
-                "name" : "s001",
-                "ipv4NodeSid" : 1001,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s001",
-                "driver" : "ofdpa-ovs",
-		"latitude":30,	
-		"longitude":-105
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "name" : "s002",
-                "ipv4NodeSid" : 1002,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000003",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s002",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-95
-            }
-        },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "name" : "s003",
-                "ipv4NodeSid" : 1003,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000002",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s003",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-90
-            }
-        },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "name" : "s004",
-                "ipv4NodeSid" : 1004,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000005",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s004",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-85
-            }
-        },
-        "of:0000000000000005" : {
-            "segmentrouting" : {
-                "name" : "s005",
-                "ipv4NodeSid" : 1005,
-                "ipv4Loopback" : "192.168.0.5",
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000004",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s005",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-80
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "name" : "s101",
-                "ipv4NodeSid" : 1101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s101",
-                "driver" : "ofdpa-ovs",
-		"latitude":42,
-                "longitude":-100
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "name" : "s102",
-                "ipv4NodeSid" : 1102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s102",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":42,
-		 "longitude":-95
-            }
-        }   
-    },
-    "apps" : {
-       "org.onosproject.dhcprelay" : {
-            "default": [
-                {
-                    "dhcpServerConnectPoint": "of:0000000000000005/12",
-                    "serverIps": ["10.0.3.253"]
-                }
-            ]
-        }
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1.json
similarity index 85%
copy from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.json
copy to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1.json
index d1ed5c3..3098edf 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1.json
@@ -4,7 +4,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1011::3ff/120" ],
-                    "vlan-tagged": [10]
+                    "vlan-tagged": [127]
                 }
             ]
         },
@@ -12,7 +12,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1012::3ff/120" ],
-                    "vlan-untagged": 20
+                    "vlan-untagged": 26
                 }
             ]
         },       
@@ -20,7 +20,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.5.10.254/24" ],
-                    "vlan-tagged": [10]
+                    "vlan-tagged": [80]
                 }
             ]
         },
@@ -28,16 +28,47 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.5.20.254/24" ],
-                    "vlan-untagged": 20
+                    "vlan-untagged": 35
                 }
             ]
         },
-    
+        "of:0000000000000002/5" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "1003::3ff/120" , "1004::3ff/120", "10.2.30.254/24", "10.2.20.254/24"],
+                    "vlan-tagged": [ 121 , 30 ]
+                }
+            ]
+        },
+        "of:0000000000000003/5" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "1003::3ff/120" , "1004::3ff/120", "10.2.30.254/24", "10.2.20.254/24"],
+                    "vlan-tagged": [ 121, 30 ]
+                }
+            ]
+        },
+        "of:0000000000000004/5" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "1008::3ff/120", "1009::3ff/120", "10.3.10.254/24", "10.3.30.254/24" ],
+                    "vlan-tagged": [ 124, 125, 50, 60 ]
+                }
+            ]
+        },
+        "of:0000000000000005/5" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "1008::3ff/120", "1009::3ff/120", "10.3.10.254/24", "10.3.30.254/24" ],
+                    "vlan-tagged": [ 124, 125, 50, 60 ]
+                }
+            ]
+        },
         "of:0000000000000001/3" : {
             "interfaces" : [
                 {
                     "ips" : [ "1000::3ff/120" ],
-                    "vlan-untagged": 10
+                    "vlan-untagged": 21
                 }
             ]
         },
@@ -45,7 +76,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1001::3ff/120" ],
-                    "vlan-untagged": 10
+                    "vlan-untagged": 22
                 }
             ]
         },
@@ -61,7 +92,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.1.10.254/24" ],
-                    "vlan-untagged": 10
+                    "vlan-untagged": 11
                 }
             ]
         },
@@ -69,7 +100,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1002::3ff/120" ],
-                    "vlan-untagged": 10
+                    "vlan-untagged": 23
                 }
             ]
         },
@@ -77,7 +108,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 15
+                    "vlan-untagged": 24
                 }
             ]
         },
@@ -85,7 +116,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [30]
+                    "vlan-tagged": [121]
                 }
             ]
         },
@@ -93,7 +124,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.2.0.254/24" ],
-                    "vlan-untagged": 10
+                    "vlan-untagged": 12
                 }
             ]
         },
@@ -117,7 +148,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 15
+                    "vlan-untagged": 24
                 }
             ]
         },
@@ -125,7 +156,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [30]
+                    "vlan-tagged": [121]
                 }
             ]
         }, 
@@ -133,7 +164,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1005::3ff/120" ],
-                    "vlan-tagged": [20]
+                    "vlan-tagged": [122]
                 }
             ]
         },
@@ -141,7 +172,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1006::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [123]
                 }
             ]
         },
@@ -149,7 +180,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 15
+                    "vlan-untagged": 16
                 }
             ]
         },
@@ -181,7 +212,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1007::3ff/120" ],
-                    "vlan-untagged": 30
+                    "vlan-untagged": 25
                 }
             ]
         },
@@ -189,7 +220,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [124]
                 }
             ]
         },
@@ -197,7 +228,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [125]
                 }
             ]
         },
@@ -205,7 +236,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.0.254/24" ],
-                    "vlan-untagged": 30
+                    "vlan-untagged": 25
                 }
             ]
         },
@@ -213,7 +244,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [50]
                 }
             ]
         },
@@ -221,7 +252,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [60]
                 }
             ]
         },
@@ -256,7 +287,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [124]
                 }
             ]
         },
@@ -264,7 +295,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [125]
                 }
             ]
         },
@@ -272,7 +303,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1010::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [126]
                 }
             ]
         },
@@ -280,7 +311,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [50]
                 }
             ]
         },
@@ -288,7 +319,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [60]
                 }
             ]
         },
@@ -296,7 +327,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.20.254/24" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [70]
                 }
             ]
         },
@@ -334,43 +365,43 @@
         }
     },
     "hosts" : { 
-	"00:BB:00:00:01:0A/10" : {
+	"00:BB:00:00:01:0A/127" : {
 		"basic": {
 			"locations": ["of:0000000000000006/3"],
 			"ips": ["1011::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:04/30" : {
+	"00:bb:00:00:00:04/121" : {
 		"basic": {
 			"locations": ["of:0000000000000003/7","of:0000000000000002/8"],
 			"ips": ["1004::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:05/20" : {
+	"00:bb:00:00:00:05/122" : {
 		"basic": {
 			"locations": ["of:0000000000000003/8"],
 			"ips": ["1005::3fe"]
 		     }
 	    },
-	"00:bb:00:00:01:05/40" : {
+	"00:bb:00:00:01:05/123" : {
 		"basic": {
 			"locations": ["of:0000000000000003/9"],
 			"ips": ["1006::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:07/40" : {
+	"00:bb:00:00:00:07/124" : {
 		"basic": {
 			"locations": ["of:0000000000000005/6", "of:0000000000000004/7"],
 			"ips": ["1008::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:08/40" : {
+	"00:bb:00:00:00:08/125" : {
 		"basic": {
 			"locations": ["of:0000000000000004/8","of:0000000000000005/7"],
 			"ips": ["1009::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:0A/40" : {
+	"00:bb:00:00:00:0A/126" : {
 		"basic": {
 			"locations": ["of:0000000000000005/8"],
 			"ips": ["1010::3fe"]
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.json
deleted file mode 100644
index a4aa648..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.json
+++ /dev/null
@@ -1,580 +0,0 @@
-{
-    "ports" : {
-         "of:0000000000000006/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1011::3ff/120" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000006/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1012::3ff/120" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },       
-	"of:0000000000000006/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.5.10.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000006/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.5.20.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1000::3ff/120" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1001::3ff/120" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.1.0.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.1.10.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1002::3ff/120" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000002/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.0.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/10" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 16
-                }
-            ]
-        },
-        "of:0000000000000002/11" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.20.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        }, 
-        "of:0000000000000003/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1005::3ff/120" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-	"of:0000000000000003/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1006::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000003/10" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        },
-        "of:0000000000000003/11" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.20.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        }, 
-        "of:0000000000000003/12" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.10.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-	"of:0000000000000003/13" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.40.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1007::3ff/120" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.0.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000004/10" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/11" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/12" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.1.254/24", "10.0.7.254/24", "2000::1ff/120", "2000::7ff/120" ],
-			"vlan-tagged": [110, 170]
-
-                }
-            ]
-        },
-        "of:0000000000000004/13" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.1.254/24", "2000::1ff/120"],
-			"vlan-untagged": 110
-
-                }
-            ]
-        },
-        "of:0000000000000004/14" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.7.254/24", "2000::7ff/120" ],
-			"vlan-untagged": 170
-
-                }
-            ]
-        },
-        "of:0000000000000005/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1010::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/10" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/11" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.20.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/12" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.5.254/24", "10.0.6.254/24", "2000::5ff/120", "2000::6ff/120" ],
-	               "vlan-tagged": [150, 160]
-                }
-            ]
-        },
-        "of:0000000000000005/13" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.5.254/24", "2000::5ff/120"],
-	               "vlan-untagged": 150
-                }
-            ]
-        },
-        "of:0000000000000005/14" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.6.254/24", "2000::6ff/120" ],
-	               "vlan-untagged": 160
-                }
-            ]
-        },
-        "of:0000000000000005/15" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        }
-    },
-    "hosts" : { 
-	"00:BB:00:00:01:0A/10" : {
-		"basic": {
-			"locations": ["of:0000000000000006/3"],
-			"ips": ["1011::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:04/30" : {
-		"basic": {
-			"locations": ["of:0000000000000003/7","of:0000000000000002/8"],
-			"ips": ["1004::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:05/20" : {
-		"basic": {
-			"locations": ["of:0000000000000003/8"],
-			"ips": ["1005::3fe"]
-		     }
-	    },
-	"00:bb:00:00:01:05/40" : {
-		"basic": {
-			"locations": ["of:0000000000000003/9"],
-			"ips": ["1006::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:07/40" : {
-		"basic": {
-			"locations": ["of:0000000000000005/6", "of:0000000000000004/7"],
-			"ips": ["1008::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:08/40" : {
-		"basic": {
-			"locations": ["of:0000000000000004/8","of:0000000000000005/7"],
-			"ips": ["1009::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:0A/40" : {
-		"basic": {
-			"locations": ["of:0000000000000005/8"],
-			"ips": ["1010::3fe"]
-		     }
-	    }
-    },
-    "devices" : {
-	"of:0000000000000006" : {
-            "segmentrouting" : {
-                "name" : "s006",
-                "ipv4NodeSid" : 1006,
-		"ipv6NodeSid" : 2006,
-		"ipv6Loopback" : "2000::c0a8:0006",
-                "ipv4Loopback" : "192.168.0.6",
-                "routerMac" : "00:00:00:00:00:06",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s006",
-                "driver" : "ofdpa-ovs",
-		"latitude":30,	
-		"longitude":-110
-            }
-        },
-        "of:0000000000000103" : {
-            "segmentrouting" : {
-                "name" : "s103",
-                "ipv4NodeSid" : 1103,
-                "ipv4Loopback" : "192.168.0.103",
-		"ipv6NodeSid" : 2103,
-		"ipv6Loopback" : "2000::c0a8:0203",
-                "routerMac" : "00:00:00:00:01:03",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                 "name" : "s103",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":35,
-		 "longitude":-115
-            }
-        },
-        "of:0000000000000104" : {
-            "segmentrouting" : {
-                "name" : "s104",
-                "ipv4NodeSid" : 1104,
-                "ipv4Loopback" : "192.168.0.104",
-		"ipv6NodeSid" : 2104,
-		"ipv6Loopback" : "2000::c0a8:0204",
-                "routerMac" : "00:00:00:00:01:04",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s104",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":35,
-		 "longitude":-110
-            }
-    	},	    
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "name" : "s001",
-                "ipv4NodeSid" : 1001,
-		"ipv6NodeSid" : 2001,
-		"ipv6Loopback" : "2000::c0a8:0001",
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s001",
-                "driver" : "ofdpa-ovs",
-		"latitude":30,	
-		"longitude":-105
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "name" : "s002",
-                "ipv4NodeSid" : 1002,
-                "ipv4Loopback" : "192.168.0.2",
-		"ipv6NodeSid" : 2002,
-		"ipv6Loopback" : "2000::c0a8:0002",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000003",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s002",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-95
-            }
-        },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "name" : "s003",
-                "ipv4NodeSid" : 1003,
-                "ipv4Loopback" : "192.168.0.3",
-        	"ipv6NodeSid" : 2003,
-		"ipv6Loopback" : "2000::c0a8:0003",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000002",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s003",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-90
-            }
-        },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "name" : "s004",
-                "ipv4NodeSid" : 1004,
-                "ipv4Loopback" : "192.168.0.4",
-		"ipv6NodeSid" : 2004,
-		"ipv6Loopback" : "2000::c0a8:0004",        
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000005",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s004",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-85
-            }
-        },
-        "of:0000000000000005" : {
-            "segmentrouting" : {
-                "name" : "s005",
-                "ipv4NodeSid" : 1005,
-                "ipv4Loopback" : "192.168.0.5",
-		"ipv6NodeSid" : 2005,
-		"ipv6Loopback" : "2000::c0a8:0005", 
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000004",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s005",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-80
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "name" : "s101",
-                "ipv4NodeSid" : 1101,
-                "ipv4Loopback" : "192.168.0.101",
-		"ipv6NodeSid" : 2101,
-		"ipv6Loopback" : "2000::c0a8:0101", 
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s101",
-                "driver" : "ofdpa-ovs",
-		"latitude":42,
-                "longitude":-100
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "name" : "s102",
-                "ipv4NodeSid" : 1102,
-                "ipv4Loopback" : "192.168.0.102",
-		"ipv6NodeSid" : 2102,
-		"ipv6Loopback" : "2000::c0a8:0202",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s102",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":42,
-		 "longitude":-95
-            }
-        }   
-    },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
-                {
-                    "dhcpServerConnectPoint": "of:0000000000000005/15",
-                    "serverIps": ["10.0.3.253", "2000::3fd"]
-                }
-            ]
-        }
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.json
deleted file mode 100644
index 7ebe7b2..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.json
+++ /dev/null
@@ -1,580 +0,0 @@
-{
-    "ports" : {
-         "of:0000000000000006/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1011::3ff/120" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000006/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1012::3ff/120" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },       
-	"of:0000000000000006/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.5.10.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000006/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.5.20.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1000::3ff/120" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1001::3ff/120" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.1.0.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.1.10.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1002::3ff/120" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000002/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.0.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/10" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 16
-                }
-            ]
-        },
-        "of:0000000000000002/11" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.20.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        }, 
-        "of:0000000000000003/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1005::3ff/120" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-	"of:0000000000000003/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1006::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000003/10" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        },
-        "of:0000000000000003/11" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.20.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        }, 
-        "of:0000000000000003/12" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.10.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-	"of:0000000000000003/13" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.40.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1007::3ff/120" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.0.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000004/10" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/11" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/12" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.1.254/24", "10.0.7.254/24", "2000::1ff/120", "2000::7ff/120" ],
-			"vlan-tagged": [110, 170]
-
-                }
-            ]
-        },
-        "of:0000000000000004/13" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.1.254/24", "2000::1ff/120"],
-			"vlan-untagged": 110
-
-                }
-            ]
-        },
-        "of:0000000000000004/14" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.7.254/24", "2000::7ff/120" ],
-			"vlan-untagged": 170
-
-                }
-            ]
-        },
-        "of:0000000000000005/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1010::3ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/10" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/11" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.20.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000005/12" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.5.254/24", "10.0.6.254/24", "2000::5ff/120", "2000::6ff/120" ],
-	               "vlan-tagged": [150, 160]
-                }
-            ]
-        },
-        "of:0000000000000005/13" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.5.254/24", "2000::5ff/120"],
-	               "vlan-untagged": 150
-                }
-            ]
-        },
-        "of:0000000000000005/14" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.6.254/24", "2000::6ff/120" ],
-	               "vlan-untagged": 160
-                }
-            ]
-        },
-        "of:0000000000000005/15" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        }
-    },
-    "hosts" : { 
-	"00:BB:00:00:01:0A/10" : {
-		"basic": {
-			"locations": ["of:0000000000000006/3"],
-			"ips": ["1011::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:04/30" : {
-		"basic": {
-			"locations": ["of:0000000000000003/7","of:0000000000000002/8"],
-			"ips": ["1004::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:05/20" : {
-		"basic": {
-			"locations": ["of:0000000000000003/8"],
-			"ips": ["1005::3fe"]
-		     }
-	    },
-	"00:bb:00:00:01:05/40" : {
-		"basic": {
-			"locations": ["of:0000000000000003/9"],
-			"ips": ["1006::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:07/40" : {
-		"basic": {
-			"locations": ["of:0000000000000005/6", "of:0000000000000004/7"],
-			"ips": ["1008::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:08/40" : {
-		"basic": {
-			"locations": ["of:0000000000000004/8","of:0000000000000005/7"],
-			"ips": ["1009::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:0A/40" : {
-		"basic": {
-			"locations": ["of:0000000000000005/8"],
-			"ips": ["1010::3fe"]
-		     }
-	    }
-    },
-    "devices" : {
-	 "of:0000000000000006" : {
-            "segmentrouting" : {
-                "name" : "s006",
-                "ipv4NodeSid" : 1006,
-		"ipv6NodeSid" : 2006,
-		"ipv6Loopback" : "2000::c0a8:0006",
-                "ipv4Loopback" : "192.168.0.6",
-                "routerMac" : "00:00:00:00:00:06",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s006",
-                "driver" : "ofdpa-ovs",
-		"latitude":30,	
-		"longitude":-110
-            }
-        },
-        "of:0000000000000103" : {
-            "segmentrouting" : {
-                "name" : "s103",
-                "ipv4NodeSid" : 1103,
-                "ipv4Loopback" : "192.168.0.103",
-		"ipv6NodeSid" : 2103,
-		"ipv6Loopback" : "2000::c0a8:0203",
-                "routerMac" : "00:00:00:00:01:03",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                 "name" : "s103",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":35,
-		 "longitude":-115
-            }
-        },
-        "of:0000000000000104" : {
-            "segmentrouting" : {
-                "name" : "s104",
-                "ipv4NodeSid" : 1104,
-                "ipv4Loopback" : "192.168.0.104",
-		"ipv6NodeSid" : 2104,
-		"ipv6Loopback" : "2000::c0a8:0204",
-                "routerMac" : "00:00:00:00:01:04",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s104",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":35,
-		 "longitude":-110
-            }
-	},    
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "name" : "s001",
-                "ipv4NodeSid" : 1001,
-		"ipv6NodeSid" : 2001,
-		"ipv6Loopback" : "2000::c0a8:0001",
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s001",
-                "driver" : "ofdpa-ovs",
-		"latitude":30,	
-		"longitude":-105
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "name" : "s002",
-                "ipv4NodeSid" : 1002,
-                "ipv4Loopback" : "192.168.0.2",
-		"ipv6NodeSid" : 2002,
-		"ipv6Loopback" : "2000::c0a8:0002",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000003",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s002",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-95
-            }
-        },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "name" : "s003",
-                "ipv4NodeSid" : 1003,
-                "ipv4Loopback" : "192.168.0.3",
-        	"ipv6NodeSid" : 2003,
-		"ipv6Loopback" : "2000::c0a8:0003",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000002",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s003",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-90
-            }
-        },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "name" : "s004",
-                "ipv4NodeSid" : 1004,
-                "ipv4Loopback" : "192.168.0.4",
-		"ipv6NodeSid" : 2004,
-		"ipv6Loopback" : "2000::c0a8:0004",        
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000005",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s004",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-85
-            }
-        },
-        "of:0000000000000005" : {
-            "segmentrouting" : {
-                "name" : "s005",
-                "ipv4NodeSid" : 1005,
-                "ipv4Loopback" : "192.168.0.5",
-		"ipv6NodeSid" : 2005,
-		"ipv6Loopback" : "2000::c0a8:0005", 
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000004",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s005",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-80
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "name" : "s101",
-                "ipv4NodeSid" : 1101,
-                "ipv4Loopback" : "192.168.0.101",
-		"ipv6NodeSid" : 2101,
-		"ipv6Loopback" : "2000::c0a8:0101", 
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s101",
-                "driver" : "ofdpa-ovs",
-		"latitude":42,
-                "longitude":-100
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "name" : "s102",
-                "ipv4NodeSid" : 1102,
-                "ipv4Loopback" : "192.168.0.102",
-		"ipv6NodeSid" : 2102,
-		"ipv6Loopback" : "2000::c0a8:0202",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s102",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":42,
-		 "longitude":-95
-            }
-        }   
-    },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
-                {
-                    "dhcpServerConnectPoint": "of:0000000000000005/15",
-                    "serverIps": ["10.0.3.253", "2000::3fd"]
-                }
-            ]
-        }
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.linkFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1.linkFailureChart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.linkFailureChart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1.linkFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.linkFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.linkFailureChart
deleted file mode 100644
index 784fbd3..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.linkFailureChart
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "link_batch_1" : { "links" : { "link1" : ["spine103", "spine101"],
-		      		   "link2" : ["leaf2", "spine101"],
-	              		   "link3" : ["leaf3", "spine101"],
-		      		   "link4" : ["leaf4", "spine101"],
-		      	           "link5" : ["leaf5", "spine101"] },
-			"links_before" : 48,
-			"links_after" : 30 },
-    "link_batch_2" : { "links" : { "link1" : ["spine104", "spine102"],
-		      		   "link2" : ["leaf2", "spine102"],
-	              		   "link3" : ["leaf3", "spine102"],
-		      		   "link4" : ["leaf4", "spine102"],
-		      	           "link5" : ["leaf5", "spine102"] },
-			"links_before" : 48,
-			"links_after" : 30 }
-}
-
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.linkFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.linkFailureChart
deleted file mode 100644
index 784fbd3..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.linkFailureChart
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "link_batch_1" : { "links" : { "link1" : ["spine103", "spine101"],
-		      		   "link2" : ["leaf2", "spine101"],
-	              		   "link3" : ["leaf3", "spine101"],
-		      		   "link4" : ["leaf4", "spine101"],
-		      	           "link5" : ["leaf5", "spine101"] },
-			"links_before" : 48,
-			"links_after" : 30 },
-    "link_batch_2" : { "links" : { "link1" : ["spine104", "spine102"],
-		      		   "link2" : ["leaf2", "spine102"],
-	              		   "link3" : ["leaf3", "spine102"],
-		      		   "link4" : ["leaf4", "spine102"],
-		      	           "link5" : ["leaf5", "spine102"] },
-			"links_before" : 48,
-			"links_after" : 30 }
-}
-
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.linkFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0.linkFailureChart
similarity index 100%
copy from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.linkFailureChart
copy to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0.linkFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.linkFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.linkFailureChart
deleted file mode 100644
index 784fbd3..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.linkFailureChart
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "link_batch_1" : { "links" : { "link1" : ["spine103", "spine101"],
-		      		   "link2" : ["leaf2", "spine101"],
-	              		   "link3" : ["leaf3", "spine101"],
-		      		   "link4" : ["leaf4", "spine101"],
-		      	           "link5" : ["leaf5", "spine101"] },
-			"links_before" : 48,
-			"links_after" : 30 },
-    "link_batch_2" : { "links" : { "link1" : ["spine104", "spine102"],
-		      		   "link2" : ["leaf2", "spine102"],
-	              		   "link3" : ["leaf3", "spine102"],
-		      		   "link4" : ["leaf4", "spine102"],
-		      	           "link5" : ["leaf5", "spine102"] },
-			"links_before" : 48,
-			"links_after" : 30 }
-}
-
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.linkFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.linkFailureChart
deleted file mode 100644
index 784fbd3..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.linkFailureChart
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "link_batch_1" : { "links" : { "link1" : ["spine103", "spine101"],
-		      		   "link2" : ["leaf2", "spine101"],
-	              		   "link3" : ["leaf3", "spine101"],
-		      		   "link4" : ["leaf4", "spine101"],
-		      	           "link5" : ["leaf5", "spine101"] },
-			"links_before" : 48,
-			"links_after" : 30 },
-    "link_batch_2" : { "links" : { "link1" : ["spine104", "spine102"],
-		      		   "link2" : ["leaf2", "spine102"],
-	              		   "link3" : ["leaf3", "spine102"],
-		      		   "link4" : ["leaf4", "spine102"],
-		      	           "link5" : ["leaf5", "spine102"] },
-			"links_before" : 48,
-			"links_after" : 30 }
-}
-
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.linkFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.linkFailureChart
deleted file mode 100644
index 784fbd3..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.linkFailureChart
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "link_batch_1" : { "links" : { "link1" : ["spine103", "spine101"],
-		      		   "link2" : ["leaf2", "spine101"],
-	              		   "link3" : ["leaf3", "spine101"],
-		      		   "link4" : ["leaf4", "spine101"],
-		      	           "link5" : ["leaf5", "spine101"] },
-			"links_before" : 48,
-			"links_after" : 30 },
-    "link_batch_2" : { "links" : { "link1" : ["spine104", "spine102"],
-		      		   "link2" : ["leaf2", "spine102"],
-	              		   "link3" : ["leaf3", "spine102"],
-		      		   "link4" : ["leaf4", "spine102"],
-		      	           "link5" : ["leaf5", "spine102"] },
-			"links_before" : 48,
-			"links_after" : 30 }
-}
-
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.linkFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1.linkFailureChart
similarity index 100%
copy from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.linkFailureChart
copy to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1.linkFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.linkFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.linkFailureChart
deleted file mode 100644
index 784fbd3..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.linkFailureChart
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "link_batch_1" : { "links" : { "link1" : ["spine103", "spine101"],
-		      		   "link2" : ["leaf2", "spine101"],
-	              		   "link3" : ["leaf3", "spine101"],
-		      		   "link4" : ["leaf4", "spine101"],
-		      	           "link5" : ["leaf5", "spine101"] },
-			"links_before" : 48,
-			"links_after" : 30 },
-    "link_batch_2" : { "links" : { "link1" : ["spine104", "spine102"],
-		      		   "link2" : ["leaf2", "spine102"],
-	              		   "link3" : ["leaf3", "spine102"],
-		      		   "link4" : ["leaf4", "spine102"],
-		      	           "link5" : ["leaf5", "spine102"] },
-			"links_before" : 48,
-			"links_after" : 30 }
-}
-
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.linkFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.linkFailureChart
deleted file mode 100644
index 784fbd3..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.linkFailureChart
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "link_batch_1" : { "links" : { "link1" : ["spine103", "spine101"],
-		      		   "link2" : ["leaf2", "spine101"],
-	              		   "link3" : ["leaf3", "spine101"],
-		      		   "link4" : ["leaf4", "spine101"],
-		      	           "link5" : ["leaf5", "spine101"] },
-			"links_before" : 48,
-			"links_after" : 30 },
-    "link_batch_2" : { "links" : { "link1" : ["spine104", "spine102"],
-		      		   "link2" : ["leaf2", "spine102"],
-	              		   "link3" : ["leaf3", "spine102"],
-		      		   "link4" : ["leaf4", "spine102"],
-		      	           "link5" : ["leaf5", "spine102"] },
-			"links_before" : 48,
-			"links_after" : 30 }
-}
-
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.linkFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.linkFailureChart
deleted file mode 100644
index 784fbd3..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.linkFailureChart
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "link_batch_1" : { "links" : { "link1" : ["spine103", "spine101"],
-		      		   "link2" : ["leaf2", "spine101"],
-	              		   "link3" : ["leaf3", "spine101"],
-		      		   "link4" : ["leaf4", "spine101"],
-		      	           "link5" : ["leaf5", "spine101"] },
-			"links_before" : 48,
-			"links_after" : 30 },
-    "link_batch_2" : { "links" : { "link1" : ["spine104", "spine102"],
-		      		   "link2" : ["leaf2", "spine102"],
-	              		   "link3" : ["leaf3", "spine102"],
-		      		   "link4" : ["leaf4", "spine102"],
-		      	           "link5" : ["leaf5", "spine102"] },
-			"links_before" : 48,
-			"links_after" : 30 }
-}
-
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.switchFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1.switchFailureChart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.switchFailureChart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1.switchFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.switchFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.switchFailureChart
deleted file mode 100644
index 96e4982..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.switchFailureChart
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "spine101": { "switches_before_failure": 10,
-                  "links_before_failure": 48,
-                  "switches_after_failure": 9,
-                  "links_after_failure": 30 },
-    "spine102": { "switches_before_failure": 10,
-                  "links_before_failure": 48,
-                  "switches_after_failure": 9,
-                  "links_after_failure": 30 }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.switchFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.switchFailureChart
deleted file mode 100644
index 96e4982..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.switchFailureChart
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "spine101": { "switches_before_failure": 10,
-                  "links_before_failure": 48,
-                  "switches_after_failure": 9,
-                  "links_after_failure": 30 },
-    "spine102": { "switches_before_failure": 10,
-                  "links_before_failure": 48,
-                  "switches_after_failure": 9,
-                  "links_after_failure": 30 }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.switchFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0.switchFailureChart
similarity index 100%
copy from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.switchFailureChart
copy to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0.switchFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.switchFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.switchFailureChart
deleted file mode 100644
index 96e4982..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.switchFailureChart
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "spine101": { "switches_before_failure": 10,
-                  "links_before_failure": 48,
-                  "switches_after_failure": 9,
-                  "links_after_failure": 30 },
-    "spine102": { "switches_before_failure": 10,
-                  "links_before_failure": 48,
-                  "switches_after_failure": 9,
-                  "links_after_failure": 30 }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.switchFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.switchFailureChart
deleted file mode 100644
index 96e4982..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.switchFailureChart
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "spine101": { "switches_before_failure": 10,
-                  "links_before_failure": 48,
-                  "switches_after_failure": 9,
-                  "links_after_failure": 30 },
-    "spine102": { "switches_before_failure": 10,
-                  "links_before_failure": 48,
-                  "switches_after_failure": 9,
-                  "links_after_failure": 30 }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.switchFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.switchFailureChart
deleted file mode 100644
index 96e4982..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.switchFailureChart
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "spine101": { "switches_before_failure": 10,
-                  "links_before_failure": 48,
-                  "switches_after_failure": 9,
-                  "links_after_failure": 30 },
-    "spine102": { "switches_before_failure": 10,
-                  "links_before_failure": 48,
-                  "switches_after_failure": 9,
-                  "links_after_failure": 30 }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.switchFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1.switchFailureChart
similarity index 100%
copy from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.switchFailureChart
copy to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1.switchFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.switchFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.switchFailureChart
deleted file mode 100644
index 96e4982..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.switchFailureChart
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "spine101": { "switches_before_failure": 10,
-                  "links_before_failure": 48,
-                  "switches_after_failure": 9,
-                  "links_after_failure": 30 },
-    "spine102": { "switches_before_failure": 10,
-                  "links_before_failure": 48,
-                  "switches_after_failure": 9,
-                  "links_after_failure": 30 }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.switchFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.switchFailureChart
deleted file mode 100644
index 96e4982..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.switchFailureChart
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "spine101": { "switches_before_failure": 10,
-                  "links_before_failure": 48,
-                  "switches_after_failure": 9,
-                  "links_after_failure": 30 },
-    "spine102": { "switches_before_failure": 10,
-                  "links_before_failure": 48,
-                  "switches_after_failure": 9,
-                  "links_after_failure": 30 }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.switchFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.switchFailureChart
deleted file mode 100644
index 96e4982..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.switchFailureChart
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "spine101": { "switches_before_failure": 10,
-                  "links_before_failure": 48,
-                  "switches_after_failure": 9,
-                  "links_after_failure": 30 },
-    "spine102": { "switches_before_failure": 10,
-                  "links_before_failure": 48,
-                  "switches_after_failure": 9,
-                  "links_after_failure": 30 }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/hagg_fabric.py b/TestON/tests/USECASE/SegmentRouting/dependencies/hagg_fabric.py
index 79b4992..b4bb587 100644
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/hagg_fabric.py
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/hagg_fabric.py
@@ -96,7 +96,7 @@
 
         h9 = self.addHost('h9v4', cls=TrellisHost,
                           mac='00:aa:00:00:00:07', ips=['10.3.10.1/24'],
-                          gateway='10.3.10.254', dhcpClient=dhcp, vlan=40,
+                          gateway='10.3.10.254', dhcpClient=dhcp, vlan=50,
                           dualHomed=True)
         self.addLink(h9, self.leafs[3])
         self.addLink(h9, self.leafs[4])
@@ -104,7 +104,7 @@
 
         h10 = self.addHost('h10v4', cls=TrellisHost,
                            mac='00:aa:00:00:00:08', ips=['10.3.30.1/24'],
-                           gateway='10.3.30.254', dhcpClient=dhcp, vlan=40,
+                           gateway='10.3.30.254', dhcpClient=dhcp, vlan=60,
                            dualHomed=True)
         self.addLink(h10, self.leafs[3])
         self.addLink(h10, self.leafs[4])
@@ -112,13 +112,13 @@
 
         h11 = self.addHost('h11v4', cls=TrellisHost,
                            mac='00:aa:00:00:00:0a', ips=['10.3.20.1/24'],
-                           gateway='10.3.20.254', dhcpClient=dhcp, vlan=40)
+                           gateway='10.3.20.254', dhcpClient=dhcp, vlan=70)
         self.addLink(h11, self.leafs[4])
         self.hosts_dict['h11v4'] = h11
 
         h12 = self.addHost('h12v4', cls=TrellisHost,
                            mac='00:aa:00:00:02:01', ips=['10.5.10.1/24'],
-                           gateway='10.5.10.254', dhcpClient=dhcp, vlan=10)
+                           gateway='10.5.10.254', dhcpClient=dhcp, vlan=80)
         self.addLink(h12, self.leafs[5])
         self.hosts_dict['h12v4'] = h12
 
@@ -127,7 +127,6 @@
                            gateway='10.5.20.254', dhcpClient=dhcp)
         self.addLink(h13, self.leafs[5])
         self.hosts_dict['h13v4'] = h13
-
         return
 
     def createIpv6Hosts(self, dhcp):
@@ -161,7 +160,7 @@
         h5 = self.addHost('h5v6', cls=TrellisHost,
                           mac='00:bb:00:00:00:04', ips=['1004::3fe/120'],
                           gateway='1004::3ff', dhcpClient=False, ipv6=1,
-                          vlan=30,
+                          vlan=121,
                           dualHomed=True)
         self.addLink(h5, self.leafs[1])
         self.addLink(h5, self.leafs[2])
@@ -170,14 +169,14 @@
         h6 = self.addHost('h6v6', cls=TrellisHost,
                           mac='00:bb:00:00:00:05', ips=['1005::3fe/120'],
                           gateway='1005::3ff', dhcpClient=False, ipv6=1,
-                          vlan=20)
+                          vlan=122)
         self.addLink(h6, self.leafs[2])
         self.hosts_dict['h6v6'] = h6
 
         h7 = self.addHost('h7v6', cls=TrellisHost,
                           mac='00:bb:00:00:01:05', ips=['1006::3fe/120'],
                           gateway='1006::3ff', dhcpClient=False, ipv6=1,
-                          vlan=40)
+                          vlan=123)
         self.addLink(h7, self.leafs[2])
         self.hosts_dict['h7v6'] = h7
 
@@ -189,7 +188,7 @@
 
         h9 = self.addHost('h9v6', cls=TrellisHost,
                           mac='00:bb:00:00:00:07', ips=['1008::3fe/120'],
-                          gateway='1008::3ff', dhcpClient=False, vlan=40,
+                          gateway='1008::3ff', dhcpClient=False, vlan=124,
                           dualHomed=True, ipv6=1)
         self.addLink(h9, self.leafs[3])
         self.addLink(h9, self.leafs[4])
@@ -197,7 +196,7 @@
 
         h10 = self.addHost('h10v6', cls=TrellisHost,
                            mac='00:bb:00:00:00:08', ips=['1009::3fe/120'],
-                           gateway='1009::3ff', dhcpClient=False, vlan=40,
+                           gateway='1009::3ff', dhcpClient=False, vlan=125,
                            dualHomed=True, ipv6=1)
         self.addLink(h10, self.leafs[3])
         self.addLink(h10, self.leafs[4])
@@ -205,14 +204,14 @@
 
         h11 = self.addHost('h11v6', cls=TrellisHost,
                            mac='00:bb:00:00:00:0a', ips=['1010::3fe/120'],
-                           gateway='1010::3ff', dhcpClient=False, vlan=40,
+                           gateway='1010::3ff', dhcpClient=False, vlan=126,
                            ipv6=1)
         self.addLink(h11, self.leafs[4])
         self.hosts_dict['h11v6'] = h11
 
         h12 = self.addHost('h12v6', cls=TrellisHost,
                            mac='00:bb:00:00:01:0a', ips=['1011::3fe/120'],
-                           gateway='1011::3ff', dhcpClient=False, vlan=10,
+                           gateway='1011::3ff', dhcpClient=False, vlan=127,
                            ipv6=1)
         self.addLink(h12, self.leafs[5])
         self.hosts_dict['h12v6'] = h12