From b078f1d28cddc07da5bcad076b872113b9383ab4 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Mon, 24 Jun 2019 13:59:04 +0200 Subject: Fix V3PO for api changes - VPP introduced changes to GRE tunnels and ArpTermination - this updates the api calls for both. Change-Id: I9dd268a14a88ee701512453ce81d6ae15988832c Signed-off-by: Michal Cmarada --- .../src/main/java/io/fd/hc2vpp/v3po/read/GreCustomizer.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/read/GreCustomizer.java') diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/read/GreCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/read/GreCustomizer.java index af21856fd..1a8d6b3e4 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/read/GreCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/read/GreCustomizer.java @@ -32,6 +32,8 @@ import io.fd.jvpp.core.dto.GreTunnelDetails; import io.fd.jvpp.core.dto.GreTunnelDetailsReplyDump; import io.fd.jvpp.core.dto.GreTunnelDump; import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.AddressFamily; +import io.fd.jvpp.core.types.InterfaceIndex; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190527.GreTunnel; @@ -89,7 +91,8 @@ public class GreCustomizer extends FutureJVppCustomizer LOG.debug("Reading attributes for gre tunnel: {}", key.getName()); // Dump just a single final GreTunnelDump request = new GreTunnelDump(); - request.swIfIndex = index; + request.swIfIndex = new InterfaceIndex(); + request.swIfIndex.interfaceindex = index; final CompletionStage swInterfaceGreDetailsReplyDumpCompletionStage = getFutureJVpp().greTunnelDump(request); @@ -112,9 +115,9 @@ public class GreCustomizer extends FutureJVppCustomizer LOG.trace("Gre tunnel: {} attributes returned from VPP: {}", key.getName(), reply); final GreTunnelDetails swInterfaceGreDetails = reply.greTunnelDetails.get(0); - if (swInterfaceGreDetails.tunnel.isIpv6 == 1) { + if (swInterfaceGreDetails.tunnel.dst.af.equals(AddressFamily.ADDRESS_IP6)) { builder.setDst(new IpAddressNoZone( - arrayToIpv4AddressNoZone(swInterfaceGreDetails.tunnel.dst.un.getIp6().ip6Address))); + arrayToIpv6AddressNoZone(swInterfaceGreDetails.tunnel.dst.un.getIp6().ip6Address))); builder.setSrc(new IpAddressNoZone( arrayToIpv6AddressNoZone(swInterfaceGreDetails.tunnel.src.un.getIp6().ip6Address))); } else { @@ -128,6 +131,7 @@ public class GreCustomizer extends FutureJVppCustomizer } @Override + @Nonnull public Initialized init(@Nonnull final InstanceIdentifier id, @Nonnull final Gre readValue, @Nonnull final ReadContext ctx) { return Initialized.create(getCfgId(id), -- cgit 1.2.3-korg