diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.params b/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.params
index 947666d..1b6aec0 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.params
@@ -14,7 +14,7 @@
     <DEPENDENCY>
         <useCommonConf>False</useCommonConf>
         <useCommonTopo>True</useCommonTopo>
-        <topology>comcast_fabric.py</topology>
+        <topology>hagg_fabric.py</topology>
         <lib>routinglib.py,trellislib.py,trellis_fabric.py</lib>
         <conf>bgpdbgp1.conf,bgpdbgp2.conf,bgpdr1.conf,bgpdr2.conf,dhcpd6.conf,dhcpd.conf,zebradbgp1.conf,zebradbgp2.conf</conf>
     </DEPENDENCY>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/SRRoutingTest.py b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/SRRoutingTest.py
index 0c65c1e..43c5265 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/SRRoutingTest.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/SRRoutingTest.py
@@ -48,7 +48,7 @@
 
         main.case( '%s, ONOS cluster size: %s' % ( description, onosNodes ) )
 
-        main.cfgName = 'COMCAST_CONFIG_ipv4=%d_ipv6=%d_dhcp=%d_routers=%d' % \
+        main.cfgName = 'TEST_CONFIG_ipv4=%d_ipv6=%d_dhcp=%d_routers=%d' % \
             ( ipv4, ipv6, dhcp, routers )
         if checkExternalHost:
             main.cfgName += '_external=1'
@@ -87,7 +87,7 @@
         if hasattr( main, 'Mininet1' ):
             # Run the test with Mininet
             mininet_args = ' --dhcp=%s --routers=%s --ipv6=%s --ipv4=%s' % ( dhcp, routers, ipv6, ipv4 )
-            run.startMininet( main, 'comcast_fabric.py', args=mininet_args )
+            run.startMininet( main, 'hagg_fabric.py', args=mininet_args )
         else:
             # Run the test with physical devices
             # TODO: connect TestON to the physical network
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=0.chart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=0.chart
deleted file mode 100644
index e77d1c5..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_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"]}
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.chart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.chart
deleted file mode 100644
index 4ba753f..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_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"] }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=0.chart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=0.chart
deleted file mode 100644
index 8fc87ff..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_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"]}
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.chart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.chart
deleted file mode 100644
index 64b2628..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_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"] }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.chart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.chart
deleted file mode 100644
index a33f56f..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_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"] },
-  "ipv6": { "expect": "True",
-            "hosts": ["h1v6", "h2v6" ,"h3v6", "h4v6", "h5v6", "h6v6", "h7v6", "h8v6", "h9v6", "h10v6", "h11v6"] }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_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
similarity index 63%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=0_routers=0.chart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=0_routers=0.chart
index e77d1c5..1da27d3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_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
@@ -1,4 +1,4 @@
 {
   "ipv6": {"expect": "True",
-   "hosts":["h1v6", "h2v6" ,"h3v6", "h4v6", "h5v6", "h6v6", "h7v6", "h8v6", "h9v6", "h10v6", "h11v6"]}
+   "hosts":["h1v6", "h2v6" ,"h3v6", "h4v6", "h5v6", "h6v6", "h7v6", "h8v6", "h9v6", "h10v6", "h11v6" ,"h12v6" ,"h13v6"]}
 }
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_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=1_routers=0.chart
similarity index 63%
copy from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=0_routers=0.chart
copy to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=0.chart
index e77d1c5..1da27d3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_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=1_routers=0.chart
@@ -1,4 +1,4 @@
 {
   "ipv6": {"expect": "True",
-   "hosts":["h1v6", "h2v6" ,"h3v6", "h4v6", "h5v6", "h6v6", "h7v6", "h8v6", "h9v6", "h10v6", "h11v6"]}
+   "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
new file mode 100644
index 0000000..3a0c315
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.chart
@@ -0,0 +1,4 @@
+{
+  "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/COMCAST_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
similarity index 66%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.chart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.chart
index 1df8fa5..ae2bd4a 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_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
@@ -1,7 +1,7 @@
 {
   "ipv6": { "expect": "True",
-            "hosts": ["h1v6", "h2v6" ,"h3v6", "h4v6", "h5v6", "h6v6", "h7v6", "h8v6", "h9v6", "h10v6", "h11v6"] },
+            "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"],
+                   "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/COMCAST_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
similarity index 68%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.chart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.chart
index fa047b3..99a8901 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_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
@@ -1,5 +1,5 @@
 {
   "ipv6-remote": { "expect": "Unidirectional",
-                   "src": ["h1v6", "h2v6" ,"h3v6", "h4v6", "h5v6", "h6v6", "h7v6", "h8v6", "h9v6", "h10v6", "h11v6"],
+                   "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/COMCAST_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
similarity index 62%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=0_routers=0.chart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=0_routers=0.chart
index 8fc87ff..ea0672c 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_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
@@ -1,4 +1,4 @@
 {
   "ipv4": {"expect": "True",
-    "hosts":["h1v4", "h2v4" ,"h3v4", "h4v4", "h5v4", "h6v4", "h7v4", "h8v4", "h9v4", "h10v4", "h11v4"]}
+    "hosts":["h1v4", "h2v4" ,"h3v4", "h4v4", "h5v4", "h6v4", "h7v4", "h8v4", "h9v4", "h10v4", "h11v4" ,"h12v4" ,"h13v4"]}
 }
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_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=1_routers=0.chart
similarity index 62%
copy from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=0_routers=0.chart
copy to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=0.chart
index 8fc87ff..ea0672c 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_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=1_routers=0.chart
@@ -1,4 +1,4 @@
 {
   "ipv4": {"expect": "True",
-    "hosts":["h1v4", "h2v4" ,"h3v4", "h4v4", "h5v4", "h6v4", "h7v4", "h8v4", "h9v4", "h10v4", "h11v4"]}
+    "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
new file mode 100644
index 0000000..5c2ab2a
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.chart
@@ -0,0 +1,4 @@
+{
+  "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/COMCAST_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
similarity index 64%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.chart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.chart
index cd36386..ec9e0d2 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_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
@@ -1,7 +1,7 @@
 {
   "ipv4": { "expect": "True",
-            "hosts": ["h1v4", "h2v4" ,"h3v4", "h4v4", "h5v4", "h6v4", "h7v4", "h8v4", "h9v4", "h10v4", "h11v4"] },
+            "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"],
+                   "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/COMCAST_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
similarity index 68%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.chart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.chart
index c749566..c26664b 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_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
@@ -1,5 +1,5 @@
 {
   "ipv4-remote": { "expect": "Unidirectional",
-                   "src": ["h1v4", "h2v4" ,"h3v4", "h4v4", "h5v4", "h6v4", "h7v4", "h8v4", "h9v4", "h10v4", "h11v4"],
+                   "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/COMCAST_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
similarity index 62%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=0_routers=0.chart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=0_routers=0.chart
index e23a8b4..f22f4a8 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_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
@@ -1,6 +1,6 @@
 {
   "ipv4": {"expect": "True",
-    "hosts":["h1v4", "h2v4" ,"h3v4", "h4v4", "h5v4", "h6v4", "h7v4", "h8v4", "h9v4", "h10v4", "h11v4"]}
+    "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"]}
+    "hosts":["h1v6", "h2v6" ,"h3v6", "h4v6", "h5v6", "h6v6", "h7v6", "h8v6", "h9v6", "h10v6", "h11v6" ,"h12v6" ,"h13v6"]}
 }
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_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
similarity index 60%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=0.chart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=0.chart
index cdd437d..a4f8f4c 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_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
@@ -1,6 +1,6 @@
 {
   "ipv6": {"expect": "True",
-	   "hosts": ["h1v6", "h2v6" ,"h3v6", "h4v6", "h5v6", "h6v6", "h7v6", "h8v6", "h9v6", "h10v6", "h11v6"]},
+	   "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"]}
+           "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
new file mode 100644
index 0000000..f39fb26
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.chart
@@ -0,0 +1,6 @@
+{
+  "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/COMCAST_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
similarity index 65%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.chart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.chart
index 4af85a4..6648fb1 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_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
@@ -1,12 +1,12 @@
 {
   "ipv4": { "expect": "True",
-            "hosts": ["h1v4", "h2v4" ,"h3v4", "h4v4", "h5v4", "h6v4", "h7v4", "h8v4", "h9v4", "h10v4", "h11v4"] },
+            "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"],
+                   "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"] },
+            "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"],
+                   "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/COMCAST_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
similarity index 68%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.chart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.chart
index a472cba..492fd36 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/chart/COMCAST_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
@@ -1,8 +1,8 @@
 {
   "ipv4-remote": { "expect": "Unidirectional",
-                   "src": ["h1v4", "h2v4" ,"h3v4", "h4v4", "h5v4", "h6v4", "h7v4", "h8v4", "h9v4", "h10v4", "h11v4"],
+                   "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"],
+                   "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/conf/bgpdbgp1.conf b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/conf/bgpdbgp1.conf
index fa03c9b..474bf02 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/conf/bgpdbgp1.conf
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/conf/bgpdbgp1.conf
@@ -20,6 +20,8 @@
 ip prefix-list 1 seq 140 permit 10.3.30.0/24
 ip prefix-list 1 seq 150 permit 10.3.10.0/24
 ip prefix-list 1 seq 160 permit 10.3.20.0/24
+ip prefix-list 1 seq 170 permit 10.5.10.0/24
+ip prefix-list 1 seq 180 permit 10.5.20.0/24
 
 !
 route-map NEXTHOP41 permit 10
@@ -47,6 +49,8 @@
 ipv6 prefix-list 2 seq 110 permit 1008::300/120
 ipv6 prefix-list 2 seq 120 permit 1009::300/120
 ipv6 prefix-list 2 seq 130 permit 1010::300/120
+ipv6 prefix-list 2 seq 140 permit 1011::300/120
+ipv6 prefix-list 2 seq 150 permit 1012::300/120
 !
 route-map NEXTHOP61 permit 10
 match ipv6 address prefix-list 2
@@ -101,6 +105,8 @@
 network 10.3.30.0/24
 network 10.3.10.0/24
 network 10.3.20.0/24
+network 10.5.10.0/24
+network 10.5.20.0/24
 
 network 10.0.2.0/24
 network 10.1.2.0/24
@@ -122,6 +128,8 @@
 network 1008::300/120
 network 1009::300/120
 network 1010::300/120
+network 1011::300/120
+network 1012::300/120
 
 network 2000::200/120
 network 2000::300/120
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/conf/bgpdbgp2.conf b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/conf/bgpdbgp2.conf
index d08b214..421d5c2 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/conf/bgpdbgp2.conf
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/conf/bgpdbgp2.conf
@@ -20,6 +20,8 @@
 ip prefix-list 1 seq 130 permit 10.3.30.0/24
 ip prefix-list 1 seq 140 permit 10.3.10.0/24
 ip prefix-list 1 seq 150 permit 10.3.20.0/24
+ip prefix-list 1 seq 160 permit 10.5.10.0/24
+ip prefix-list 1 seq 170 permit 10.5.20.0/24
 
 !
 route-map NEXTHOP45 permit 10
@@ -47,6 +49,8 @@
 ipv6 prefix-list 2 seq 110 permit 1008::300/120
 ipv6 prefix-list 2 seq 120 permit 1009::300/120
 ipv6 prefix-list 2 seq 130 permit 1010::300/120
+ipv6 prefix-list 2 seq 140 permit 1011::300/120
+ipv6 prefix-list 2 seq 150 permit 1012::300/120
 !
 
 !
@@ -103,6 +107,8 @@
 network 10.3.30.0/24
 network 10.3.10.0/24
 network 10.3.20.0/24
+network 10.5.10.0/24
+network 10.5.20.0/24
 
 network 10.1.0.0/24
 network 10.0.2.0/24
@@ -125,6 +131,8 @@
 network 1008::300/120
 network 1009::300/120
 network 1010::300/120
+network 1011::300/120
+network 1012::300/120
 
 network 2000::200/120
 network 2000::300/120
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/conf/dhcpd.conf b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/conf/dhcpd.conf
index acc48f4..2676b07 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/conf/dhcpd.conf
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/conf/dhcpd.conf
@@ -66,6 +66,16 @@
   option routers 10.3.20.254;
 }
 
+subnet 10.5.10.0 netmask 255.255.255.0 {
+  range 10.5.10.1 10.5.10.100;
+  option routers 10.5.10.254;
+}
+
+subnet 10.5.20.0 netmask 255.255.255.0 {
+  range 10.5.20.1 10.5.20.100;
+  option routers 10.5.20.254;
+}
+
 host h1v4 {
   hardware ethernet 00:aa:00:00:00:01;
   fixed-address 10.1.0.1;
@@ -121,4 +131,13 @@
   fixed-address 10.3.20.1;
 }
 
+host h12v4 {
+  hardware ethernet 00:aa:00:00:02:01;
+  fixed-address 10.5.10.1;
+}
+
+host h13v4 {
+  hardware ethernet 00:aa:00:00:02:02;
+  fixed-address 10.5.20.1;
+}
 
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/conf/dhcpd6.conf b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/conf/dhcpd6.conf
index 3595d5f..3afa617 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/conf/dhcpd6.conf
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/conf/dhcpd6.conf
@@ -63,6 +63,16 @@
   option dhcp6.next-hop 1010::03ff;
 }
 
