diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2017-02-22 09:02:51 +0100 |
|---|---|---|
| committer |   Jan Srnicek <jsrnicek@cisco.com> | 2017-02-22 12:58:12 +0000 |
| commit | 7cfeff1c19a3dc670e1352ca15d1f8d6d568cae4 (patch) | |
| tree | 6e5ec3871d1e26fd03302aab323cc4fb08b86eb0 /dhcp/dhcp-impl/src | |
| parent | 5e2a5b7199389fbac7967f710e29bb3135d790b0 (diff) | |
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>
Diffstat (limited to 'dhcp/dhcp-impl/src')
3 files changed, 2 insertions, 7 deletions
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" } ] } |