From 72493bf45a8823dbb2bc8e0745ebb7106a7ae01f Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Wed, 9 Aug 2017 12:30:05 +0200 Subject: HC2VPP-105: add support for NAT64 BIB entries configuration No read support due to issues with nat64_bib_dump Change-Id: I851c4fc5084d6e29d622df2855cf8d47ba147015 Signed-off-by: Marek Gradzki --- .../hc2vpp/nat/write/MappingEntryCustomizer.java | 110 ++++++++++++++++----- .../nat/write/ExternalIpPoolCustomizerTest.java | 4 +- .../nat/write/MappingEntryCustomizerTest.java | 99 +++++++++++++++---- .../src/test/resources/nat/external-ip-pool.json | 12 --- .../nat/static-mapping-address-update.json | 12 --- .../nat/static-mapping-unsupported-proto.json | 12 --- .../src/test/resources/nat/static-mapping.json | 12 --- .../src/test/resources/nat44/external-ip-pool.json | 12 +++ .../nat44/static-mapping-address-update.json | 12 +++ .../nat44/static-mapping-unsupported-proto.json | 12 +++ .../src/test/resources/nat44/static-mapping.json | 12 +++ .../nat64/static-mapping-address-update.json | 17 ++++ .../nat64/static-mapping-unsupported-proto.json | 12 +++ .../src/test/resources/nat64/static-mapping.json | 12 +++ 14 files changed, 254 insertions(+), 96 deletions(-) delete mode 100644 nat/nat2vpp/src/test/resources/nat/external-ip-pool.json delete mode 100644 nat/nat2vpp/src/test/resources/nat/static-mapping-address-update.json delete mode 100644 nat/nat2vpp/src/test/resources/nat/static-mapping-unsupported-proto.json delete mode 100644 nat/nat2vpp/src/test/resources/nat/static-mapping.json create mode 100644 nat/nat2vpp/src/test/resources/nat44/external-ip-pool.json create mode 100644 nat/nat2vpp/src/test/resources/nat44/static-mapping-address-update.json create mode 100644 nat/nat2vpp/src/test/resources/nat44/static-mapping-unsupported-proto.json create mode 100644 nat/nat2vpp/src/test/resources/nat44/static-mapping.json create mode 100644 nat/nat2vpp/src/test/resources/nat64/static-mapping-address-update.json create mode 100644 nat/nat2vpp/src/test/resources/nat64/static-mapping-unsupported-proto.json create mode 100644 nat/nat2vpp/src/test/resources/nat64/static-mapping.json diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizer.java index 999b8118f..0d08a5587 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizer.java @@ -17,17 +17,24 @@ package io.fd.hc2vpp.nat.write; import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkState; import com.google.common.base.Optional; +import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; +import io.fd.hc2vpp.common.translate.util.Ipv6Translator; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.hc2vpp.nat.util.MappingEntryContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; +import io.fd.vpp.jvpp.snat.dto.Nat64AddDelStaticBib; import io.fd.vpp.jvpp.snat.dto.SnatAddStaticMapping; import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade; 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; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.PortNumber; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.config.nat.instances.NatInstance; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.config.nat.instances.nat.instance.mapping.table.MappingEntry; @@ -39,7 +46,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; final class MappingEntryCustomizer implements ListWriterCustomizer, - JvppReplyConsumer, Ipv4Translator { + JvppReplyConsumer, Ipv4Translator, Ipv6Translator, ByteDataTranslator { private static final Logger LOG = LoggerFactory.getLogger(MappingEntryCustomizer.class); @@ -64,8 +71,7 @@ final class MappingEntryCustomizer implements ListWriterCustomizer id, + @Nonnull final MappingEntry entry, + @Nonnull final Long natInstanceId, + final boolean isAdd) throws WriteFailedException { + final IpAddress internalSrcAddress = entry.getInternalSrcAddress(); + final Ipv4Address internalV4SrcAddress = internalSrcAddress.getIpv4Address(); + final Ipv6Address internalV6SrcAddress = internalSrcAddress.getIpv6Address(); + if (internalV4SrcAddress != null) { + final SnatAddStaticMapping request = getNat44Request(id, entry, natInstanceId, isAdd); + getReplyForWrite(jvppSnat.snatAddStaticMapping(request).toCompletableFuture(), id); + } else { + checkState(internalV6SrcAddress != null, + "internalSrcAddress.getIpv6Address() should not return null if v4 address is not given"); + final Nat64AddDelStaticBib request = getNat64Request(id, entry, natInstanceId, isAdd); + getReplyForWrite(jvppSnat.nat64AddDelStaticBib(request).toCompletableFuture(), id); + } } /** @@ -119,49 +143,43 @@ final class MappingEntryCustomizer implements ListWriterCustomizer id, - final MappingEntry dataAfter, - final Long natInstanceId, - final boolean isAdd) + private SnatAddStaticMapping getNat44Request(final InstanceIdentifier id, + final MappingEntry mappingEntry, + final Long natInstanceId, + final boolean isAdd) throws WriteFailedException.CreateFailedException { final SnatAddStaticMapping request = new SnatAddStaticMapping(); - request.isAdd = isAdd - ? (byte) 1 - : 0; + request.isAdd = booleanToByte(isAdd); request.isIp4 = 1; // VPP uses int, model long request.vrfId = natInstanceId.intValue(); - // Snat supports only ipv4 now - if (dataAfter.getInternalSrcAddress().getIpv4Address() == null) { - throw new WriteFailedException.CreateFailedException(id, dataAfter, - new UnsupportedOperationException( - String.format("No Ipv4 present for in address %s. Ipv6 not supported", - dataAfter.getInternalSrcAddress()))); - } + final Ipv4Address internalAddress = mappingEntry.getInternalSrcAddress().getIpv4Address(); + checkArgument(internalAddress != null, "No Ipv4 present in internal-src-address %s", + mappingEntry.getInternalSrcAddress()); request.addrOnly = 1; request.localIpAddress = - ipv4AddressNoZoneToArray(dataAfter.getInternalSrcAddress().getIpv4Address().getValue()); - request.externalIpAddress = ipv4AddressNoZoneToArray(dataAfter.getExternalSrcAddress().getValue()); + ipv4AddressNoZoneToArray(mappingEntry.getInternalSrcAddress().getIpv4Address().getValue()); + request.externalIpAddress = ipv4AddressNoZoneToArray(mappingEntry.getExternalSrcAddress().getValue()); request.externalSwIfIndex = -1; // external ip address is ignored if externalSwIfIndex is given request.protocol = -1; - final Short protocol = dataAfter.getTransportProtocol(); + final Short protocol = mappingEntry.getTransportProtocol(); if (protocol != null) { checkArgument(protocol == 1 || protocol == 6 || protocol == 17, - "Unsupported protocol %s only ICMP, TCP and UDP are currently supported", protocol); + "Unsupported protocol %s only ICMP(1), TCP(6) and UDP(17) are currently supported for Nat44", + protocol); request.protocol = protocol.byteValue(); } - Optional internalPortNumber = getPortNumber(id, dataAfter, + Optional internalPortNumber = getPortNumber(id, mappingEntry, (entry) -> Optional.fromNullable(entry.getInternalSrcPort()).transform(PortNumber::getPortType)); - Optional externalPortNumber = getPortNumber(id, dataAfter, + Optional externalPortNumber = getPortNumber(id, mappingEntry, (entry) -> Optional.fromNullable(entry.getExternalSrcPort()).transform(PortNumber::getPortType)); if (internalPortNumber.isPresent() && externalPortNumber.isPresent()) { request.addrOnly = 0; @@ -171,6 +189,44 @@ final class MappingEntryCustomizer implements ListWriterCustomizer id, + final MappingEntry mappingEntry, + final Long natInstanceId, + final boolean isAdd) + throws WriteFailedException.CreateFailedException { + final Nat64AddDelStaticBib request = new Nat64AddDelStaticBib(); + request.isAdd = booleanToByte(isAdd); + // VPP uses int, model long + request.vrfId = natInstanceId.intValue(); + + final Ipv6Address internalAddress = mappingEntry.getInternalSrcAddress().getIpv6Address(); + checkArgument(internalAddress != null, "No Ipv6 present in internal-src-address %s", + mappingEntry.getInternalSrcAddress()); + + + request.iAddr = ipv6AddressNoZoneToArray(internalAddress); + request.oAddr = ipv4AddressNoZoneToArray(mappingEntry.getExternalSrcAddress().getValue()); + request.proto = -1; + final Short protocol = mappingEntry.getTransportProtocol(); + if (protocol != null) { + checkArgument(protocol == 1 || protocol == 6 || protocol == 17 || protocol == 58, + "Unsupported protocol %s only ICMP(1), IPv6-ICMP(58), TCP(6) and UDP(17) are currently supported for Nat64", + protocol); + request.proto = protocol.byteValue(); + } + + Optional internalPortNumber = getPortNumber(id, mappingEntry, + (entry) -> Optional.fromNullable(entry.getInternalSrcPort()).transform(PortNumber::getPortType)); + Optional externalPortNumber = getPortNumber(id, mappingEntry, + (entry) -> Optional.fromNullable(entry.getExternalSrcPort()).transform(PortNumber::getPortType)); + if (internalPortNumber.isPresent() && externalPortNumber.isPresent()) { + request.iPort = internalPortNumber.get(); + request.oPort = externalPortNumber.get(); + } + return request; + } + + private Optional getPortNumber(final InstanceIdentifier id, final MappingEntry dataAfter, final PortGetter portGetter) { return portGetter.getPortType(dataAfter).transform(port -> { 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 917b9a9c4..c414c2b4e 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 @@ -63,7 +63,7 @@ public class ExternalIpPoolCustomizerTest extends WriterCustomizerTest implement @Test public void testWrite( - @InjectTestData(resourcePath = "/nat/external-ip-pool.json", id = NAT_INSTANCES_PATH) NatInstances data) + @InjectTestData(resourcePath = "/nat44/external-ip-pool.json", id = NAT_INSTANCES_PATH) NatInstances data) throws WriteFailedException { customizer.writeCurrentAttributes(IID, extractIpPool(data), writeContext); final SnatAddAddressRange expectedRequest = getExpectedRequest(); @@ -79,7 +79,7 @@ public class ExternalIpPoolCustomizerTest extends WriterCustomizerTest implement @Test public void testDelete( - @InjectTestData(resourcePath = "/nat/external-ip-pool.json", id = NAT_INSTANCES_PATH) NatInstances data) + @InjectTestData(resourcePath = "/nat44/external-ip-pool.json", id = NAT_INSTANCES_PATH) NatInstances data) throws WriteFailedException { customizer.deleteCurrentAttributes(IID, extractIpPool(data), writeContext); final SnatAddAddressRange expectedRequest = getExpectedRequest(); 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 1d5eff7f3..008ac087b 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 @@ -26,6 +26,8 @@ import io.fd.hc2vpp.nat.util.MappingEntryContext; import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.write.WriteFailedException; +import io.fd.vpp.jvpp.snat.dto.Nat64AddDelStaticBib; +import io.fd.vpp.jvpp.snat.dto.Nat64AddDelStaticBibReply; import io.fd.vpp.jvpp.snat.dto.SnatAddStaticMapping; import io.fd.vpp.jvpp.snat.dto.SnatAddStaticMappingReply; import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade; @@ -63,44 +65,83 @@ public class MappingEntryCustomizerTest extends WriterCustomizerTest implements public void setUpTest() { customizer = new MappingEntryCustomizer(jvppSnat, mappingContext); when(jvppSnat.snatAddStaticMapping(any())).thenReturn(future(new SnatAddStaticMappingReply())); + when(jvppSnat.nat64AddDelStaticBib(any())).thenReturn(future(new Nat64AddDelStaticBibReply())); } @Test - public void testWrite( - @InjectTestData(resourcePath = "/nat/static-mapping.json", id = MAPPING_TABLE_PATH) MappingTable data) - throws WriteFailedException { + public void testWriteNat44( + @InjectTestData(resourcePath = "/nat44/static-mapping.json", id = MAPPING_TABLE_PATH) MappingTable data) + throws WriteFailedException { customizer.writeCurrentAttributes(IID, extractMappingEntry(data), writeContext); - final SnatAddStaticMapping expectedRequest = getExpectedRequest(); + final SnatAddStaticMapping expectedRequest = getExpectedNat44Request(); expectedRequest.isAdd = 1; verify(jvppSnat).snatAddStaticMapping(expectedRequest); } + @Test + public void testWriteNat64( + @InjectTestData(resourcePath = "/nat64/static-mapping.json", id = MAPPING_TABLE_PATH) MappingTable data) + throws WriteFailedException { + customizer.writeCurrentAttributes(IID, extractMappingEntry(data), writeContext); + final Nat64AddDelStaticBib expectedRequest = getExpectedNat64Request(); + expectedRequest.isAdd = 1; + verify(jvppSnat).nat64AddDelStaticBib(expectedRequest); + } + @Test(expected = IllegalArgumentException.class) - public void testWriteUnsupportedProtocol( - @InjectTestData(resourcePath = "/nat/static-mapping-unsupported-proto.json", id = MAPPING_TABLE_PATH) MappingTable data) - throws WriteFailedException { + public void testWriteNat44UnsupportedProtocol( + @InjectTestData(resourcePath = "/nat44/static-mapping-unsupported-proto.json", id = MAPPING_TABLE_PATH) MappingTable data) + throws WriteFailedException { + customizer.writeCurrentAttributes(IID, extractMappingEntry(data), writeContext); + } + + @Test(expected = IllegalArgumentException.class) + public void testWriteNat64UnsupportedProtocol( + @InjectTestData(resourcePath = "/nat64/static-mapping-unsupported-proto.json", id = MAPPING_TABLE_PATH) MappingTable data) + throws WriteFailedException { customizer.writeCurrentAttributes(IID, extractMappingEntry(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 { + public void testUpdateNat44( + @InjectTestData(resourcePath = "/nat44/static-mapping.json", id = MAPPING_TABLE_PATH) MappingTable before, + @InjectTestData(resourcePath = "/nat44/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(); + final SnatAddStaticMapping expectedDeleteRequest = getExpectedNat44Request(); verify(jvppSnat).snatAddStaticMapping(expectedDeleteRequest); - final SnatAddStaticMapping expectedUpdateRequest = getExpectedUpdateRequest(); + final SnatAddStaticMapping expectedUpdateRequest = getExpectedNat44UpdateRequest(); expectedUpdateRequest.isAdd = 1; verify(jvppSnat).snatAddStaticMapping(expectedUpdateRequest); } @Test - public void testDelete( - @InjectTestData(resourcePath = "/nat/static-mapping.json", id = MAPPING_TABLE_PATH) MappingTable data) - throws WriteFailedException { + public void testUpdateNat64( + @InjectTestData(resourcePath = "/nat64/static-mapping.json", id = MAPPING_TABLE_PATH) MappingTable before, + @InjectTestData(resourcePath = "/nat64/static-mapping-address-update.json", id = MAPPING_TABLE_PATH) MappingTable after) + throws WriteFailedException { + customizer.updateCurrentAttributes(IID, extractMappingEntry(before), extractMappingEntry(after), writeContext); + final Nat64AddDelStaticBib expectedDeleteRequest = getExpectedNat64Request(); + verify(jvppSnat).nat64AddDelStaticBib(expectedDeleteRequest); + final Nat64AddDelStaticBib expectedUpdateRequest = getExpectedNat64UpdateRequest(); + expectedUpdateRequest.isAdd = 1; + verify(jvppSnat).nat64AddDelStaticBib(expectedUpdateRequest); + } + + @Test + public void testDeleteNat44( + @InjectTestData(resourcePath = "/nat44/static-mapping.json", id = MAPPING_TABLE_PATH) MappingTable data) + throws WriteFailedException { customizer.deleteCurrentAttributes(IID, extractMappingEntry(data), writeContext); - verify(jvppSnat).snatAddStaticMapping(getExpectedRequest()); + verify(jvppSnat).snatAddStaticMapping(getExpectedNat44Request()); + } + + @Test + public void testDeleteNat64( + @InjectTestData(resourcePath = "/nat64/static-mapping.json", id = MAPPING_TABLE_PATH) MappingTable data) + throws WriteFailedException { + customizer.deleteCurrentAttributes(IID, extractMappingEntry(data), writeContext); + verify(jvppSnat).nat64AddDelStaticBib(getExpectedNat64Request()); } private static MappingEntry extractMappingEntry(MappingTable data) { @@ -108,7 +149,7 @@ public class MappingEntryCustomizerTest extends WriterCustomizerTest implements return data.getMappingEntry().get(0); } - private static SnatAddStaticMapping getExpectedRequest() { + private static SnatAddStaticMapping getExpectedNat44Request() { final SnatAddStaticMapping expectedRequest = new SnatAddStaticMapping(); expectedRequest.isIp4 = 1; expectedRequest.addrOnly = 1; @@ -120,7 +161,16 @@ public class MappingEntryCustomizerTest extends WriterCustomizerTest implements return expectedRequest; } - private static SnatAddStaticMapping getExpectedUpdateRequest() { + private static Nat64AddDelStaticBib getExpectedNat64Request() { + final Nat64AddDelStaticBib expectedRequest = new Nat64AddDelStaticBib(); + expectedRequest.proto = 58; // icmp v6 + expectedRequest.vrfId = (int) NAT_INSTANCE_ID; + expectedRequest.iAddr = new byte[] {0x20, 0x01, 0x0d, (byte) 0xb8, (byte) 0x85, (byte) 0xa3, 0, 0, 0, 0, (byte) 0x8a, 0x2e, 0x03, 0x70, 0x73, 0x33}; + expectedRequest.oAddr = new byte[] {10, 1, 1, 3}; + return expectedRequest; + } + + private static SnatAddStaticMapping getExpectedNat44UpdateRequest() { final SnatAddStaticMapping expectedRequest = new SnatAddStaticMapping(); expectedRequest.isIp4 = 1; expectedRequest.addrOnly = 1; @@ -131,4 +181,15 @@ public class MappingEntryCustomizerTest extends WriterCustomizerTest implements expectedRequest.externalIpAddress = new byte[] {45, 1, 5, 6}; return expectedRequest; } + + private static Nat64AddDelStaticBib getExpectedNat64UpdateRequest() { + final Nat64AddDelStaticBib expectedRequest = new Nat64AddDelStaticBib(); + expectedRequest.proto = 58; // icmp v6 + expectedRequest.vrfId = (int) NAT_INSTANCE_ID; + expectedRequest.iAddr = new byte[] {0x20, 0x01, 0x0d, (byte) 0xb8, (byte) 0x85, (byte) 0xa3, 0, 0, 0, 0, (byte) 0x8a, 0x2e, 0x03, 0x70, 0x73, 0x34}; + expectedRequest.oAddr = new byte[] {10, 1, 1, 4}; + expectedRequest.iPort = 1234; + expectedRequest.oPort = 5678; + return expectedRequest; + } } \ No newline at end of file diff --git a/nat/nat2vpp/src/test/resources/nat/external-ip-pool.json b/nat/nat2vpp/src/test/resources/nat/external-ip-pool.json deleted file mode 100644 index 37e8e907f..000000000 --- a/nat/nat2vpp/src/test/resources/nat/external-ip-pool.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "nat-instances" : { - "nat-instance" : { - "id" : 0, - "external-ip-address-pool": { - "pool-id": 22, - "external-ip-pool": "192.168.1.1/24" - } - } - } -} - diff --git a/nat/nat2vpp/src/test/resources/nat/static-mapping-address-update.json b/nat/nat2vpp/src/test/resources/nat/static-mapping-address-update.json deleted file mode 100644 index 224a62a6b..000000000 --- a/nat/nat2vpp/src/test/resources/nat/static-mapping-address-update.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "mapping-table" : { - "mapping-entry": { - "index": 22, - "type": "static", - "transport-protocol": 17, - "internal-src-address": "192.168.1.86", - "external-src-address": "45.1.5.6" - } - } -} - diff --git a/nat/nat2vpp/src/test/resources/nat/static-mapping-unsupported-proto.json b/nat/nat2vpp/src/test/resources/nat/static-mapping-unsupported-proto.json deleted file mode 100644 index 455465d20..000000000 --- a/nat/nat2vpp/src/test/resources/nat/static-mapping-unsupported-proto.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "mapping-table" : { - "mapping-entry": { - "index": 22, - "type": "static", - "transport-protocol": 123, - "internal-src-address": "192.168.1.87", - "external-src-address": "45.1.5.7" - } - } -} - diff --git a/nat/nat2vpp/src/test/resources/nat/static-mapping.json b/nat/nat2vpp/src/test/resources/nat/static-mapping.json deleted file mode 100644 index b1561a46b..000000000 --- a/nat/nat2vpp/src/test/resources/nat/static-mapping.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "mapping-table" : { - "mapping-entry": { - "index": 22, - "type": "static", - "transport-protocol": 17, - "internal-src-address": "192.168.1.87", - "external-src-address": "45.1.5.7" - } - } -} - diff --git a/nat/nat2vpp/src/test/resources/nat44/external-ip-pool.json b/nat/nat2vpp/src/test/resources/nat44/external-ip-pool.json new file mode 100644 index 000000000..37e8e907f --- /dev/null +++ b/nat/nat2vpp/src/test/resources/nat44/external-ip-pool.json @@ -0,0 +1,12 @@ +{ + "nat-instances" : { + "nat-instance" : { + "id" : 0, + "external-ip-address-pool": { + "pool-id": 22, + "external-ip-pool": "192.168.1.1/24" + } + } + } +} + diff --git a/nat/nat2vpp/src/test/resources/nat44/static-mapping-address-update.json b/nat/nat2vpp/src/test/resources/nat44/static-mapping-address-update.json new file mode 100644 index 000000000..224a62a6b --- /dev/null +++ b/nat/nat2vpp/src/test/resources/nat44/static-mapping-address-update.json @@ -0,0 +1,12 @@ +{ + "mapping-table" : { + "mapping-entry": { + "index": 22, + "type": "static", + "transport-protocol": 17, + "internal-src-address": "192.168.1.86", + "external-src-address": "45.1.5.6" + } + } +} + diff --git a/nat/nat2vpp/src/test/resources/nat44/static-mapping-unsupported-proto.json b/nat/nat2vpp/src/test/resources/nat44/static-mapping-unsupported-proto.json new file mode 100644 index 000000000..455465d20 --- /dev/null +++ b/nat/nat2vpp/src/test/resources/nat44/static-mapping-unsupported-proto.json @@ -0,0 +1,12 @@ +{ + "mapping-table" : { + "mapping-entry": { + "index": 22, + "type": "static", + "transport-protocol": 123, + "internal-src-address": "192.168.1.87", + "external-src-address": "45.1.5.7" + } + } +} + diff --git a/nat/nat2vpp/src/test/resources/nat44/static-mapping.json b/nat/nat2vpp/src/test/resources/nat44/static-mapping.json new file mode 100644 index 000000000..b1561a46b --- /dev/null +++ b/nat/nat2vpp/src/test/resources/nat44/static-mapping.json @@ -0,0 +1,12 @@ +{ + "mapping-table" : { + "mapping-entry": { + "index": 22, + "type": "static", + "transport-protocol": 17, + "internal-src-address": "192.168.1.87", + "external-src-address": "45.1.5.7" + } + } +} + diff --git a/nat/nat2vpp/src/test/resources/nat64/static-mapping-address-update.json b/nat/nat2vpp/src/test/resources/nat64/static-mapping-address-update.json new file mode 100644 index 000000000..73f2c0e55 --- /dev/null +++ b/nat/nat2vpp/src/test/resources/nat64/static-mapping-address-update.json @@ -0,0 +1,17 @@ +{ + "mapping-table" : { + "mapping-entry": { + "index": 58, + "type": "static", + "transport-protocol": 58, + "internal-src-address": "2001:db8:85a3::8a2e:370:7334", + "external-src-address": "10.1.1.4", + "internal-src-port" : { + "single-port-number" : 1234 + }, + "external-src-port" : { + "single-port-number" : 5678 + } + } + } +} \ No newline at end of file diff --git a/nat/nat2vpp/src/test/resources/nat64/static-mapping-unsupported-proto.json b/nat/nat2vpp/src/test/resources/nat64/static-mapping-unsupported-proto.json new file mode 100644 index 000000000..bbe8a20d3 --- /dev/null +++ b/nat/nat2vpp/src/test/resources/nat64/static-mapping-unsupported-proto.json @@ -0,0 +1,12 @@ +{ + "mapping-table" : { + "mapping-entry": { + "index": 58, + "type": "static", + "transport-protocol": 123, + "internal-src-address": "2001:db8:85a3::8a2e:370:7333", + "external-src-address": "10.1.1.3" + } + } +} + diff --git a/nat/nat2vpp/src/test/resources/nat64/static-mapping.json b/nat/nat2vpp/src/test/resources/nat64/static-mapping.json new file mode 100644 index 000000000..d3a1c40c4 --- /dev/null +++ b/nat/nat2vpp/src/test/resources/nat64/static-mapping.json @@ -0,0 +1,12 @@ +{ + "mapping-table" : { + "mapping-entry": { + "index": 58, + "type": "static", + "transport-protocol": 58, + "internal-src-address": "2001:db8:85a3::8a2e:370:7333", + "external-src-address": "10.1.1.3" + } + } +} + -- cgit 1.2.3-korg