+subnet6 1011::300/120 {
+  range6 1011::360 1011::3fe;
+  option dhcp6.next-hop 1011::03ff;
+}
+
+subnet6 1012::300/120 {
+  range6 1012::360 1012::3fe;
+  option dhcp6.next-hop 1012::03ff;
+}
+
 host h1v6 {
   hardware ethernet 00:bb:00:00:00:01;
   fixed-address6 1000::3fe;
@@ -118,9 +128,15 @@
   fixed-address6 1010::3fe;
 }
 
+host h12v6 {
+  hardware ethernet 00:bb:00:00:01:0a;
+  fixed-address6 1011::3fe;
+}
 
-
-
+host h13v6 {
+  hardware ethernet 00:bb:00:00:02:0a;
+  fixed-address6 1012::3fe;
+}
 
 
 
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.count b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.count
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.count
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.count
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.count b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.count
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.count
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.count
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.count b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.count
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.count
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.count
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.count b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.count
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.count
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.count
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.count b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.count
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.count
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.count
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.count b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.count
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.count
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.count
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.count b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.count
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.count
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.count
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.count b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.count
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.count
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.count
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.count b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.count
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.count
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/count/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.count
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.host b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.host
deleted file mode 100644
index 7bf8aeb..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.host
+++ /dev/null
@@ -1,30 +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/30": "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"
-    },
-    "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"
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.host b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.host
deleted file mode 100644
index 7bf8aeb..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.host
+++ /dev/null
@@ -1,30 +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/30": "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"
-    },
-    "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"
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.host b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.host
deleted file mode 100644
index 17f232e..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.host
+++ /dev/null
@@ -1,30 +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/30": "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"
-    },
-    "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"
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.host b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.host
deleted file mode 100644
index 17f232e..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.host
+++ /dev/null
@@ -1,30 +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/30": "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"
-    },
-    "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"
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.host b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.host
similarity index 74%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_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_dhcp=1_routers=1.host
index 7bf8aeb..bb0de60 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.host
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.host
@@ -8,10 +8,12 @@
         "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/30": "1007::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:00:0A/40": "1010::3fe",
+	"00:BB:00:00:01:0A/10": "1011::3fe",
+	"00:BB:00:00:02:0A/None": "1012::3fe"
     },
     "network":
     {
@@ -25,6 +27,8 @@
         "h8v6": "1007::3fe",
         "h9v6": "1008::3fe",
         "h10v6": "1009::3fe",
-        "h11v6": "1010::3fe"
+        "h11v6": "1010::3fe",
+        "h12v6": "1011::3fe",
+        "h13v6": "1012::3fe"
     }
 }
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.host b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.host
similarity index 74%
copy from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.host
copy to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.host
index 7bf8aeb..bb0de60 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.host
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.host
@@ -8,10 +8,12 @@
         "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/30": "1007::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:00:0A/40": "1010::3fe",
