Added tests for ipv6 hosts and refactored Comcast fabric.

Change-Id: I151564afee471cac5d3a3ff48b65dff609b13c23
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
index b4cf1dd..85e920f 100644
--- 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
@@ -227,7 +227,7 @@
                 "name" : "s003",
                 "ipv4NodeSid" : 3,
                 "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:03",
+                "routerMac" : "00:00:00:00:00:02",
                 "isEdgeRouter" : true,
                 "pairLocalPort" : 5,
                 "pairDeviceId": "of:0000000000000002",
@@ -261,7 +261,7 @@
                 "name" : "s005",
                 "ipv4NodeSid" : 5,
                 "ipv4Loopback" : "192.168.0.5",
-                "routerMac" : "00:00:00:00:00:05",
+                "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
                 "pairLocalPort" : 5,
                 "pairDeviceId": "of:0000000000000004",