Remove circut-id from yang model for DHCP Relay

circut-id is no longer configurable in vpp
after merging https://gerrit.fd.io/r/#/c/5449/

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

5 files changed, 7 insertions, 15 deletions

diff --git a/dhcp/dhcp-api/src/main/yang/dhcp.yang b/dhcp/dhcp-api/src/main/yang/dhcp.yang
index ebfdbd830..9f2e64467 100644
--- a/dhcp/dhcp-api/src/main/yang/dhcp.yang
+++ b/dhcp/dhcp-api/src/main/yang/dhcp.yang
@@ -62,10 +62,7 @@ module dhcp {
             description
                 "IP address of the relay agent.";
         }
-        leaf insert-circuit-id {
-            type boolean;
-            default true;
-        }
+        // TODO(HC2VPP-44): add configurable circut-id (option-82/remote-id)
     }
 
     grouping dhcp-attributes {
diff --git a/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizer.java b/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizer.java
index 80e482dd4..58e3d5811 100644
--- a/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizer.java
+++ b/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizer.java
@@ -73,9 +73,6 @@ final class DhcpRelayCustomizer extends FutureJVppCustomizer implements ListWrit
         request.isIpv6 = booleanToByte(isIpv6);
         request.serverVrfId = relay.getServerVrfId().intValue();
         request.isAdd = booleanToByte(isAdd);
-        // TODO insertCircuitId is not configurable for DHCPv4,
-        // rethink how to handle the value for DHCPv6 (VSS?)
-        // request.insertCircuitId = booleanToByte(relay.isInsertCircuitId());
         request.dhcpServer = parseAddress(relay.getServerAddress(), isIpv6);
         request.dhcpSrcAddress = parseAddress(relay.getGatewayAddress(), isIpv6);
         getReplyForWrite(getFutureJVpp().dhcpProxyConfig(request).toCompletableFuture(), id);
diff --git a/dhcp/dhcp-impl/src/test/resources/relay/ipv4DhcpRelay.json b/dhcp/dhcp-impl/src/test/resources/relay/ipv4DhcpRelay.json
index 3af4a43ff..27550e45f 100644
--- a/dhcp/dhcp-impl/src/test/resources/relay/ipv4DhcpRelay.json
+++ b/dhcp/dhcp-impl/src/test/resources/relay/ipv4DhcpRelay.json
@@ -5,8 +5,7 @@
         "address-type": "ipv4",
         "rx-vrf-id": 0,
         "server-address": "1.2.3.4",
-        "gateway-address": "5.6.7.8",
-        "insert-circuit-id": "true"
+        "gateway-address": "5.6.7.8"
       }
     ]
   }
diff --git a/dhcp/dhcp-impl/src/test/resources/relay/ipv6DhcpRelay.json b/dhcp/dhcp-impl/src/test/resources/relay/ipv6DhcpRelay.json
index 5a1180d13..ca7e51ace 100644
--- a/dhcp/dhcp-impl/src/test/resources/relay/ipv6DhcpRelay.json
+++ b/dhcp/dhcp-impl/src/test/resources/relay/ipv6DhcpRelay.json
@@ -6,8 +6,7 @@
         "rx-vrf-id": 1,
         "server-address": "2001::1",
         "server-vrf-id": 2,
-        "gateway-address": "2001::2",
-        "insert-circuit-id": "true"
+        "gateway-address": "2001::2"
       }
     ]
   }
diff --git a/dhcp/dhcp_postman_collection.json b/dhcp/dhcp_postman_collection.json
index dab109e92..e7070ed36 100644
--- a/dhcp/dhcp_postman_collection.json
+++ b/dhcp/dhcp_postman_collection.json
@@ -33,7 +33,7 @@
 			"description": "",
 			"collectionId": "a38b7e49-665c-4646-723d-d78bbf27080e",
 			"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\t\t\"insert-circuit-id\": \"true\"\n\t\t}\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\"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",
@@ -53,7 +53,7 @@
 			"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",
 			"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\t\t\"insert-circuit-id\": \"true\"\n\t\t}\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\"server-address\": \"1.2.3.5\",\n\t\t\t\"gateway-address\": \"5.6.7.9\"}\n\t]\n}\n"
 		},
 		{
 			"id": "8362683a-c911-27fa-c0bd-8a3515cc4bae",
@@ -73,7 +73,7 @@
 			"description": "Configuration of IP6 DHCP proxy is not supported trough CLI",
 			"collectionId": "a38b7e49-665c-4646-723d-d78bbf27080e",
 			"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        \"insert-circuit-id\": \"true\"\n\t\t}\n\t]\n}\n"
+			"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"
 		},
 		{
 			"id": "a76f4dce-f094-ecff-d1c1-28217de33494",
@@ -133,7 +133,7 @@
 			"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",
 			"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\t\t\"insert-circuit-id\": \"true\"\n\t\t}\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\"server-address\": \"1.2.3.4\",\n\t\t\t\"gateway-address\": \"5.6.7.8\"}\n\t]\n}\n"
 		}
 	]
 }
\ No newline at end of file