+	"00:BB:00:00:01:0A/10": "1011::3fe",
+	"00:BB:00:00:02:0A/None": "1012::3fe"
     },
     "network":
     {
@@ -25,6 +27,8 @@
         "h8v6": "1007::3fe",
         "h9v6": "1008::3fe",
         "h10v6": "1009::3fe",
-        "h11v6": "1010::3fe"
+        "h11v6": "1010::3fe",
+        "h12v6": "1011::3fe",
+        "h13v6": "1012::3fe"
     }
 }
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.host b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.host
similarity index 74%
copy from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.host
copy to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.host
index 7bf8aeb..bb0de60 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.host
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.host
@@ -8,10 +8,12 @@
         "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/30": "1007::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:00:0A/40": "1010::3fe",
+	"00:BB:00:00:01:0A/10": "1011::3fe",
+	"00:BB:00:00:02:0A/None": "1012::3fe"
     },
     "network":
     {
@@ -25,6 +27,8 @@
         "h8v6": "1007::3fe",
         "h9v6": "1008::3fe",
         "h10v6": "1009::3fe",
-        "h11v6": "1010::3fe"
+        "h11v6": "1010::3fe",
+        "h12v6": "1011::3fe",
+        "h13v6": "1012::3fe"
     }
 }
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.host b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.host
similarity index 75%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_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_dhcp=1_routers=1.host
index 17f232e..0175e2a 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.host
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.host
@@ -8,10 +8,12 @@
         "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/30": "10.3.0.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: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":
     {
@@ -25,6 +27,8 @@
         "h8v4": "10.3.0.1",
         "h9v4": "10.3.10.1",
         "h10v4": "10.3.30.1",
-        "h11v4": "10.3.20.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/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.host b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.host
similarity index 75%
copy from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.host
copy to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.host
index 17f232e..0175e2a 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.host
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.host
@@ -8,10 +8,12 @@
         "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/30": "10.3.0.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: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":
     {
@@ -25,6 +27,8 @@
         "h8v4": "10.3.0.1",
         "h9v4": "10.3.10.1",
         "h10v4": "10.3.30.1",
-        "h11v4": "10.3.20.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/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.host b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.host
similarity index 75%
copy from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.host
copy to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.host
index 17f232e..0175e2a 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.host
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.host
@@ -8,10 +8,12 @@
         "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/30": "10.3.0.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: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":
     {
@@ -25,6 +27,8 @@
         "h8v4": "10.3.0.1",
         "h9v4": "10.3.10.1",
         "h10v4": "10.3.30.1",
-        "h11v4": "10.3.20.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/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.host b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.host
similarity index 78%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_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_dhcp=1_routers=1.host
index f564aaa..06eccf9 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.host
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.host
@@ -8,10 +8,12 @@
         "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/30": "10.3.0.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",
@@ -19,10 +21,12 @@
         "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/30": "1007::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:00:0A/40": "1010::3fe",
+	"00:BB:00:00:01:0A/10": "1011::3fe",
+	"00:BB:00:00:02:0A/None": "1012::3fe"
     },
     "network":
     {
@@ -37,6 +41,8 @@
         "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",
@@ -47,6 +53,8 @@
         "h8v6": "1007::3fe",
         "h9v6": "1008::3fe",
         "h10v6": "1009::3fe",
-        "h11v6": "1010::3fe"
+        "h11v6": "1010::3fe",
+        "h12v6": "1011::3fe",
+        "h13v6": "1012::3fe"
     }
 }
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_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
similarity index 78%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.host
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.host
index f564aaa..06eccf9 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_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
@@ -8,10 +8,12 @@
         "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/30": "10.3.0.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",
@@ -19,10 +21,12 @@
         "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/30": "1007::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:00:0A/40": "1010::3fe",
+	"00:BB:00:00:01:0A/10": "1011::3fe",
+	"00:BB:00:00:02:0A/None": "1012::3fe"
     },
     "network":
     {
@@ -37,6 +41,8 @@
         "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",
@@ -47,6 +53,8 @@
         "h8v6": "1007::3fe",
         "h9v6": "1008::3fe",
         "h10v6": "1009::3fe",
-        "h11v6": "1010::3fe"
+        "h11v6": "1010::3fe",
+        "h12v6": "1011::3fe",
+        "h13v6": "1012::3fe"
     }
 }
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_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
similarity index 78%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.host
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.host
index f564aaa..06eccf9 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/host/COMCAST_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
@@ -8,10 +8,12 @@
         "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/30": "10.3.0.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",
@@ -19,10 +21,12 @@
         "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/30": "1007::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:00:0A/40": "1010::3fe",
