From 97554c44ffc7f7ce82fe89d6da5ac15c46ee80b4 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Mon, 6 May 2019 13:48:21 +0200 Subject: fix Nat implementation after API changes in VPP Change-Id: Ibe8ead5a19119af9eb6b673f0713890ad5e243cb Signed-off-by: Michal Cmarada --- .../nat/read/ifc/InterfaceInboundNatCustomizerTest.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizerTest.java') diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizerTest.java index 8d62782a2..e91741264 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizerTest.java @@ -34,6 +34,8 @@ import io.fd.jvpp.nat.dto.Nat44InterfaceOutputFeatureDetails; import io.fd.jvpp.nat.dto.Nat44InterfaceOutputFeatureDetailsReplyDump; import io.fd.jvpp.nat.dto.Nat64InterfaceDetailsReplyDump; import io.fd.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.types.InterfaceIndex; +import io.fd.jvpp.nat.types.NatConfigFlags; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816.NatInterfaceStateAugmentation; @@ -90,8 +92,10 @@ public class InterfaceInboundNatCustomizerTest private void mockPostRoutingDump() { final Nat44InterfaceOutputFeatureDetailsReplyDump details = new Nat44InterfaceOutputFeatureDetailsReplyDump(); final Nat44InterfaceOutputFeatureDetails detail = new Nat44InterfaceOutputFeatureDetails(); - detail.isInside = 1; - detail.swIfIndex = IFC_IDX; + detail.flags = new NatConfigFlags(); + detail.flags.add(NatConfigFlags.NatConfigFlagsOptions.NAT_IS_INSIDE); + detail.swIfIndex = new InterfaceIndex(); + detail.swIfIndex.interfaceindex = IFC_IDX; details.nat44InterfaceOutputFeatureDetails = Lists.newArrayList(detail); when(jvppNat.nat44InterfaceOutputFeatureDump(any())).thenReturn(future(details)); } @@ -100,8 +104,10 @@ public class InterfaceInboundNatCustomizerTest public void testPresencePreRouting() throws Exception { final Nat44InterfaceDetailsReplyDump details = new Nat44InterfaceDetailsReplyDump(); final Nat44InterfaceDetails detail = new Nat44InterfaceDetails(); - detail.isInside = 1; - detail.swIfIndex = IFC_IDX; + detail.flags = new NatConfigFlags(); + detail.flags.add(NatConfigFlags.NatConfigFlagsOptions.NAT_IS_INSIDE); + detail.swIfIndex = new InterfaceIndex(); + detail.swIfIndex.interfaceindex = IFC_IDX; details.nat44InterfaceDetails = Lists.newArrayList(detail); when(jvppNat.nat44InterfaceDump(any())).thenReturn(future(details)); -- cgit 1.2.3-korg