From 0d5d328b1d0e9de2d1c7ab957139846c2feb8038 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Fri, 17 May 2019 10:31:23 +0200 Subject: fix flags and Tag in NAT implementation - tag being null causes crashes when vpp API is called - null flags causes crashes, flags should be set at least to default value (0) Change-Id: If4e116212b1a85b312837830501ec226cec37bfa Signed-off-by: Michal Cmarada --- .../test/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizerTest.java | 2 ++ .../test/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizerTest.java | 1 + 2 files changed, 3 insertions(+) (limited to 'nat/nat2vpp/src/test/java/io/fd') diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizerTest.java index 0ad81977f..8a55abc66 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizerTest.java @@ -34,6 +34,7 @@ import io.fd.jvpp.nat.dto.Nat64AddDelPoolAddrRange; import io.fd.jvpp.nat.dto.Nat64AddDelPoolAddrRangeReply; import io.fd.jvpp.nat.future.FutureJVppNatFacade; import io.fd.jvpp.nat.types.Ip4Address; +import io.fd.jvpp.nat.types.NatConfigFlags; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -123,6 +124,7 @@ public class ExternalIpPoolCustomizerTest extends WriterCustomizerTest implement expectedRequest.firstIpAddress.ip4Address = new byte[]{(byte) 192, (byte) 168, 1, 0}; expectedRequest.lastIpAddress = new Ip4Address(); expectedRequest.lastIpAddress.ip4Address = new byte[]{(byte) 192, (byte) 168, 1, (byte) 255}; + expectedRequest.flags = new NatConfigFlags(); return expectedRequest; } diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizerTest.java index d67552b4a..b5c6b5a8b 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizerTest.java @@ -137,6 +137,7 @@ public class MappingEntryCustomizerTest extends WriterCustomizerTest implements expectedRequest.localIpAddress.ip4Address = new byte[]{(byte) 192, (byte) 168, 1, 87}; expectedRequest.externalIpAddress = new Ip4Address(); expectedRequest.externalIpAddress.ip4Address = new byte[]{45, 1, 5, 7}; + expectedRequest.tag = ""; return expectedRequest; } -- cgit 1.2.3-korg