+	"00:BB:00:00:01:0A/10": "1011::3fe",
+	"00:BB:00:00:02:0A/None": "1012::3fe"
     },
     "network":
     {
@@ -37,6 +41,8 @@
         "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",
@@ -47,6 +53,8 @@
         "h8v6": "1007::3fe",
         "h9v6": "1008::3fe",
         "h10v6": "1009::3fe",
-        "h11v6": "1010::3fe"
+        "h11v6": "1010::3fe",
+        "h12v6": "1011::3fe",
+        "h13v6": "1012::3fe"
     }
 }
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=0_routers=0.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=0_routers=0.json
deleted file mode 100644
index be5ff7f..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=0_routers=0.json
+++ /dev/null
@@ -1,321 +0,0 @@
-{
-    "ports" : {
-        "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-tagged": [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]
-                }
-            ]
-        } 
-    },
-    "hosts" : { 
- 	"00:bb:00:00:00:01/None" : {
-		"basic": {
-			"locations": ["of:0000000000000001/3"],
-			"ips": ["1000::3fe"]
-		     }
-	    },
-	"00:bb:00:00:01:01/None" : {
-		"basic": {
-			"locations": ["of:0000000000000001/4"],
-			"ips": ["1001::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:02/None" : {
-		"basic": {
-			"locations": ["of:0000000000000002/6"],
-			"ips": ["1002::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:03/None" : {
-		"basic": {
-			"locations": ["of:0000000000000002/7", "of:0000000000000003/6"],
-			"ips": ["1003::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:06/30" : {
-		"basic": {
-			"locations": ["of:0000000000000004/6"],
-			"ips": ["1007::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: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" : {
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                 "driver" : "ofdpa-ovs",
-		 "latitude":42,
-		 "longitude":-95
-            }
-        }   
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=0.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=0.json
deleted file mode 100644
index e430592..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=0.json
+++ /dev/null
@@ -1,315 +0,0 @@
-{
-    "ports" : {
-        "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-tagged": [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:0000000000000005/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        }
-    },
-    "hosts" : { 
-	"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:06/30" : {
-		"basic": {
-			"locations": ["of:0000000000000004/6"],
-			"ips": ["1007::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: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" : {
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                 "driver" : "ofdpa-ovs",
-		 "latitude":42,
-		 "longitude":-95
-            }
-        }   
-    },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
-                {
-                    "dhcpServerConnectPoint": "of:0000000000000005/9",
-                    "serverIps": ["2000::3fd"]
-                }
-            ]
-        }
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=0_routers=0.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=0_routers=0.json
deleted file mode 100644
index 1fd2664..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=0_routers=0.json
+++ /dev/null
@@ -1,307 +0,0 @@
-{
-    "ports" : {
-        "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-tagged": [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]
-                }
-            ]
-        } 
-    },
-    "hosts" : { 
- 	"00:aa:00:00:00:01/None" : {
-		"basic": {
-			"locations": ["of:0000000000000001/3"],
-			"ips": ["10.1.0.1"]
-		     }
-	    },
-	"00:aa:00:00:01:01/None" : {
-		"basic": {
-			"locations": ["of:0000000000000001/4"],
-			"ips": ["10.1.10.1"]
-		     }
-	    },
-	"00:aa:00:00:00:02/None" : {
-		"basic": {
-			"locations": ["of:0000000000000002/6"],
-			"ips": ["10.2.0.1"]
-		     }
-	    },
-	"00:aa:00:00:00:03/None" : {
-		"basic": {
-			"locations": ["of:0000000000000002/7", "of:0000000000000003/6"],
-			"ips": ["10.2.30.1"]
-		     }
-	    },
-	"00:aa:00:00:00:04/30" : {
-		"basic": {
-			"locations": ["of:0000000000000003/7","of:0000000000000002/8"],
-			"ips": ["10.2.20.1"]
-		     }
-	    },
-	"00:aa:00:00:00:05/20" : {
-		"basic": {
-			"locations": ["of:0000000000000003/8"],
-			"ips": ["10.2.10.1"]
-		     }
-	    },
-	"00:aa:00:00:01:05/40" : {
-		"basic": {
-			"locations": ["of:0000000000000003/9"],
-			"ips": ["10.2.40.1"]
-		     }
-	    },
-	"00:aa:00:00:00:06/30" : {
-		"basic": {
-			"locations": ["of:0000000000000004/6"],
-			"ips": ["10.3.0.1"]
-		     }
-	    },
-	"00:aa:00:00:00:07/40" : {
-		"basic": {
-			"locations": ["of:0000000000000005/6", "of:0000000000000004/7"],
-			"ips": ["10.3.10.1"]
-		     }
-	    },
-	"00:aa:00:00:00:08/40" : {
-		"basic": {
-			"locations": ["of:0000000000000004/8","of:0000000000000005/7"],
-			"ips": ["10.3.30.1"]
-		     }
-	    },
-	"00:aa:00:00:00:0A/40" : {
-		"basic": {
-			"locations": ["of:0000000000000005/8"],
-			"ips": ["10.3.20.1"]
-		     }
-	    }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "name" : "s001",
-                "ipv4NodeSid" : 1001,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                 "driver" : "ofdpa-ovs",
-		 "latitude":42,
-		 "longitude":-95
-            }
-        }   
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=0.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=0.json
deleted file mode 100644
index e2e5e0e..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=0.json
+++ /dev/null
@@ -1,257 +0,0 @@
-{
-    "ports" : {
-        "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-tagged": [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:0000000000000005/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        } 
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "name" : "s001",
-                "ipv4NodeSid" : 1001,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                 "driver" : "ofdpa-ovs",
-		 "latitude":42,
-		 "longitude":-95
-            }
-        }   
-    },
-    "apps" : {
-       "org.onosproject.dhcprelay" : {
-            "default": [
-                {
-                    "dhcpServerConnectPoint": "of:0000000000000005/9",
-                    "serverIps": ["10.0.3.253"]
-                }
-            ]
-        }
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.json
deleted file mode 100644
index 1445c94..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.json
+++ /dev/null
@@ -1,308 +0,0 @@
-{
-    "ports" : {
-        "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-tagged": [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:0000000000000001" : {
-            "segmentrouting" : {
-                "name" : "s001",
-                "ipv4NodeSid" : 1001,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                 "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/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=0.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=0.json
deleted file mode 100644
index 3d2a4d3..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=0.json
+++ /dev/null
@@ -1,435 +0,0 @@
-{
-    "ports" : {
-        "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-tagged": [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-tagged": [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: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.3.254/24", "2000::3ff/120" ],
-                    "vlan-untagged": 15
-                }
-            ]
-        }
-    },
-    "hosts" : { 
-	"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:06/30" : {
-		"basic": {
-			"locations": ["of:0000000000000004/6"],
-			"ips": ["1007::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: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" : {
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                 "driver" : "ofdpa-ovs",
-		 "latitude":42,
-		 "longitude":-95
-            }
-        }   
-    },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
-                {
-                    "dhcpServerConnectPoint": "of:0000000000000005/12",
-                    "serverIps": ["10.0.3.253", "2000::3fd"]
-                }
-            ]
-        }
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.json
deleted file mode 100644
index a6555d7..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.json
+++ /dev/null
@@ -1,486 +0,0 @@
-{
-    "ports" : {
-        "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-tagged": [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-tagged": [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: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:06/30" : {
-		"basic": {
-			"locations": ["of:0000000000000004/6"],
-			"ips": ["1007::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: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" : {
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                 "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/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.json
deleted file mode 100644
index a6555d7..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.json
+++ /dev/null
@@ -1,486 +0,0 @@
-{
-    "ports" : {
-        "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-tagged": [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-tagged": [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: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:06/30" : {
-		"basic": {
-			"locations": ["of:0000000000000004/6"],
-			"ips": ["1007::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: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" : {
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                "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" : {
-                 "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/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.json
similarity index 80%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_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_dhcp=1_routers=1.json
index 030849f..e2be4d5 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.json
@@ -1,5 +1,21 @@
 {
     "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" : [
                 {
@@ -76,7 +92,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1007::3ff/120" ],
-                    "vlan-tagged": [30]
+                    "vlan-untagged": 30
                 }
             ]
         },
@@ -181,6 +197,12 @@
         }
     },
     "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"],
@@ -199,12 +221,6 @@
 			"ips": ["1006::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:06/30" : {
-		"basic": {
-			"locations": ["of:0000000000000004/6"],
-			"ips": ["1007::3fe"]
-		     }
-	    },
 	"00:bb:00:00:00:07/40" : {
 		"basic": {
 			"locations": ["of:0000000000000005/6", "of:0000000000000004/7"],
@@ -225,6 +241,60 @@
 	    }
     },
     "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",
@@ -237,8 +307,9 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s001",
                 "driver" : "ofdpa-ovs",
-		"latitude":34,	
+		"latitude":30,	
 		"longitude":-105
             }
         },
@@ -256,6 +327,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s002",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-95
@@ -275,6 +347,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s003",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-90
@@ -294,6 +367,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s004",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-85
@@ -313,6 +387,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s005",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-80
@@ -330,6 +405,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s101",
                 "driver" : "ofdpa-ovs",
 		"latitude":42,
                 "longitude":-100
@@ -347,6 +423,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                 "name" : "s102",
                  "driver" : "ofdpa-ovs",
 		 "latitude":42,
 		 "longitude":-95
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_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
similarity index 80%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.json
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.json
index 030849f..e2be4d5 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_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
@@ -1,5 +1,21 @@
 {
     "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" : [
                 {
@@ -76,7 +92,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1007::3ff/120" ],
-                    "vlan-tagged": [30]
+                    "vlan-untagged": 30
                 }
             ]
         },
@@ -181,6 +197,12 @@
         }
     },
     "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"],
@@ -199,12 +221,6 @@
 			"ips": ["1006::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:06/30" : {
-		"basic": {
-			"locations": ["of:0000000000000004/6"],
-			"ips": ["1007::3fe"]
-		     }
-	    },
 	"00:bb:00:00:00:07/40" : {
 		"basic": {
 			"locations": ["of:0000000000000005/6", "of:0000000000000004/7"],
@@ -225,6 +241,60 @@
 	    }
     },
     "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",
@@ -237,8 +307,9 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s001",
                 "driver" : "ofdpa-ovs",
-		"latitude":34,	
+		"latitude":30,	
 		"longitude":-105
             }
         },
@@ -256,6 +327,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s002",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-95
@@ -275,6 +347,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s003",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-90
@@ -294,6 +367,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s004",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-85
@@ -313,6 +387,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s005",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-80
@@ -330,6 +405,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s101",
                 "driver" : "ofdpa-ovs",
 		"latitude":42,
                 "longitude":-100
@@ -347,6 +423,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                 "name" : "s102",
                  "driver" : "ofdpa-ovs",
 		 "latitude":42,
 		 "longitude":-95
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_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
similarity index 80%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.json
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.json
index 030849f..e87f6c1 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_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
@@ -1,5 +1,21 @@
 {
     "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" : [
                 {
@@ -76,7 +92,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1007::3ff/120" ],
-                    "vlan-tagged": [30]
+                    "vlan-untagged": 30
                 }
             ]
         },
@@ -181,6 +197,12 @@
         }
     },
     "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"],
@@ -199,12 +221,6 @@
 			"ips": ["1006::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:06/30" : {
-		"basic": {
-			"locations": ["of:0000000000000004/6"],
-			"ips": ["1007::3fe"]
-		     }
-	    },
 	"00:bb:00:00:00:07/40" : {
 		"basic": {
 			"locations": ["of:0000000000000005/6", "of:0000000000000004/7"],
@@ -225,6 +241,60 @@
 	    }
     },
     "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",
@@ -237,8 +307,9 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s001",
                 "driver" : "ofdpa-ovs",
-		"latitude":34,	
+		"latitude":30,	
 		"longitude":-105
             }
         },
@@ -256,6 +327,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s002",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-95
@@ -275,6 +347,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s003",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-90
@@ -294,6 +367,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s004",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-85
@@ -313,6 +387,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s005",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-80
@@ -330,6 +405,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s101",
                 "driver" : "ofdpa-ovs",
 		"latitude":42,
                 "longitude":-100
@@ -347,6 +423,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                 "name" : "s102",
                  "driver" : "ofdpa-ovs",
 		 "latitude":42,
 		 "longitude":-95
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_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
similarity index 78%
copy from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.json
copy to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.json
index 1445c94..f5d64be 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_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
@@ -1,5 +1,21 @@
 {
     "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" : [
                 {
@@ -44,7 +60,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.2.10.254/24" ],
-                    "vlan-tagged": [20]
+                    "vlan-tagged": [ 20 ]
                 }
             ]
         },
@@ -76,7 +92,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.0.254/24" ],
-                    "vlan-tagged": [30]
+                    "vlan-untagged": 30
                 }
             ]
         },
@@ -181,6 +197,60 @@
         }
     },
     "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",
@@ -191,8 +261,9 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s001",
                 "driver" : "ofdpa-ovs",
-		"latitude":34,	
+		"latitude":30,	
 		"longitude":-105
             }
         },
@@ -208,6 +279,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s002",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-95
@@ -225,6 +297,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s003",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-90
@@ -242,6 +315,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s004",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-85
@@ -259,6 +333,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s005",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-80
@@ -274,6 +349,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s101",
                 "driver" : "ofdpa-ovs",
 		"latitude":42,
                 "longitude":-100
@@ -289,6 +365,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s102",
                  "driver" : "ofdpa-ovs",
 		 "latitude":42,
 		 "longitude":-95
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_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_external=1.json
similarity index 78%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.json
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.json
index 1445c94..6021cc6 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_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_external=1.json
@@ -1,5 +1,21 @@
 {
     "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" : [
                 {
@@ -76,7 +92,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.0.254/24" ],
-                    "vlan-tagged": [30]
+                    "vlan-untagged": 30
                 }
             ]
         },
@@ -181,6 +197,60 @@
         }
     },
     "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",
@@ -191,8 +261,9 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s001",
                 "driver" : "ofdpa-ovs",
-		"latitude":34,	
+		"latitude":30,	
 		"longitude":-105
             }
         },
@@ -208,6 +279,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s002",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-95
@@ -225,6 +297,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s003",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-90
@@ -242,6 +315,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s004",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-85
@@ -259,6 +333,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s005",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-80
@@ -274,6 +349,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s101",
                 "driver" : "ofdpa-ovs",
 		"latitude":42,
                 "longitude":-100
@@ -289,6 +365,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                 "name" : "s102",
                  "driver" : "ofdpa-ovs",
 		 "latitude":42,
 		 "longitude":-95
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_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
similarity index 78%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.json
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.json
index 1445c94..3b6347a 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_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
@@ -1,5 +1,21 @@
 {
     "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" : [
                 {
@@ -76,7 +92,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.0.254/24" ],
-                    "vlan-tagged": [30]
+                    "vlan-untagged": 30
                 }
             ]
         },
@@ -181,7 +197,61 @@
         }
     },
     "devices" : {
-        "of:0000000000000001" : {
+ 	"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,
@@ -191,8 +261,9 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s001",
                 "driver" : "ofdpa-ovs",
-		"latitude":34,	
+		"latitude":30,	
 		"longitude":-105
             }
         },
@@ -208,6 +279,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s002",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-95
@@ -225,6 +297,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s003",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-90
@@ -242,6 +315,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s004",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-85
@@ -259,6 +333,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s005",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-80
@@ -274,6 +349,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s101",
                 "driver" : "ofdpa-ovs",
 		"latitude":42,
                 "longitude":-100
@@ -289,6 +365,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s102",
                  "driver" : "ofdpa-ovs",
 		 "latitude":42,
 		 "longitude":-95
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_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
similarity index 81%
copy from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.json
copy to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.json
index a6555d7..a4aa648 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_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
@@ -1,5 +1,38 @@
 {
     "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" : [
                 {
@@ -148,7 +181,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1007::3ff/120" ],
-                    "vlan-tagged": [30]
+                    "vlan-untagged": 30
                 }
             ]
         },
@@ -172,7 +205,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.0.254/24" ],
-                    "vlan-tagged": [30]
+                    "vlan-untagged": 30
                 }
             ]
         },
