From 30dd5a48584aed8b4edc528218d13b75edfc2b54 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Mon, 12 Mar 2018 08:50:58 +0100 Subject: Adapt mpls plugin to recent VPP API changes MPLS API changes were introduced by: https://gerrit.fd.io/r/#/c/10781/ Change-Id: I0423a4cfdf3f0654324118a1d34864a079bff5d1 Signed-off-by: Marek Gradzki --- mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsSwapWriter.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsSwapWriter.java') diff --git a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsSwapWriter.java b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsSwapWriter.java index 8d834fe7c..28aba7aa8 100644 --- a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsSwapWriter.java +++ b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsSwapWriter.java @@ -19,11 +19,13 @@ package io.fd.hc2vpp.mpls; import static com.google.common.base.Preconditions.checkArgument; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; +import io.fd.hc2vpp.common.translate.util.MplsLabelTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.write.WriteFailedException; import io.fd.vpp.jvpp.core.dto.MplsRouteAddDel; import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.vpp.jvpp.core.types.FibMplsLabel; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; @@ -40,7 +42,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; * * @see mpls_route_add_del definition */ -final class MplsSwapWriter implements LspWriter, Ipv4Translator, MplsInSegmentTranslator { +final class MplsSwapWriter implements LspWriter, Ipv4Translator, MplsInSegmentTranslator, MplsLabelTranslator { private final FutureJVppCore vppApi; private final NamingContext interfaceContext; @@ -83,7 +85,7 @@ final class MplsSwapWriter implements LspWriter, Ipv4Translator, MplsInSegmentTr final MplsLabel outgoingLabel = path.getOutgoingLabel(); checkArgument(outgoingLabel != null, "Configuring swap-and-forward, but outgoing-label is missing."); - request.mrNextHopOutLabelStack = new int[] {outgoingLabel.getValue().intValue()}; + request.mrNextHopOutLabelStack = new FibMplsLabel[] {translate(outgoingLabel.getValue())}; request.mrNextHopNOutLabels = 1; final String outgoingInterface = path.getOutgoingInterface(); -- cgit 1.2.3-korg