[ONOS-7502] Adding more SRRouting test cases
- Moved dhcp servers to leaf switch
- Added ipv4+ipv6 scenario

Change-Id: I542cb9dcf8cfa8899a87216e9f1dc9489325e60b
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/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.json
index e06e3ab..59284ba 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/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.json
@@ -119,14 +119,6 @@
                     "vlan-tagged": [40]
                 }
             ]
-       } ,
-        "of:0000000000000102/10" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 15
-                }
-            ]
         },
         "of:0000000000000004/9" : {
             "interfaces" : [
@@ -178,6 +170,14 @@
 	               "vlan-untagged": 160
                 }
             ]
+        },
+        "of:0000000000000005/12" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.0.3.254/24" ],
+                    "vlan-untagged": 15
+                }
+            ]
         }
     },
     "devices" : {
@@ -299,7 +299,7 @@
        "org.onosproject.dhcprelay" : {
             "default": [
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000102/10",
+                    "dhcpServerConnectPoint": "of:0000000000000005/12",
                     "serverIps": ["10.0.3.253"]
                 }
             ]