@@ -301,6 +334,12 @@
         }
     },
     "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"],
@@ -319,12 +358,6 @@
 			"ips": ["1006::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:06/30" : {
-		"basic": {
-			"locations": ["of:0000000000000004/6"],
-			"ips": ["1007::3fe"]
-		     }
-	    },
 	"00:bb:00:00:00:07/40" : {
 		"basic": {
 			"locations": ["of:0000000000000005/6", "of:0000000000000004/7"],
@@ -345,6 +378,60 @@
 	    }
     },
     "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",
@@ -357,8 +444,9 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s001",
                 "driver" : "ofdpa-ovs",
-		"latitude":34,	
+		"latitude":30,	
 		"longitude":-105
             }
         },
@@ -376,6 +464,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s002",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-95
@@ -395,6 +484,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s003",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-90
@@ -414,6 +504,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s004",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-85
@@ -433,6 +524,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s005",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-80
@@ -450,6 +542,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s101",
                 "driver" : "ofdpa-ovs",
 		"latitude":42,
                 "longitude":-100
@@ -467,6 +560,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s102",
                  "driver" : "ofdpa-ovs",
 		 "latitude":42,
 		 "longitude":-95
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_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_external=1.json
similarity index 81%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.json
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.json
index a6555d7..d1ed5c3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_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_external=1.json
@@ -1,5 +1,38 @@
 {
     "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" : [
                 {
@@ -148,7 +181,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1007::3ff/120" ],
-                    "vlan-tagged": [30]
+                    "vlan-untagged": 30
                 }
             ]
         },
@@ -172,7 +205,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.0.254/24" ],
-                    "vlan-tagged": [30]
+                    "vlan-untagged": 30
                 }
             ]
         },
@@ -301,6 +334,12 @@
         }
     },
     "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"],
@@ -319,12 +358,6 @@
 			"ips": ["1006::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:06/30" : {
-		"basic": {
-			"locations": ["of:0000000000000004/6"],
-			"ips": ["1007::3fe"]
-		     }
-	    },
 	"00:bb:00:00:00:07/40" : {
 		"basic": {
 			"locations": ["of:0000000000000005/6", "of:0000000000000004/7"],
@@ -345,6 +378,60 @@
 	    }
     },
     "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",
@@ -357,8 +444,9 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s001",
                 "driver" : "ofdpa-ovs",
-		"latitude":34,	
+		"latitude":30,	
 		"longitude":-105
             }
         },
@@ -376,6 +464,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s002",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-95
@@ -395,6 +484,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s003",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-90
@@ -414,6 +504,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s004",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-85
@@ -433,6 +524,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s005",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-80
@@ -450,6 +542,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s101",
                 "driver" : "ofdpa-ovs",
 		"latitude":42,
                 "longitude":-100
@@ -467,6 +560,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s102",
                  "driver" : "ofdpa-ovs",
 		 "latitude":42,
 		 "longitude":-95
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_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_static=1.json
similarity index 81%
copy from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.json
copy to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.json
index a6555d7..7ebe7b2 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_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_static=1.json
@@ -1,5 +1,38 @@
 {
     "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" : [
                 {
@@ -148,7 +181,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1007::3ff/120" ],
-                    "vlan-tagged": [30]
+                    "vlan-untagged": 30
                 }
             ]
         },
@@ -172,7 +205,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.0.254/24" ],
-                    "vlan-tagged": [30]
+                    "vlan-untagged": 30
                 }
             ]
         },
@@ -301,6 +334,12 @@
         }
     },
     "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"],
@@ -319,12 +358,6 @@
 			"ips": ["1006::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:06/30" : {
-		"basic": {
-			"locations": ["of:0000000000000004/6"],
-			"ips": ["1007::3fe"]
-		     }
-	    },
 	"00:bb:00:00:00:07/40" : {
 		"basic": {
 			"locations": ["of:0000000000000005/6", "of:0000000000000004/7"],
@@ -345,6 +378,60 @@
 	    }
     },
     "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",
@@ -357,8 +444,9 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s001",
                 "driver" : "ofdpa-ovs",
-		"latitude":34,	
+		"latitude":30,	
 		"longitude":-105
             }
         },
@@ -376,6 +464,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s002",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-95
@@ -395,6 +484,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s003",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-90
@@ -414,6 +504,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s004",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-85
@@ -433,6 +524,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s005",
                 "driver" : "ofdpa-ovs",
 		"latitude":34,	
 		"longitude":-80
