[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=0.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=0.json
index 968884f..66e5103 100644
--- 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
@@ -120,7 +120,7 @@
                 }
             ]
        } ,
-        "of:0000000000000102/10" : {
+        "of:0000000000000005/9" : {
             "interfaces" : [
                 {
                     "ips" : [ "10.0.3.254/24" ],
@@ -248,7 +248,7 @@
        "org.onosproject.dhcprelay" : {
             "default": [
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000102/10",
+                    "dhcpServerConnectPoint": "of:0000000000000005/9",
                     "serverIps": ["10.0.3.253"]
                 }
             ]