From 0119f7e2e8f96c7f6ed6af07200e432c16b837d5 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Fri, 12 May 2017 10:55:39 +0200 Subject: HC2VPP-145: fix snat mapping update Change-Id: I51e8a3e6d62b9c0dacf03d2148b813309fe0dfc4 Signed-off-by: Marek Gradzki (cherry picked from commit 923dac1cedec9ad7a215d128d54eb77fd85562ae) --- .../nat/write/MappingEntryCustomizerTest.java | 28 ++++++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'nat/nat2vpp/src/test/java/io') 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 649284a44..1d5eff7f3 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 @@ -17,7 +17,6 @@ package io.fd.hc2vpp.nat.write; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -83,10 +82,17 @@ public class MappingEntryCustomizerTest extends WriterCustomizerTest implements customizer.writeCurrentAttributes(IID, extractMappingEntry(data), writeContext); } - @Test(expected = WriteFailedException.UpdateFailedException.class) - public void testUpdate() throws WriteFailedException { - final MappingEntry data = mock(MappingEntry.class); - customizer.updateCurrentAttributes(IID, data, data, writeContext); + @Test + public void testUpdate( + @InjectTestData(resourcePath = "/nat/static-mapping.json", id = MAPPING_TABLE_PATH) MappingTable before, + @InjectTestData(resourcePath = "/nat/static-mapping-address-update.json", id = MAPPING_TABLE_PATH) MappingTable after) + throws WriteFailedException { + customizer.updateCurrentAttributes(IID, extractMappingEntry(before), extractMappingEntry(after), writeContext); + final SnatAddStaticMapping expectedDeleteRequest = getExpectedRequest(); + verify(jvppSnat).snatAddStaticMapping(expectedDeleteRequest); + final SnatAddStaticMapping expectedUpdateRequest = getExpectedUpdateRequest(); + expectedUpdateRequest.isAdd = 1; + verify(jvppSnat).snatAddStaticMapping(expectedUpdateRequest); } @Test @@ -113,4 +119,16 @@ public class MappingEntryCustomizerTest extends WriterCustomizerTest implements expectedRequest.externalIpAddress = new byte[] {45, 1, 5, 7}; return expectedRequest; } + + private static SnatAddStaticMapping getExpectedUpdateRequest() { + final SnatAddStaticMapping expectedRequest = new SnatAddStaticMapping(); + expectedRequest.isIp4 = 1; + expectedRequest.addrOnly = 1; + expectedRequest.protocol = 17; // udp + expectedRequest.vrfId = (int) NAT_INSTANCE_ID; + expectedRequest.externalSwIfIndex = -1; + expectedRequest.localIpAddress = new byte[] {(byte) 192, (byte) 168, 1, 86}; + expectedRequest.externalIpAddress = new byte[] {45, 1, 5, 6}; + return expectedRequest; + } } \ No newline at end of file -- cgit 1.2.3-korg