@@ -450,6 +542,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s101",
                 "driver" : "ofdpa-ovs",
 		"latitude":42,
                 "longitude":-100
@@ -467,6 +560,7 @@
                 "adjacencySids" : []
             },
             "basic" : {
+                "name" : "s102",
                  "driver" : "ofdpa-ovs",
 		 "latitude":42,
 		 "longitude":-95
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/extra.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/extra.json
deleted file mode 100644
index e3544bf..0000000
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/extra.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "hosts" : {
-        "00:00:00:00:00:09/-1" : {
-            "basic": {
-                "ips": ["10.0.1.9"],
-                "locations": ["of:0000000000000001/3"]
-            }
-        },
-        "00:00:00:00:09:01/-1" : {
-            "basic": {
-                "ips": ["10.0.9.1"],
-                "locations": ["of:0000000000000001/4"]
-            }
-        }
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.linkFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.linkFailureChart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/COMCAST_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_dhcp=1_routers=1.linkFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/COMCAST_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
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.linkFailureChart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.linkFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/COMCAST_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
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.linkFailureChart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.linkFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/COMCAST_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
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.linkFailureChart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.linkFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/COMCAST_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
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.linkFailureChart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.linkFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/COMCAST_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
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.linkFailureChart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.linkFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/COMCAST_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
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.linkFailureChart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.linkFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/COMCAST_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
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.linkFailureChart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.linkFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/COMCAST_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
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.linkFailureChart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/linkFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.linkFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.switchFailureChart b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.switchFailureChart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/COMCAST_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_dhcp=1_routers=1.switchFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/COMCAST_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
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.switchFailureChart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.switchFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/COMCAST_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
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.switchFailureChart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.switchFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/COMCAST_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
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.switchFailureChart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.switchFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/COMCAST_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
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.switchFailureChart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.switchFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/COMCAST_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
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.switchFailureChart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.switchFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/COMCAST_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
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.switchFailureChart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.switchFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/COMCAST_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
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.switchFailureChart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.switchFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/COMCAST_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
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.switchFailureChart
rename to TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/switchFailure/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.switchFailureChart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/COMCAST_CONFIG.json b/TestON/tests/USECASE/SegmentRouting/dependencies/COMCAST_CONFIG.json
deleted file mode 100644
index 8a7eff8..0000000
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/COMCAST_CONFIG.json
+++ /dev/null
@@ -1,279 +0,0 @@
-{
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.1.0.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/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-tagged": [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]
-                }
-            ]
-        } 
-    },
-    "hosts" : { 
- 	"00:aa:00:00:00:01/10" : {
-		"basic": {
-			"locations": ["of:0000000000000001/3"],
-			"ips": ["10.1.0.1"]
-		     }
-	    },
-	"00:aa:00:00:00:02/None" : {
-		"basic": {
-			"locations": ["of:0000000000000002/6"],
-			"ips": ["10.2.0.1"]
-		     }
-	    },
-	"00:aa:00:00:00:03/None" : {
-		"basic": {
-			"locations": ["of:0000000000000002/7", "of:0000000000000003/6"],
-			"ips": ["10.2.30.1"]
-		     }
-	    },
-	"00:aa:00:00:00:04/30" : {
-		"basic": {
-			"locations": ["of:0000000000000003/7","of:0000000000000002/8"],
-			"ips": ["10.2.20.1"]
-		     }
-	    },
-	"00:aa:00:00:00:05/20" : {
-		"basic": {
-			"locations": ["of:0000000000000003/8"],
-			"ips": ["10.2.10.1"]
-		     }
-	    },
-	"00:aa:00:00:00:06/30" : {
-		"basic": {
-			"locations": ["of:0000000000000004/6"],
-			"ips": ["10.3.0.1"]
-		     }
-	    },
-	"00:aa:00:00:00:07/40" : {
-		"basic": {
-			"locations": ["of:0000000000000005/6", "of:0000000000000004/7"],
-			"ips": ["10.3.10.1"]
-		     }
-	    },
-	"00:aa:00:00:00:08/40" : {
-		"basic": {
-			"locations": ["of:0000000000000004/8","of:0000000000000005/7"],
-			"ips": ["10.3.30.1"]
-		     }
-	    },
-	"00:aa:00:00:00:0A/40" : {
-		"basic": {
-			"locations": ["of:0000000000000005/8"],
-			"ips": ["10.3.20.1"]
-		     }
-	    }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "name" : "s001",
-                "ipv4NodeSid" : 1,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-105
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "name" : "s002",
-                "ipv4NodeSid" : 2,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000003",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-95
-            }
-        },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "name" : "s003",
-                "ipv4NodeSid" : 3,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:03",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000002",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-90
-            }
-        },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "name" : "s004",
-                "ipv4NodeSid" : 4,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000005",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-85
-            }
-        },
-        "of:0000000000000005" : {
-            "segmentrouting" : {
-                "name" : "s005",
-                "ipv4NodeSid" : 5,
-                "ipv4Loopback" : "192.168.0.5",
-                "routerMac" : "00:00:00:00:00:05",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000004",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-80
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "name" : "s101",
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs",
-		"latitude":42,
-                "longitude":-100
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "name" : "s102",
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                 "driver" : "ofdpa-ovs",
-		 "latitude":42,
-		 "longitude":-95
-            }
-        }   
-    }
-}
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/comcast_fabric.py b/TestON/tests/USECASE/SegmentRouting/dependencies/fabric.py
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/comcast_fabric.py
rename to TestON/tests/USECASE/SegmentRouting/dependencies/fabric.py
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/hagg_fabric.py b/TestON/tests/USECASE/SegmentRouting/dependencies/hagg_fabric.py
new file mode 100644
index 0000000..79b4992
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/hagg_fabric.py
@@ -0,0 +1,427 @@
+#!/usr/bin/python
+import os
+import re
+from optparse import OptionParser
+from ipaddress import ip_network
+from mininet.node import RemoteController, OVSBridge, Host
+from mininet.link import TCLink
+from mininet.log import setLogLevel
+from mininet.net import Mininet
+from mininet.topo import Topo
+from mininet.nodelib import NAT
+from mininet.cli import CLI
+
+from routinglib import BgpRouter, RoutedHost
+from trellislib import DhcpServer, TaggedRoutedHost, DualHomedRoutedHost, DualHomedTaggedRoutedHost, DhcpClient, Dhcp6Client, DhcpServer, Dhcp6Server, TrellisHost
+
+# Parse command line options and dump results
+def parseOptions():
+    "Parse command line options"
+    parser = OptionParser()
+    parser.add_option( '--dhcp', dest='dhcp', type='int', default=0,
+                       help='Configure hosts with dhcp or not' )
+    parser.add_option( '--routers', dest='routers', type='int', default=0,
+                       help='Configure external routers or not in the topology' )
+    parser.add_option( '--ipv6', dest='ipv6', type='int', default=0,
+                       help='Configure hosts with ipv6 or not' )
+    parser.add_option( '--ipv4', dest='ipv4', type='int', default=1,
+                       help='Configure hosts with ipv4 or not' )
+    parser.add_option( '--onos-ip', dest='onosIp', type='str', default='',
+                        help='IP address list of ONOS instances, separated by comma(,). Overrides --onos option' )
+
+    ( options, args ) = parser.parse_args()
+    return options, args
+
+opts, args = parseOptions()
+
+class ComcastLeafSpineFabric(Topo):
+
+    spines = dict()
+    leafs = dict()
+    hosts_dict = dict()
+
+    def createIpv4Hosts(self, dhcp):
+
+        h1 = self.addHost('h1v4', cls=TrellisHost,
+                           mac='00:aa:00:00:00:01', ips=['10.1.0.1/24'],
+                           gateway='10.1.0.254', dhcpClient=dhcp)
+        self.addLink(h1, self.leafs[0])
+        self.hosts_dict['h1v4'] = h1
+
+        h2 = self.addHost('h2v4', cls=TrellisHost,
+                          mac='00:aa:00:00:01:01', ips=['10.1.10.1/24'],
+                          gateway='10.1.10.254', dhcpClient=dhcp)
+        self.addLink(h2, self.leafs[0])
+        self.hosts_dict['h2v4'] = h2
+
+        h3 = self.addHost('h3v4', cls=TrellisHost,
+                          mac='00:aa:00:00:00:02', ips=['10.2.0.1/24'],
+                          gateway='10.2.0.254', dhcpClient=dhcp)
+        self.addLink(h3, self.leafs[1])
+        self.hosts_dict['h3v4'] = h3
+
+        h4 = self.addHost('h4v4', cls=TrellisHost,
+                          mac='00:aa:00:00:00:03', ips=['10.2.30.1/24'],
+                          gateway='10.2.30.254', dhcpClient=dhcp,
+                          dualHomed=True)
+        self.addLink(h4, self.leafs[1])
+        self.addLink(h4, self.leafs[2])
+        self.hosts_dict['h4v4'] = h4
+
+        h5 = self.addHost('h5v4', cls=TrellisHost,
+                          mac='00:aa:00:00:00:04', ips=['10.2.20.1/24'],
+                          gateway='10.2.20.254', dhcpClient=dhcp, vlan=30,
+                          dualHomed=True)
+        self.addLink(h5, self.leafs[1])
+        self.addLink(h5, self.leafs[2])
+        self.hosts_dict['h5v4'] = h5
+
+        h6 = self.addHost('h6v4', cls=TrellisHost,
+                          mac='00:aa:00:00:00:05', ips=['10.2.10.1/24'],
+                          gateway='10.2.10.254', dhcpClient=dhcp, vlan=20)
+        self.addLink(h6, self.leafs[2])
+        self.hosts_dict['h6v4'] = h6
+
+        h7 = self.addHost('h7v4', cls=TrellisHost,
+                          mac='00:aa:00:00:01:05', ips=['10.2.40.1/24'],
+                          gateway='10.2.40.254', dhcpClient=dhcp, vlan=40)
+        self.addLink(h7, self.leafs[2])
+        self.hosts_dict['h7v4'] = h7
+
+        h8 = self.addHost('h8v4', cls=TrellisHost,
+                          mac='00:aa:00:00:00:06', ips=['10.3.0.1/24'],
+                          gateway='10.3.0.254', dhcpClient=dhcp)
+        self.addLink(h8, self.leafs[3])
+        self.hosts_dict['h8v4'] = h8
+
+        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,
+                          dualHomed=True)
+        self.addLink(h9, self.leafs[3])
+        self.addLink(h9, self.leafs[4])
+        self.hosts_dict['h9v4'] = h9
+
+        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,
+                           dualHomed=True)
+        self.addLink(h10, self.leafs[3])
+        self.addLink(h10, self.leafs[4])
+        self.hosts_dict['h10v4'] = h10
+
+        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)
+        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)
+        self.addLink(h12, self.leafs[5])
+        self.hosts_dict['h12v4'] = h12
+
+        h13 = self.addHost('h13v4', cls=TrellisHost,
+                           mac='00:aa:00:00:02:02', ips=['10.5.20.1/24'],
+                           gateway='10.5.20.254', dhcpClient=dhcp)
+        self.addLink(h13, self.leafs[5])
+        self.hosts_dict['h13v4'] = h13
+
+        return
+
+    def createIpv6Hosts(self, dhcp):
+
+        h1 = self.addHost('h1v6', cls=TrellisHost,
+                          mac='00:bb:00:00:00:01', ips=["1000::3fe/120"],
+                          gateway='1000::3ff', dhcpClient=dhcp, ipv6=1)
+        self.addLink(h1, self.leafs[0])
+        self.hosts_dict['h1v6'] = h1
+
+        h2 = self.addHost('h2v6', cls=TrellisHost,
+                          mac='00:bb:00:00:01:01', ips=['1001::3fe/120'],
+                          gateway='1001::3ff', dhcpClient=dhcp, ipv6=1)
+        self.addLink(h2, self.leafs[0])
+        self.hosts_dict['h2v6'] = h2
+
+        h3 = self.addHost('h3v6', cls=TrellisHost,
+                          mac='00:bb:00:00:00:02', ips=['1002::3fe/120'],
+                          gateway='1002::3ff', dhcpClient=dhcp, ipv6=1)
+        self.addLink(h3, self.leafs[1])
+        self.hosts_dict['h3v6'] = h3
+
+        h4 = self.addHost('h4v6', cls=TrellisHost,
+                          mac='00:bb:00:00:00:03', ips=['1003::3fe/120'],
+                          gateway='1003::3ff', dhcpClient=dhcp, ipv6=1,
+                          dualHomed=True)
+        self.addLink(h4, self.leafs[1])
+        self.addLink(h4, self.leafs[2])
+        self.hosts_dict['h4v6'] = h4
+
+        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,
+                          dualHomed=True)
+        self.addLink(h5, self.leafs[1])
+        self.addLink(h5, self.leafs[2])
+        self.hosts_dict['h5v6'] = h5
+
+        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)
+        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)
+        self.addLink(h7, self.leafs[2])
+        self.hosts_dict['h7v6'] = h7
+
+        h8 = self.addHost('h8v6', cls=TrellisHost,
+                          mac='00:bb:00:00:00:06', ips=['1007::3fe/120'],
+                          gateway='1007::3ff', dhcpClient=dhcp, ipv6=1)
+        self.addLink(h8, self.leafs[3])
+        self.hosts_dict['h8v6'] = h8
+
+        h9 = self.addHost('h9v6', cls=TrellisHost,
+                          mac='00:bb:00:00:00:07', ips=['1008::3fe/120'],
+                          gateway='1008::3ff', dhcpClient=False, vlan=40,
+                          dualHomed=True, ipv6=1)
+        self.addLink(h9, self.leafs[3])
+        self.addLink(h9, self.leafs[4])
+        self.hosts_dict['h9v6'] = h9
+
+        h10 = self.addHost('h10v6', cls=TrellisHost,
+                           mac='00:bb:00:00:00:08', ips=['1009::3fe/120'],
+                           gateway='1009::3ff', dhcpClient=False, vlan=40,
+                           dualHomed=True, ipv6=1)
+        self.addLink(h10, self.leafs[3])
+        self.addLink(h10, self.leafs[4])
+        self.hosts_dict['h10v6'] = h10
+
+        h11 = self.addHost('h11v6', cls=TrellisHost,
+                           mac='00:bb:00:00:00:0a', ips=['1010::3fe/120'],
+                           gateway='1010::3ff', dhcpClient=False, vlan=40,
+                           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,
+                           ipv6=1)
+        self.addLink(h12, self.leafs[5])
+        self.hosts_dict['h12v6'] = h12
+
+        h13 = self.addHost('h13v6', cls=TrellisHost,
+                           mac='00:bb:00:00:02:0a', ips=['1012::3fe/120'],
+                           gateway='1012::3ff', dhcpClient=dhcp, ipv6=1)
+        self.addLink(h13, self.leafs[5])
+        self.hosts_dict['h13v6'] = h13
+
+        return
+
+    '''
+    Creates the HAGG topology employed by Comcast.
+    '''
+    def __init__(self, dhcp=False, routers=False, ipv4=False, ipv6=False, **opts):
+        Topo.__init__(self, **opts)
+
+        linkopts = dict( bw=10 )
+
+        spine = 4
+        leaf = 6
+
+        # Create spine switches
+        for s in range(spine):
+            self.spines[s] = self.addSwitch('spine10%s' % (s + 1), dpid = "00000000010%s" % (s + 1) )
+
+        # Create leaf switches
+        for ls in range(leaf):
+            self.leafs[ls] = self.addSwitch('leaf%s' % (ls + 1), dpid = "00000000000%s" % ( ls + 1) )
+
+        # connecting leaf and spines, leafs 1-5 have double links
+        for s in range(2):
+            spine_switch = self.spines[s]
+
+            for ls in range(1, 5):
+                leaf_switch = self.leafs[ls]
+
+                self.addLink( spine_switch, leaf_switch, **linkopts )
+                self.addLink( spine_switch, leaf_switch, **linkopts )
+
+        # connect paired leafs
+        self.addLink(self.leafs[1], self.leafs[2], **linkopts)
+        self.addLink(self.leafs[3], self.leafs[4], **linkopts)
+
+        # build second fabric with single links
+        for s in range(2, 4):
+            spine_switch = self.spines[s]
+
+            for ls in [0, 5]:
+                leaf_switch = self.leafs[ls]
+                self.addLink( spine_switch, leaf_switch, **linkopts )
+
+        # connect spines together
+        self.addLink(self.spines[2], self.spines[0], **linkopts)
+        self.addLink(self.spines[3], self.spines[1], **linkopts)
+
+        # create hosts
+        if ipv6:
+            self.createIpv6Hosts(dhcp)
+
+        if ipv4:
+            self.createIpv4Hosts(dhcp)
+
+        if not ipv4 and not ipv6:
+            print("No hosts were created!")
+
+        # create quagga routers
+        # Note: Change "fpm connection ip" to $OC1 in zebradbgp1.conf and zebradbgp2.conf to make quagga work correctly
+        if routers:
+            last_ls = self.leafs[4]
+            last_paired_ls = self.leafs[3]
+
+            # Control plane switch (for quagga fpm)
+            cs0 = self.addSwitch('cs0', cls=OVSBridge)
+
+            # Control plane NAT (for quagga fpm)
+            nat = self.addHost('nat', cls=NAT,
+                               ip='172.16.0.1/12',
+                               subnet=str(ip_network(u'172.16.0.0/12')), inNamespace=False)
+            self.addLink(cs0, nat)
+
+            # Internal Quagga bgp1
+            intfs = {'bgp1-eth0': [{'ipAddrs': ['10.0.1.2/24', '2000::102/120'], 'mac': '00:88:00:00:00:03', 'vlan': '110'},
+                                   {'ipAddrs': ['10.0.7.2/24', '2000::702/120'], 'mac': '00:88:00:00:00:03', 'vlan': '170'}],
+                     'bgp1-eth1': {'ipAddrs': ['172.16.0.3/12']}}
+            bgp1 = self.addHost('bgp1', cls=BgpRouter,
+                                interfaces=intfs,
+                                quaggaConfFile='./bgpdbgp1.conf',
+                                zebraConfFile='./zebradbgp1.conf')
+            self.addLink(bgp1, last_paired_ls)
+            self.addLink(bgp1, cs0)
+
+            # Internal Quagga bgp2
+            intfs = {'bgp2-eth0': [{'ipAddrs': ['10.0.5.2/24', '2000::502/120'], 'mac': '00:88:00:00:00:04', 'vlan': '150'},
+                                   {'ipAddrs': ['10.0.6.2/24', '2000::602/120'], 'mac': '00:88:00:00:00:04', 'vlan': '160'}],
+                     'bgp2-eth1': {'ipAddrs': ['172.16.0.4/12']}}
+            bgp2 = self.addHost('bgp2', cls=BgpRouter,
+                                interfaces=intfs,
+                                quaggaConfFile='./bgpdbgp2.conf',
+                                zebraConfFile='./zebradbgp2.conf')
+            self.addLink(bgp2, last_ls)
+            self.addLink(bgp2, cs0)
+
+            # External Quagga r1
+            intfs = {'r1-eth0': {'ipAddrs': ['10.0.1.1/24', '2000::101/120'], 'mac': '00:88:00:00:00:01'},
+                     'r1-eth1': {'ipAddrs': ['10.0.5.1/24', '2000::501/120'], 'mac': '00:88:00:00:00:11'},
+                     'r1-eth2': {'ipAddrs': ['10.0.99.1/16']},
+                     'r1-eth3': {'ipAddrs': ['2000::9901/120']},
+                     'r1-eth4': {'ipAddrs': ['2000::7701/120']},
+                     'r1-eth5': {'ipAddrs': ['10.0.88.1/24']},
+                     'r1-eth6': {'ipAddrs': ['2000::8701/120']}}
+            r1 = self.addHost('r1', cls=BgpRouter,
+                                interfaces=intfs,
+                                quaggaConfFile='./bgpdr1.conf')
+            self.addLink(r1, last_paired_ls)
+            self.addLink(r1, last_ls)
+
+            # External IPv4 Host behind r1
+            rh1v4 = self.addHost('rh1v4', cls=RoutedHost, ips=['10.0.99.2/24'], gateway='10.0.99.1')
+            self.addLink(r1, rh1v4)
+
+            # External IPv6 Host behind r1
+            rh1v6 = self.addHost('rh1v6', cls=RoutedHost, ips=['2000::9902/120'], gateway='2000::9901')
+            self.addLink(r1, rh1v6)
+
+            # Another external IPv6 Host behind r1
+            rh11v6 = self.addHost('rh11v6', cls=RoutedHost, ips=['2000::7702/120'], gateway='2000::7701')
+            self.addLink(r1, rh11v6)
+
+            # Add an external ipv4 hosts that is not configured in the bgp conf
+            # files
+            rh5v4 = self.addHost('rh5v4', cls=RoutedHost, ips=['10.0.88.2/24'], gateway='10.0.88.1')
+            self.addLink(r1, rh5v4)
+
+            # Add an external ipv6 hosts that is not configured in the bgp conf
+            # files
+            rh5v6 = self.addHost('rh5v6', cls=RoutedHost, ips=['2000::8702/120'], gateway='2000::8701')
+            self.addLink(r1, rh5v6)
+
+            # External Quagga r2
+            intfs = {'r2-eth0': {'ipAddrs': ['10.0.6.1/24', '2000::601/120'], 'mac': '00:88:00:00:00:02'},
+                     'r2-eth1': {'ipAddrs': ['10.0.7.1/24', '2000::701/120'], 'mac': '00:88:00:00:00:22'},
+                     'r2-eth2': {'ipAddrs': ['10.0.99.1/16']},
+                     'r2-eth3': {'ipAddrs': ['2000::9901/120']},
+                     'r2-eth4': {'ipAddrs': ['2000::8801/120']}}
+            r2 = self.addHost('r2', cls=BgpRouter,
+                                interfaces=intfs,
+                                quaggaConfFile='./bgpdr2.conf')
+            self.addLink(r2, last_ls)
+            self.addLink(r2, last_paired_ls)
+
+            # External IPv4 Host behind r2
+            rh2v4 = self.addHost('rh2v4', cls=RoutedHost, ips=['10.0.99.2/24'], gateway='10.0.99.1')
+            self.addLink(r2, rh2v4)
+
+            # External IPv6 Host behind r2
+            rh2v6 = self.addHost('rh2v6', cls=RoutedHost, ips=['2000::9902/120'], gateway='2000::9901')
+            self.addLink(r2, rh2v6)
+
+            # Another external IPv6 Host behind r1
+            rh22v6 = self.addHost('rh22v6', cls=RoutedHost, ips=['2000::8802/120'], gateway='2000::8801')
+            self.addLink(r2, rh22v6)
+
+        # create dhcp servers
+        if dhcp:
+            cs1 = self.addSwitch('cs1', cls=OVSBridge)
+            self.addLink(cs1, self.leafs[4])
+            if ipv4:
+                dhcp4 = self.addHost( 'dhcp', cls=TrellisHost,
+                                      mac="00:cc:00:00:00:01", ips=["10.0.3.253/24"],
+                                      gateway="10.0.3.254", dhcpServer=True)
+                self.addLink(dhcp4, cs1, **linkopts)
+            if ipv6:
+                dhcp6 = self.addHost( 'dhcp6', cls=TrellisHost,
+                                      mac="00:dd:00:00:00:01", ips=["2000::3fd/120"],
+                                      gateway="2000::3ff", dhcpServer=True, ipv6=True)
+                self.addLink(dhcp6, cs1, **linkopts)
+
+
+def config( opts ):
+
+    dhcp = bool(opts.dhcp)
+    routers = bool(opts.routers)
+    ipv6 = bool(opts.ipv6)
+    ipv4 = bool(opts.ipv4)
+
+    if opts.onosIp != '':
+        controllers = opts.onosIp.split( ',' )
+    else:
+        controllers = ['127.0.0.1']
+    topo = ComcastLeafSpineFabric(dhcp=dhcp, routers=routers, ipv6=ipv6,
+                                  ipv4=ipv4)
+
+    net = Mininet( topo=topo, link=TCLink, build=False,
+                   controller=None, autoSetMacs=True )
+    i = 0
+    for ip in controllers:
+        net.addController( "c%s" % ( i ), controller=RemoteController, ip=ip )
+        i += 1
+
+    net.build()
+    net.start()
+    CLI( net )
+    net.stop()
+
+
+if __name__ == '__main__':
+    setLogLevel('info')
+    config(opts)
+    os.system('sudo mn -c')
+