HC2VPP-43: support for multiple DHCP servers for relay

Depends on https://gerrit.fd.io/r/#/c/5515/

Change-Id: I76d1b37b9d9e866fc97f3cc35c1ac01e48b0ab57
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

1 files changed, 83 insertions, 40 deletions

diff --git a/dhcp/dhcp_postman_collection.json b/dhcp/dhcp_postman_collection.json
index e7070ed36..d2afc8cd5 100644
--- a/dhcp/dhcp_postman_collection.json
+++ b/dhcp/dhcp_postman_collection.json
@@ -1,14 +1,16 @@
 {
-	"id": "a38b7e49-665c-4646-723d-d78bbf27080e",
+	"id": "f5441117-e55c-ba3b-6673-aaa6d383e33c",
 	"name": "DHCP",
 	"description": "Provides DHCP configuration examples for hc2vpp.",
 	"order": [
-		"e718ef1d-ec09-23a6-f644-7306545453bd",
-		"80aae885-6a8b-09b2-f3cc-8c52fa4e081e",
-		"8362683a-c911-27fa-c0bd-8a3515cc4bae",
-		"a76f4dce-f094-ecff-d1c1-28217de33494",
-		"c56f4661-f9ff-38ee-cf0b-0863e5809f4e",
-		"43ee4aca-717c-bfdb-7152-520474e5eef6"
+		"990feae9-d039-4f1e-6c2d-df1a16ee2ba5",
+		"4cf4fe5e-158f-a36d-0cc4-412e99475870",
+		"ca4b868e-dcab-b87e-f6d9-99ff297b9f38",
+		"24669f87-8005-8c09-c516-d9fa3ba4b470",
+		"c5791bcb-a98e-b6a9-e143-4f0af0453164",
+		"d312ab52-434d-2838-aa94-cea8eb1d2d50",
+		"45f81f14-e5d8-db5c-a8c3-12238b78c28d",
+		"3d271bcc-ca7b-aa7f-3446-c8fc52a9f1e9"
 	],
 	"folders": [],
 	"timestamp": 1487055938314,
@@ -16,7 +18,48 @@
 	"public": false,
 	"requests": [
 		{
-			"id": "43ee4aca-717c-bfdb-7152-520474e5eef6",
+			"id": "24669f87-8005-8c09-c516-d9fa3ba4b470",
+			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
+			"url": "http://localhost:8183/restconf/config/dhcp:dhcp/relays/relay/dhcp:ipv4/0/server/0/1.2.3.4",
+			"preRequestScript": null,
+			"pathVariables": {},
+			"method": "DELETE",
+			"data": [],
+			"dataMode": "raw",
+			"version": 2,
+			"tests": null,
+			"currentHelper": "normal",
+			"helperAttributes": {},
+			"time": 1488460094116,
+			"name": "Delete one of DHCP servers",
+			"description": "Equivalent of\n\nvppctl set dhcp proxy del server 1.2.3.4\n\nvppctl show dhcp proxy",
+			"collectionId": "f5441117-e55c-ba3b-6673-aaa6d383e33c",
+			"responses": [],
+			"rawModeData": ""
+		},
+		{
+			"id": "3d271bcc-ca7b-aa7f-3446-c8fc52a9f1e9",
+			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
+			"url": "http://localhost:8183/restconf/config/dhcp:dhcp/relays/",
+			"pathVariables": {},
+			"preRequestScript": null,
+			"method": "GET",
+			"collectionId": "f5441117-e55c-ba3b-6673-aaa6d383e33c",
+			"data": [],
+			"dataMode": "raw",
+			"name": "Show DHCP Relay oper",
+			"description": "",
+			"descriptionFormat": "html",
+			"time": 1488193893443,
+			"version": 2,
+			"responses": [],
+			"tests": null,
+			"currentHelper": "normal",
+			"helperAttributes": {},
+			"rawModeData": "{\n\t\"relay\": [\n\t\t{\n\t\t\t\"address-type\": \"ipv4\",\n\t\t\t\"rx-vrf-id\": 0,\n\t\t\t\"server-address\": \"1.2.3.4\",\n\t\t\t\"gateway-address\": \"5.6.7.8\"}\n\t]\n}\n"
+		},
+		{
+			"id": "45f81f14-e5d8-db5c-a8c3-12238b78c28d",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/config/dhcp:dhcp/relays/",
 			"preRequestScript": null,
@@ -31,12 +74,12 @@
 			"time": 1487059202453,
 			"name": "Show DHCP Relay cfg",
 			"description": "",
-			"collectionId": "a38b7e49-665c-4646-723d-d78bbf27080e",
+			"collectionId": "f5441117-e55c-ba3b-6673-aaa6d383e33c",
 			"responses": [],
 			"rawModeData": "{\n\t\"relay\": [\n\t\t{\n\t\t\t\"address-type\": \"ipv4\",\n\t\t\t\"rx-vrf-id\": 0,\n\t\t\t\"server-address\": \"1.2.3.4\",\n\t\t\t\"gateway-address\": \"5.6.7.8\"}\n\t]\n}\n"
 		},
 		{
-			"id": "80aae885-6a8b-09b2-f3cc-8c52fa4e081e",
+			"id": "4cf4fe5e-158f-a36d-0cc4-412e99475870",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/config/dhcp:dhcp/relays/relay/dhcp:ipv4/1",
 			"preRequestScript": null,
@@ -48,17 +91,17 @@
 			"tests": null,
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"time": 1487059355510,
+			"time": 1488458844687,
 			"name": "Add IP4 DHCP Relay #2",
-			"description": "Equivalent of\n\nvppctl set dhcp proxy server 1.2.3.5 src-address 5.6.7.9 add-option-82\n\ncan be verified with\n\nvppctl show dhcp proxy",
-			"collectionId": "a38b7e49-665c-4646-723d-d78bbf27080e",
+			"description": "Equivalent of\n\nvppctl set dhcp proxy server 1.2.3.6 src-address 5.6.7.9 rx-fib-id 1\n\ncan be verified with\n\nvppctl show dhcp proxy",
+			"collectionId": "f5441117-e55c-ba3b-6673-aaa6d383e33c",
 			"responses": [],
-			"rawModeData": "{\n\t\"relay\": [\n\t\t{\n\t\t\t\"address-type\": \"ipv4\",\n\t\t\t\"rx-vrf-id\": 1,\n\t\t\t\"server-address\": \"1.2.3.5\",\n\t\t\t\"gateway-address\": \"5.6.7.9\"}\n\t]\n}\n"
+			"rawModeData": "{\n\t\"relay\": [\n\t\t{\n\t\t\t\"address-type\": \"ipv4\",\n\t\t\t\"rx-vrf-id\": 1,\n\t\t\t\"gateway-address\": \"5.6.7.9\",\n\t\t\t\"server\" : [\n\t\t\t\t{\n\t\t\t\t\t\"vrf-id\": 0,\n\t\t\t\t\t\"address\": \"1.2.3.6\"\n\t\t\t\t}\n        \t]\n\t\t}\n\t]\n}\n"
 		},
 		{
-			"id": "8362683a-c911-27fa-c0bd-8a3515cc4bae",
+			"id": "990feae9-d039-4f1e-6c2d-df1a16ee2ba5",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/dhcp:dhcp/relays/relay/dhcp:ipv6/1",
+			"url": "http://localhost:8183/restconf/config/dhcp:dhcp/relays/relay/dhcp:ipv4/0",
 			"preRequestScript": null,
 			"pathVariables": {},
 			"method": "PUT",
@@ -68,15 +111,15 @@
 			"tests": null,
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"time": 1487056567412,
-			"name": "Configure IP6 DHCP Relay",
-			"description": "Configuration of IP6 DHCP proxy is not supported trough CLI",
-			"collectionId": "a38b7e49-665c-4646-723d-d78bbf27080e",
+			"time": 1488459981869,
+			"name": "Add IP4 DHCP Relay #1",
+			"description": "Equivalent of\n\nvppctl set dhcp proxy server 1.2.3.3 src-address 5.6.7.8\nvppctl set dhcp proxy server 1.2.3.4 src-address 5.6.7.8\nvppctl set dhcp proxy server 1.2.3.5 src-address 5.6.7.8 rx-fib-id 1\n\n\ncan be verified with\n\nvppctl show dhcp proxy",
+			"collectionId": "f5441117-e55c-ba3b-6673-aaa6d383e33c",
 			"responses": [],
-			"rawModeData": "{\n\t\"relay\": [\n\t\t{\n\t        \"address-type\": \"ipv6\",\n\t        \"rx-vrf-id\": 1,\n\t        \"server-address\": \"2001::1\",\n\t        \"server-vrf-id\": 2,\n\t        \"gateway-address\": \"2001::2\"}\n\t]\n}\n"
+			"rawModeData": "{\n\t\"relay\": [\n\t\t{\n\t\t\t\"address-type\": \"ipv4\",\n\t\t\t\"rx-vrf-id\": 0,\n\t\t\t\"gateway-address\": \"5.6.7.8\",\n\t\t\t\"server\" : [\n\t\t\t\t{\n\t\t\t\t\t\"vrf-id\": 0,\n\t\t\t\t\t\"address\": \"1.2.3.3\"\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\t\"vrf-id\": 0,\n\t\t\t\t\t\"address\": \"1.2.3.4\"\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\t\"vrf-id\": 1,\n\t\t\t\t\t\"address\": \"1.2.3.5\"\n\t\t\t\t}\n        \t]\n\t\t}\n\t]\n}\n"
 		},
 		{
-			"id": "a76f4dce-f094-ecff-d1c1-28217de33494",
+			"id": "c5791bcb-a98e-b6a9-e143-4f0af0453164",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/config/dhcp:dhcp/relays/relay/dhcp:ipv4/0",
 			"preRequestScript": null,
@@ -90,50 +133,50 @@
 			"helperAttributes": {},
 			"time": 1487059058881,
 			"name": "Delete IP4 DHCP Relay #1",
-			"description": "Equivalent of\n\nvppctl set dhcp proxy del server 1.2.3.4\n\nvppctl show dhcp proxy",
-			"collectionId": "a38b7e49-665c-4646-723d-d78bbf27080e",
+			"description": "Removes DHCP relay configuration for rx-fib-id=0\n\nCan be verified with:\n\nvppctl show dhcp proxy",
+			"collectionId": "f5441117-e55c-ba3b-6673-aaa6d383e33c",
 			"responses": [],
 			"rawModeData": ""
 		},
 		{
-			"id": "c56f4661-f9ff-38ee-cf0b-0863e5809f4e",
+			"id": "ca4b868e-dcab-b87e-f6d9-99ff297b9f38",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/dhcp:dhcp/relays/relay/dhcp:ipv4/1",
+			"url": "http://localhost:8183/restconf/config/dhcp:dhcp/relays/relay/dhcp:ipv6/1",
 			"preRequestScript": null,
 			"pathVariables": {},
-			"method": "DELETE",
+			"method": "PUT",
 			"data": [],
 			"dataMode": "raw",
 			"version": 2,
 			"tests": null,
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"time": 1487059316221,
-			"name": "Delete IP4 DHCP Relay #2",
-			"description": "Equivalent of\n\nvppctl set dhcp proxy del server 1.2.3.5\n\nvppctl show dhcp proxy",
-			"collectionId": "a38b7e49-665c-4646-723d-d78bbf27080e",
+			"time": 1488458977472,
+			"name": "Configure IP6 DHCP Relay",
+			"description": "Configuration of IP6 DHCP proxy is not supported trough CLI",
+			"collectionId": "f5441117-e55c-ba3b-6673-aaa6d383e33c",
 			"responses": [],
-			"rawModeData": ""
+			"rawModeData": "{\n\t\"relay\": [\n\t\t{\n\t        \"address-type\": \"ipv6\",\n\t        \"rx-vrf-id\": 1,\n\t        \"gateway-address\": \"2001::2\",\n\t\t\t\"server\" : [\n\t\t\t\t{\n\t\t\t\t\t\"vrf-id\": 2,\n\t\t\t\t\t\"address\": \"2001::1\"\n\t\t\t\t}\n        \t]\n\t\t}\n\t]\n}\n"
 		},
 		{
-			"id": "e718ef1d-ec09-23a6-f644-7306545453bd",
+			"id": "d312ab52-434d-2838-aa94-cea8eb1d2d50",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/dhcp:dhcp/relays/relay/dhcp:ipv4/0",
+			"url": "http://localhost:8183/restconf/config/dhcp:dhcp/relays/relay/dhcp:ipv4/1",
 			"preRequestScript": null,
 			"pathVariables": {},
-			"method": "PUT",
+			"method": "DELETE",
 			"data": [],
 			"dataMode": "raw",
 			"version": 2,
 			"tests": null,
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"time": 1487056454396,
-			"name": "Add IP4 DHCP Relay #1",
-			"description": "Equivalent of\n\nvppctl set dhcp proxy server 1.2.3.4 src-address 5.6.7.8 add-option-82\n\ncan be verified with\n\nvppctl show dhcp proxy",
-			"collectionId": "a38b7e49-665c-4646-723d-d78bbf27080e",
+			"time": 1487059316221,
+			"name": "Delete IP4 DHCP Relay #2",
+			"description": "Removes DHCP relay configuration for rx-fib-id=1\n\nCan be verified with:\n\nvppctl show dhcp proxy",
+			"collectionId": "f5441117-e55c-ba3b-6673-aaa6d383e33c",
 			"responses": [],
-			"rawModeData": "{\n\t\"relay\": [\n\t\t{\n\t\t\t\"address-type\": \"ipv4\",\n\t\t\t\"rx-vrf-id\": 0,\n\t\t\t\"server-address\": \"1.2.3.4\",\n\t\t\t\"gateway-address\": \"5.6.7.8\"}\n\t]\n}\n"
+			"rawModeData": ""
 		}
 	]
 }
\ No newline at end of file