ipv4/ipv6 w/t dhcp support and routers.

Introducing ipv4/ipv6 with dhcp support. Note here
that tests might fail from time to time, this needs further
investigation. Further, introducing external routing support
for ipv4.

Change-Id: I64450f4082e47b835ae2e967a98a36fe69a059c3
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 f943f35..968884f 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
@@ -119,76 +119,16 @@
                     "vlan-tagged": [40]
                 }
             ]
+       } ,
+        "of:0000000000000102/10" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.0.3.254/24" ],
+                    "vlan-untagged": 15
+                }
+            ]
         } 
     },
-    "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" : {
@@ -305,14 +245,13 @@
         }   
     },
     "apps" : {
-	"org.onosproject.dhcprelay" : {
-		"default" : [ 
-			{
-				 "dhcpServerConnectPoint": "of:0000000000000102/10",
-				 "serverIps": ["10.0.3.253"]
-			}
-		]
-	}
+       "org.onosproject.dhcprelay" : {
+            "default": [
+                {
+                    "dhcpServerConnectPoint": "of:0000000000000102/10",
+                    "serverIps": ["10.0.3.253"]
+                }
+            ]
+        }
     }
-
 }