Update dhcp translation after vpp api changes

Fixes hc2vpp build after https://gerrit.fd.io/r/#/c/5449/
was merged.

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

2 files changed, 15 insertions, 16 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 2dc3ac96a..80e482dd4 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
@@ -24,7 +24,7 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
 import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
 import io.fd.honeycomb.translate.write.WriteContext;
 import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.DhcpProxyConfig2;
+import io.fd.vpp.jvpp.core.dto.DhcpProxyConfig;
 import io.fd.vpp.jvpp.core.future.FutureJVppCore;
 import javax.annotation.Nonnull;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
@@ -67,16 +67,18 @@ final class DhcpRelayCustomizer extends FutureJVppCustomizer implements ListWrit
 
     private void setRelay(final InstanceIdentifier<Relay> id, final Relay relay, final WriteContext writeContext,
                           final boolean isAdd) throws WriteFailedException {
-        final DhcpProxyConfig2 request = new DhcpProxyConfig2();
+        final DhcpProxyConfig request = new DhcpProxyConfig();
         request.rxVrfId = relay.getRxVrfId().byteValue();
         final boolean isIpv6 = Ipv6.class == relay.getAddressType();
         request.isIpv6 = booleanToByte(isIpv6);
         request.serverVrfId = relay.getServerVrfId().intValue();
         request.isAdd = booleanToByte(isAdd);
-        request.insertCircuitId = booleanToByte(relay.isInsertCircuitId());
+        // 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().dhcpProxyConfig2(request).toCompletableFuture(), id);
+        getReplyForWrite(getFutureJVpp().dhcpProxyConfig(request).toCompletableFuture(), id);
     }
 
     private byte[] parseAddress(@Nonnull final IpAddress address, final boolean isIpv6) {
diff --git a/dhcp/dhcp-impl/src/test/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizerTest.java b/dhcp/dhcp-impl/src/test/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizerTest.java
index 629c8d893..d13990c7a 100644
--- a/dhcp/dhcp-impl/src/test/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizerTest.java
+++ b/dhcp/dhcp-impl/src/test/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizerTest.java
@@ -26,8 +26,8 @@ import io.fd.hc2vpp.dhcp.helpers.SchemaContextTestHelper;
 import io.fd.honeycomb.test.tools.HoneycombTestRunner;
 import io.fd.honeycomb.test.tools.annotations.InjectTestData;
 import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.DhcpProxyConfig2;
-import io.fd.vpp.jvpp.core.dto.DhcpProxyConfig2Reply;
+import io.fd.vpp.jvpp.core.dto.DhcpProxyConfig;
+import io.fd.vpp.jvpp.core.dto.DhcpProxyConfigReply;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.dhcp.rev170315.AddressFamily;
@@ -50,7 +50,7 @@ public class DhcpRelayCustomizerTest extends WriterCustomizerTest implements Sch
     @Override
     protected void setUpTest() throws Exception {
         customizer = new DhcpRelayCustomizer(api);
-        when(api.dhcpProxyConfig2(any())).thenReturn(future(new DhcpProxyConfig2Reply()));
+        when(api.dhcpProxyConfig(any())).thenReturn(future(new DhcpProxyConfigReply()));
     }
 
     @Test
@@ -59,14 +59,13 @@ public class DhcpRelayCustomizerTest extends WriterCustomizerTest implements Sch
         final Relay data = relays.getRelay().get(0);
         final int rxVrfId = 0;
         customizer.writeCurrentAttributes(getId(rxVrfId, Ipv4.class), data, writeContext);
-        final DhcpProxyConfig2 request = new DhcpProxyConfig2();
+        final DhcpProxyConfig request = new DhcpProxyConfig();
         request.rxVrfId = rxVrfId;
         request.isIpv6 = 0;
         request.isAdd = 1;
-        request.insertCircuitId = 1;
         request.dhcpServer = new byte[]{1,2,3,4};
         request.dhcpSrcAddress = new byte[]{5,6,7,8};
-        verify(api).dhcpProxyConfig2(request);
+        verify(api).dhcpProxyConfig(request);
     }
 
     @Test
@@ -75,15 +74,14 @@ public class DhcpRelayCustomizerTest extends WriterCustomizerTest implements Sch
         final Relay data = relays.getRelay().get(0);
         final int rxVrfId = 1;
         customizer.updateCurrentAttributes(getId(rxVrfId, Ipv6.class), mock(Relay.class), data, writeContext);
-        final DhcpProxyConfig2 request = new DhcpProxyConfig2();
+        final DhcpProxyConfig request = new DhcpProxyConfig();
         request.rxVrfId = rxVrfId;
         request.serverVrfId = 2;
         request.isIpv6 = 1;
         request.isAdd = 1;
-        request.insertCircuitId = 1;
         request.dhcpServer = new byte[]{0x20, 0x01, 0, 0, 0, 0, 0, 0, 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0x01};
         request.dhcpSrcAddress = new byte[]{0x20, 0x01, 0, 0, 0, 0, 0, 0, 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0x02};
-        verify(api).dhcpProxyConfig2(request);
+        verify(api).dhcpProxyConfig(request);
     }
 
     @Test
@@ -92,14 +90,13 @@ public class DhcpRelayCustomizerTest extends WriterCustomizerTest implements Sch
         final Relay data = relays.getRelay().get(0);
         final int rxVrfId = 0;
         customizer.deleteCurrentAttributes(getId(rxVrfId, Ipv4.class), data, writeContext);
-        final DhcpProxyConfig2 request = new DhcpProxyConfig2();
+        final DhcpProxyConfig request = new DhcpProxyConfig();
         request.rxVrfId = rxVrfId;
         request.isIpv6 = 0;
         request.isAdd = 0;
-        request.insertCircuitId = 1;
         request.dhcpServer = new byte[]{1,2,3,4};
         request.dhcpSrcAddress = new byte[]{5,6,7,8};
-        verify(api).dhcpProxyConfig2(request);
+        verify(api).dhcpProxyConfig(request);
     }
 
     private InstanceIdentifier<Relay> getId(final long rxVrfId, final Class<? extends AddressFamily> addressType) {