diff options
Diffstat (limited to 'nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read')
5 files changed, 109 insertions, 115 deletions
diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizerTest.java index e6dfeb86f..521320591 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizerTest.java @@ -27,11 +27,11 @@ import static org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.snat.dto.Nat64PoolAddrDetails; -import io.fd.vpp.jvpp.snat.dto.Nat64PoolAddrDetailsReplyDump; -import io.fd.vpp.jvpp.snat.dto.SnatAddressDetails; -import io.fd.vpp.jvpp.snat.dto.SnatAddressDetailsReplyDump; -import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade; +import io.fd.vpp.jvpp.nat.dto.Nat44AddressDetails; +import io.fd.vpp.jvpp.nat.dto.Nat44AddressDetailsReplyDump; +import io.fd.vpp.jvpp.nat.dto.Nat64PoolAddrDetails; +import io.fd.vpp.jvpp.nat.dto.Nat64PoolAddrDetailsReplyDump; +import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; import java.util.Arrays; import java.util.List; import java.util.stream.LongStream; @@ -64,7 +64,7 @@ public class ExternalIpPoolCustomizerTest .child(NatCurrentConfig.class).child(ExternalIpAddressPool.class); @Mock - private FutureJVppSnatFacade jvppSnat; + private FutureJVppNatFacade jvppNat; public ExternalIpPoolCustomizerTest() { super(ExternalIpAddressPool.class, NatCurrentConfigBuilder.class); @@ -72,12 +72,12 @@ public class ExternalIpPoolCustomizerTest @Override protected ReaderCustomizer<ExternalIpAddressPool, ExternalIpAddressPoolBuilder> initCustomizer() { - return new ExternalIpPoolCustomizer(jvppSnat); + return new ExternalIpPoolCustomizer(jvppNat); } @Test public void testReadAttributesNat44() throws Exception { - when(jvppSnat.snatAddressDump(any())).thenReturn(future(dumpReplyNat44NonEmpty())); + when(jvppNat.nat44AddressDump(any())).thenReturn(future(dumpReplyNat44NonEmpty())); final long poolId = 2; final ExternalIpAddressPoolBuilder builder = new ExternalIpAddressPoolBuilder(); getCustomizer().readCurrentAttributes(getId(poolId), builder, ctx); @@ -89,8 +89,8 @@ public class ExternalIpPoolCustomizerTest @Test public void testReadAttributesNat64() throws Exception { - when(jvppSnat.snatAddressDump(any())).thenReturn(future(dumpReplyNat44Empty())); - when(jvppSnat.nat64PoolAddrDump(any())).thenReturn(future(dumpReplyNat64NonEmpty())); + when(jvppNat.nat44AddressDump(any())).thenReturn(future(dumpReplyNat44Empty())); + when(jvppNat.nat64PoolAddrDump(any())).thenReturn(future(dumpReplyNat64NonEmpty())); final long poolId = 2; final ExternalIpAddressPoolBuilder builder = new ExternalIpAddressPoolBuilder(); @@ -103,8 +103,8 @@ public class ExternalIpPoolCustomizerTest @Test public void testReadAttributes() throws Exception { - when(jvppSnat.snatAddressDump(any())).thenReturn(future(dumpReplyNat44NonEmpty())); - when(jvppSnat.nat64PoolAddrDump(any())).thenReturn(future(dumpReplyNat64NonEmpty())); + when(jvppNat.nat44AddressDump(any())).thenReturn(future(dumpReplyNat44NonEmpty())); + when(jvppNat.nat64PoolAddrDump(any())).thenReturn(future(dumpReplyNat64NonEmpty())); final long poolId = 5; final ExternalIpAddressPoolBuilder builder = new ExternalIpAddressPoolBuilder(); @@ -117,8 +117,8 @@ public class ExternalIpPoolCustomizerTest @Test public void testGetAllNat44() throws Exception { - when(jvppSnat.snatAddressDump(any())).thenReturn(future(dumpReplyNat44NonEmpty())); - when(jvppSnat.nat64PoolAddrDump(any())).thenReturn(future(dumpReplyNat64Empty())); + when(jvppNat.nat44AddressDump(any())).thenReturn(future(dumpReplyNat44NonEmpty())); + when(jvppNat.nat64PoolAddrDump(any())).thenReturn(future(dumpReplyNat64Empty())); final List<ExternalIpAddressPoolKey> allIds = getCustomizer().getAllIds(NAT_DEFAULT_POOL_WILDCARDED_ID, ctx); assertThat(allIds, hasItems( @@ -128,8 +128,8 @@ public class ExternalIpPoolCustomizerTest @Test public void testGetAllNat64() throws Exception { - when(jvppSnat.snatAddressDump(any())).thenReturn(future(dumpReplyNat44Empty())); - when(jvppSnat.nat64PoolAddrDump(any())).thenReturn(future(dumpReplyNat64NonEmpty())); + when(jvppNat.nat44AddressDump(any())).thenReturn(future(dumpReplyNat44Empty())); + when(jvppNat.nat64PoolAddrDump(any())).thenReturn(future(dumpReplyNat64NonEmpty())); final List<ExternalIpAddressPoolKey> allIds = getCustomizer().getAllIds(NAT_DEFAULT_POOL_WILDCARDED_ID, ctx); assertThat(allIds, hasItems( @@ -139,8 +139,8 @@ public class ExternalIpPoolCustomizerTest @Test public void testGetAll() throws Exception { - when(jvppSnat.snatAddressDump(any())).thenReturn(future(dumpReplyNat44NonEmpty())); - when(jvppSnat.nat64PoolAddrDump(any())).thenReturn(future(dumpReplyNat64NonEmpty())); + when(jvppNat.nat44AddressDump(any())).thenReturn(future(dumpReplyNat44NonEmpty())); + when(jvppNat.nat64PoolAddrDump(any())).thenReturn(future(dumpReplyNat64NonEmpty())); final List<ExternalIpAddressPoolKey> allIds = getCustomizer().getAllIds(NAT_DEFAULT_POOL_WILDCARDED_ID, ctx); assertThat(allIds, hasItems( @@ -155,8 +155,8 @@ public class ExternalIpPoolCustomizerTest @Test public void testGetAllNoDump() throws Exception { - when(jvppSnat.snatAddressDump(any())).thenReturn(future(dumpReplyNat44Empty())); - when(jvppSnat.nat64PoolAddrDump(any())).thenReturn(future(dumpReplyNat64Empty())); + when(jvppNat.nat44AddressDump(any())).thenReturn(future(dumpReplyNat44Empty())); + when(jvppNat.nat64PoolAddrDump(any())).thenReturn(future(dumpReplyNat64Empty())); assertThat(getCustomizer().getAllIds(NAT_DEFAULT_POOL_WILDCARDED_ID, ctx), empty()); } @@ -164,26 +164,23 @@ public class ExternalIpPoolCustomizerTest return NAT_CONFIG_ID.child(ExternalIpAddressPool.class, new ExternalIpAddressPoolKey(id)); } - private static SnatAddressDetailsReplyDump dumpReplyNat44Empty() { - return new SnatAddressDetailsReplyDump(); + private static Nat44AddressDetailsReplyDump dumpReplyNat44Empty() { + return new Nat44AddressDetailsReplyDump(); } - private static SnatAddressDetailsReplyDump dumpReplyNat44NonEmpty() { - SnatAddressDetailsReplyDump replyDump = dumpReplyNat44Empty(); + private static Nat44AddressDetailsReplyDump dumpReplyNat44NonEmpty() { + Nat44AddressDetailsReplyDump replyDump = dumpReplyNat44Empty(); - SnatAddressDetails detailsOne = new SnatAddressDetails(); + Nat44AddressDetails detailsOne = new Nat44AddressDetails(); detailsOne.ipAddress = new byte[]{-64, -88, 44, 1}; - detailsOne.isIp4 = 1; - SnatAddressDetails detailsTwo = new SnatAddressDetails(); + Nat44AddressDetails detailsTwo = new Nat44AddressDetails(); detailsTwo.ipAddress = new byte[]{-64, -88, 44, 2}; - detailsTwo.isIp4 = 1; - SnatAddressDetails detailsThree = new SnatAddressDetails(); + Nat44AddressDetails detailsThree = new Nat44AddressDetails(); detailsThree.ipAddress = new byte[]{-64, -88, 44, 3}; - detailsThree.isIp4 = 1; - replyDump.snatAddressDetails = Arrays.asList(detailsOne, detailsTwo, detailsThree); + replyDump.nat44AddressDetails = Arrays.asList(detailsOne, detailsTwo, detailsThree); return replyDump; } diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizerTest.java index 05513b6e9..5402746ae 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizerTest.java @@ -27,10 +27,10 @@ import io.fd.hc2vpp.nat.util.MappingEntryContext; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.snat.dto.Nat64BibDetails; -import io.fd.vpp.jvpp.snat.dto.Nat64BibDetailsReplyDump; -import io.fd.vpp.jvpp.snat.dto.SnatStaticMappingDetails; -import io.fd.vpp.jvpp.snat.dto.SnatStaticMappingDetailsReplyDump; +import io.fd.vpp.jvpp.nat.dto.Nat44StaticMappingDetails; +import io.fd.vpp.jvpp.nat.dto.Nat44StaticMappingDetailsReplyDump; +import io.fd.vpp.jvpp.nat.dto.Nat64BibDetails; +import io.fd.vpp.jvpp.nat.dto.Nat64BibDetailsReplyDump; import java.util.Arrays; import java.util.List; import java.util.Optional; @@ -53,14 +53,14 @@ public class MappingEntryCustomizerTest private static final long NAT_MAPPING_ID = 2L; private InstanceIdentifier<MappingEntry> mappingEntryId; private InstanceIdentifier<MappingEntry> mappingEntryWildcarded; - private DumpCacheManager<SnatStaticMappingDetailsReplyDump, Void> nat44DumpManager; + private DumpCacheManager<Nat44StaticMappingDetailsReplyDump, Void> nat44DumpManager; private DumpCacheManager<Nat64BibDetailsReplyDump, Void> nat64DumpManager; @Mock private MappingEntryContext mappingContext; @Mock - private EntityDumpExecutor<SnatStaticMappingDetailsReplyDump, Void> nat44DumpExecutor; + private EntityDumpExecutor<Nat44StaticMappingDetailsReplyDump, Void> nat44DumpExecutor; @Mock private EntityDumpExecutor<Nat64BibDetailsReplyDump, Void> nat64DumpExecutor; @@ -79,9 +79,9 @@ public class MappingEntryCustomizerTest .child(NatInstance.class, new NatInstanceKey(NatInstanceCustomizer.DEFAULT_VRF_ID)) .child(MappingTable.class) .child(MappingEntry.class); - nat44DumpManager = new DumpCacheManager.DumpCacheManagerBuilder<SnatStaticMappingDetailsReplyDump, Void>() + nat44DumpManager = new DumpCacheManager.DumpCacheManagerBuilder<Nat44StaticMappingDetailsReplyDump, Void>() .withExecutor(nat44DumpExecutor) - .acceptOnly(SnatStaticMappingDetailsReplyDump.class) + .acceptOnly(Nat44StaticMappingDetailsReplyDump.class) .build(); nat64DumpManager = new DumpCacheManager.DumpCacheManagerBuilder<Nat64BibDetailsReplyDump, Void>() .withExecutor(nat64DumpExecutor) @@ -91,13 +91,13 @@ public class MappingEntryCustomizerTest @Test public void testReadNat44() throws Exception { - final SnatStaticMappingDetailsReplyDump dumpNat44 = dumpReplyNat44NonEmpty(); + final Nat44StaticMappingDetailsReplyDump dumpNat44 = dumpReplyNat44NonEmpty(); when(nat44DumpExecutor.executeDump(mappingEntryId, null)).thenReturn(dumpNat44); final MappingEntryBuilder builder = new MappingEntryBuilder(); when(mappingContext - .findDetailsNat44(dumpNat44.snatStaticMappingDetails, NatInstanceCustomizer.DEFAULT_VRF_ID.getId(), + .findDetailsNat44(dumpNat44.nat44StaticMappingDetails, NatInstanceCustomizer.DEFAULT_VRF_ID.getId(), NAT_MAPPING_ID, ctx.getMappingContext())) - .thenReturn(Optional.of(dumpNat44.snatStaticMappingDetails.get(2))); + .thenReturn(Optional.of(dumpNat44.nat44StaticMappingDetails.get(2))); getCustomizer().readCurrentAttributes(mappingEntryId, builder, ctx); assertEquals(NAT_MAPPING_ID, builder.getIndex().longValue()); @@ -113,7 +113,7 @@ public class MappingEntryCustomizerTest @Test public void testReadNat64() throws Exception { - when(nat44DumpExecutor.executeDump(mappingEntryId, null)).thenReturn(new SnatStaticMappingDetailsReplyDump()); + when(nat44DumpExecutor.executeDump(mappingEntryId, null)).thenReturn(new Nat44StaticMappingDetailsReplyDump()); final Nat64BibDetailsReplyDump dumpNat64 = dumpReplyNat64NonEmpty(); when(nat64DumpExecutor.executeDump(mappingEntryId, null)).thenReturn(dumpNat64); final MappingEntryBuilder builder = new MappingEntryBuilder(); @@ -136,15 +136,15 @@ public class MappingEntryCustomizerTest @Test public void testReadAllNat44() throws Exception { - final SnatStaticMappingDetailsReplyDump dumpNat44 = dumpReplyNat44NonEmpty(); + final Nat44StaticMappingDetailsReplyDump dumpNat44 = dumpReplyNat44NonEmpty(); when(nat44DumpExecutor.executeDump(mappingEntryWildcarded, null)).thenReturn(dumpNat44); when(nat64DumpExecutor.executeDump(mappingEntryWildcarded, null)).thenReturn(new Nat64BibDetailsReplyDump()); when(mappingContext.getStoredOrArtificialIndex(NatInstanceCustomizer.DEFAULT_VRF_ID.getId(), - dumpNat44.snatStaticMappingDetails.get(0), ctx.getMappingContext())).thenReturn(0L); + dumpNat44.nat44StaticMappingDetails.get(0), ctx.getMappingContext())).thenReturn(0L); when(mappingContext.getStoredOrArtificialIndex(NatInstanceCustomizer.DEFAULT_VRF_ID.getId(), - dumpNat44.snatStaticMappingDetails.get(1), ctx.getMappingContext())).thenReturn(1L); + dumpNat44.nat44StaticMappingDetails.get(1), ctx.getMappingContext())).thenReturn(1L); when(mappingContext.getStoredOrArtificialIndex(NatInstanceCustomizer.DEFAULT_VRF_ID.getId(), - dumpNat44.snatStaticMappingDetails.get(2), ctx.getMappingContext())).thenReturn(2L); + dumpNat44.nat44StaticMappingDetails.get(2), ctx.getMappingContext())).thenReturn(2L); final List<MappingEntryKey> allIds = getCustomizer().getAllIds(mappingEntryWildcarded, ctx); assertThat(allIds, hasItems(new MappingEntryKey(0L), new MappingEntryKey(2L))); @@ -154,7 +154,7 @@ public class MappingEntryCustomizerTest public void testReadAllNat64() throws Exception { final Nat64BibDetailsReplyDump dumpNat64 = dumpReplyNat64NonEmpty(); when(nat44DumpExecutor.executeDump(mappingEntryWildcarded, null)) - .thenReturn(new SnatStaticMappingDetailsReplyDump()); + .thenReturn(new Nat44StaticMappingDetailsReplyDump()); when(nat64DumpExecutor.executeDump(mappingEntryWildcarded, null)).thenReturn(dumpNat64); when(mappingContext.getStoredOrArtificialIndex(NatInstanceCustomizer.DEFAULT_VRF_ID.getId(), dumpNat64.nat64BibDetails.get(0), ctx.getMappingContext())).thenReturn(0L); @@ -169,17 +169,17 @@ public class MappingEntryCustomizerTest @Test public void testReadAll() throws Exception { - final SnatStaticMappingDetailsReplyDump dumpNat44 = dumpReplyNat44NonEmpty(); + final Nat44StaticMappingDetailsReplyDump dumpNat44 = dumpReplyNat44NonEmpty(); final Nat64BibDetailsReplyDump dumpNat64 = dumpReplyNat64NonEmpty(); when(nat44DumpExecutor.executeDump(mappingEntryWildcarded, null)) .thenReturn(dumpNat44); when(nat64DumpExecutor.executeDump(mappingEntryWildcarded, null)).thenReturn(dumpNat64); when(mappingContext.getStoredOrArtificialIndex(NatInstanceCustomizer.DEFAULT_VRF_ID.getId(), - dumpNat44.snatStaticMappingDetails.get(0), ctx.getMappingContext())).thenReturn(0L); + dumpNat44.nat44StaticMappingDetails.get(0), ctx.getMappingContext())).thenReturn(0L); when(mappingContext.getStoredOrArtificialIndex(NatInstanceCustomizer.DEFAULT_VRF_ID.getId(), - dumpNat44.snatStaticMappingDetails.get(1), ctx.getMappingContext())).thenReturn(1L); + dumpNat44.nat44StaticMappingDetails.get(1), ctx.getMappingContext())).thenReturn(1L); when(mappingContext.getStoredOrArtificialIndex(NatInstanceCustomizer.DEFAULT_VRF_ID.getId(), - dumpNat44.snatStaticMappingDetails.get(2), ctx.getMappingContext())).thenReturn(2L); + dumpNat44.nat44StaticMappingDetails.get(2), ctx.getMappingContext())).thenReturn(2L); when(mappingContext.getStoredOrArtificialIndex(NatInstanceCustomizer.DEFAULT_VRF_ID.getId(), dumpNat64.nat64BibDetails.get(0), ctx.getMappingContext())).thenReturn(3L); when(mappingContext.getStoredOrArtificialIndex(NatInstanceCustomizer.DEFAULT_VRF_ID.getId(), @@ -197,11 +197,10 @@ public class MappingEntryCustomizerTest return new MappingEntryCustomizer(nat44DumpManager, nat64DumpManager, mappingContext); } - private static SnatStaticMappingDetailsReplyDump dumpReplyNat44NonEmpty() { - SnatStaticMappingDetailsReplyDump replyDump = new SnatStaticMappingDetailsReplyDump(); + private static Nat44StaticMappingDetailsReplyDump dumpReplyNat44NonEmpty() { + Nat44StaticMappingDetailsReplyDump replyDump = new Nat44StaticMappingDetailsReplyDump(); - SnatStaticMappingDetails detailsOne = new SnatStaticMappingDetails(); - detailsOne.isIp4 = 1; + Nat44StaticMappingDetails detailsOne = new Nat44StaticMappingDetails(); detailsOne.addrOnly = 1; detailsOne.localIpAddress = new byte[]{-64, -88, 2, 1}; detailsOne.localPort = 1234; @@ -209,8 +208,7 @@ public class MappingEntryCustomizerTest detailsOne.externalPort = 5874; detailsOne.vrfId = NatInstanceCustomizer.DEFAULT_VRF_ID.getId().byteValue(); - SnatStaticMappingDetails detailsTwo = new SnatStaticMappingDetails(); - detailsTwo.isIp4 = 1; + Nat44StaticMappingDetails detailsTwo = new Nat44StaticMappingDetails(); detailsTwo.addrOnly = 1; detailsTwo.localIpAddress = new byte[]{-64, -88, 2, 3}; detailsTwo.localPort = 1235; @@ -218,8 +216,7 @@ public class MappingEntryCustomizerTest detailsTwo.externalPort = 5874; detailsTwo.vrfId = 2; - SnatStaticMappingDetails detailsThree = new SnatStaticMappingDetails(); - detailsThree.isIp4 = 1; + Nat44StaticMappingDetails detailsThree = new Nat44StaticMappingDetails(); detailsThree.addrOnly = 0; detailsThree.localIpAddress = new byte[]{-64, -88, 2, 2}; detailsThree.localPort = 1274; @@ -227,7 +224,7 @@ public class MappingEntryCustomizerTest detailsThree.externalPort = 6874; detailsThree.vrfId = NatInstanceCustomizer.DEFAULT_VRF_ID.getId().byteValue(); - replyDump.snatStaticMappingDetails = Arrays.asList(detailsOne, detailsTwo, detailsThree); + replyDump.nat44StaticMappingDetails = Arrays.asList(detailsOne, detailsTwo, detailsThree); return replyDump; } diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizerTest.java index 0fad2abee..8978fe5ba 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizerTest.java @@ -27,10 +27,10 @@ import io.fd.hc2vpp.common.test.read.InitializingListReaderCustomizerTest; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.snat.dto.Nat64BibDetails; -import io.fd.vpp.jvpp.snat.dto.Nat64BibDetailsReplyDump; -import io.fd.vpp.jvpp.snat.dto.SnatStaticMappingDetails; -import io.fd.vpp.jvpp.snat.dto.SnatStaticMappingDetailsReplyDump; +import io.fd.vpp.jvpp.nat.dto.Nat44StaticMappingDetails; +import io.fd.vpp.jvpp.nat.dto.Nat44StaticMappingDetailsReplyDump; +import io.fd.vpp.jvpp.nat.dto.Nat64BibDetails; +import io.fd.vpp.jvpp.nat.dto.Nat64BibDetailsReplyDump; import java.util.Arrays; import java.util.List; import org.junit.Test; @@ -46,13 +46,13 @@ import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; public class NatInstanceCustomizerTest extends InitializingListReaderCustomizerTest<NatInstance, NatInstanceKey, NatInstanceBuilder> { @Mock - private EntityDumpExecutor<SnatStaticMappingDetailsReplyDump, Void> nat44DumpExecutor; + private EntityDumpExecutor<Nat44StaticMappingDetailsReplyDump, Void> nat44DumpExecutor; @Mock private EntityDumpExecutor<Nat64BibDetailsReplyDump, Void> nat64DumpExecutor; private KeyedInstanceIdentifier<NatInstance, NatInstanceKey> natInstanceId; private InstanceIdentifier<NatInstance> natInstanceWildcarded; - private DumpCacheManager<SnatStaticMappingDetailsReplyDump, Void> mapEntryNat44DumpMgr; + private DumpCacheManager<Nat44StaticMappingDetailsReplyDump, Void> mapEntryNat44DumpMgr; private DumpCacheManager<Nat64BibDetailsReplyDump, Void> mapEntryNat64DumpMgr; public NatInstanceCustomizerTest() { @@ -70,9 +70,9 @@ public class NatInstanceCustomizerTest .child(NatInstance.class, new NatInstanceKey(NatInstanceCustomizer.DEFAULT_VRF_ID)); natInstanceWildcarded = InstanceIdentifier.create(NatInstances.class) .child(NatInstance.class); - mapEntryNat44DumpMgr = new DumpCacheManager.DumpCacheManagerBuilder<SnatStaticMappingDetailsReplyDump, Void>() + mapEntryNat44DumpMgr = new DumpCacheManager.DumpCacheManagerBuilder<Nat44StaticMappingDetailsReplyDump, Void>() .withExecutor(nat44DumpExecutor) - .acceptOnly(SnatStaticMappingDetailsReplyDump.class) + .acceptOnly(Nat44StaticMappingDetailsReplyDump.class) .build(); mapEntryNat64DumpMgr = new DumpCacheManager.DumpCacheManagerBuilder<Nat64BibDetailsReplyDump, Void>() .withExecutor(nat64DumpExecutor) @@ -98,18 +98,18 @@ public class NatInstanceCustomizerTest new NatInstanceKey(5L), new NatInstanceKey(6L))); } - private static SnatStaticMappingDetailsReplyDump nat44NonEmptyDump() { - SnatStaticMappingDetailsReplyDump replyDump = new SnatStaticMappingDetailsReplyDump(); - SnatStaticMappingDetails detailsOne = new SnatStaticMappingDetails(); + private static Nat44StaticMappingDetailsReplyDump nat44NonEmptyDump() { + Nat44StaticMappingDetailsReplyDump replyDump = new Nat44StaticMappingDetailsReplyDump(); + Nat44StaticMappingDetails detailsOne = new Nat44StaticMappingDetails(); detailsOne.vrfId = 1; - SnatStaticMappingDetails detailsTwo = new SnatStaticMappingDetails(); + Nat44StaticMappingDetails detailsTwo = new Nat44StaticMappingDetails(); detailsTwo.vrfId = 2; - SnatStaticMappingDetails detailsThree = new SnatStaticMappingDetails(); + Nat44StaticMappingDetails detailsThree = new Nat44StaticMappingDetails(); detailsThree.vrfId = 3; - replyDump.snatStaticMappingDetails = Arrays.asList(detailsOne, detailsTwo, detailsThree); + replyDump.nat44StaticMappingDetails = Arrays.asList(detailsOne, detailsTwo, detailsThree); return replyDump; } 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 a2d92b4d0..837056f55 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 @@ -28,12 +28,12 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.impl.read.GenericReader; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.snat.dto.Nat64InterfaceDetailsReplyDump; -import io.fd.vpp.jvpp.snat.dto.SnatInterfaceDetails; -import io.fd.vpp.jvpp.snat.dto.SnatInterfaceDetailsReplyDump; -import io.fd.vpp.jvpp.snat.dto.SnatInterfaceOutputFeatureDetails; -import io.fd.vpp.jvpp.snat.dto.SnatInterfaceOutputFeatureDetailsReplyDump; -import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade; +import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceDetails; +import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceDetailsReplyDump; +import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceOutputFeatureDetails; +import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceOutputFeatureDetailsReplyDump; +import io.fd.vpp.jvpp.nat.dto.Nat64InterfaceDetailsReplyDump; +import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState; @@ -55,7 +55,7 @@ public class InterfaceInboundNatCustomizerTest private static final String CTX_NAME = "ifc"; @Mock - private FutureJVppSnatFacade jvppSnat; + private FutureJVppNatFacade jvppNat; private NamingContext ifcContext = new NamingContext(CTX_NAME, CTX_NAME); private InstanceIdentifier<Inbound> id; @@ -76,10 +76,10 @@ public class InterfaceInboundNatCustomizerTest protected void setUp() throws Exception { id = getId(Inbound.class); defineMapping(mappingContext, IFC_NAME, IFC_IDX, CTX_NAME); - when(jvppSnat.snatInterfaceDump(any())).thenReturn(future(new SnatInterfaceDetailsReplyDump())); - when(jvppSnat.snatInterfaceOutputFeatureDump(any())) - .thenReturn(future(new SnatInterfaceOutputFeatureDetailsReplyDump())); - when(jvppSnat.nat64InterfaceDump(any())) + when(jvppNat.nat44InterfaceDump(any())).thenReturn(future(new Nat44InterfaceDetailsReplyDump())); + when(jvppNat.nat44InterfaceOutputFeatureDump(any())) + .thenReturn(future(new Nat44InterfaceOutputFeatureDetailsReplyDump())); + when(jvppNat.nat64InterfaceDump(any())) .thenReturn(future(new Nat64InterfaceDetailsReplyDump())); } @@ -88,22 +88,22 @@ public class InterfaceInboundNatCustomizerTest } private void mockPostRoutingDump() { - final SnatInterfaceOutputFeatureDetailsReplyDump details = new SnatInterfaceOutputFeatureDetailsReplyDump(); - final SnatInterfaceOutputFeatureDetails detail = new SnatInterfaceOutputFeatureDetails(); + final Nat44InterfaceOutputFeatureDetailsReplyDump details = new Nat44InterfaceOutputFeatureDetailsReplyDump(); + final Nat44InterfaceOutputFeatureDetails detail = new Nat44InterfaceOutputFeatureDetails(); detail.isInside = 1; detail.swIfIndex = IFC_IDX; - details.snatInterfaceOutputFeatureDetails = Lists.newArrayList(detail); - when(jvppSnat.snatInterfaceOutputFeatureDump(any())).thenReturn(future(details)); + details.nat44InterfaceOutputFeatureDetails = Lists.newArrayList(detail); + when(jvppNat.nat44InterfaceOutputFeatureDump(any())).thenReturn(future(details)); } @Test public void testPresencePreRouting() throws Exception { - final SnatInterfaceDetailsReplyDump details = new SnatInterfaceDetailsReplyDump(); - final SnatInterfaceDetails detail = new SnatInterfaceDetails(); + final Nat44InterfaceDetailsReplyDump details = new Nat44InterfaceDetailsReplyDump(); + final Nat44InterfaceDetails detail = new Nat44InterfaceDetails(); detail.isInside = 1; detail.swIfIndex = IFC_IDX; - details.snatInterfaceDetails = Lists.newArrayList(detail); - when(jvppSnat.snatInterfaceDump(any())).thenReturn(future(details)); + details.nat44InterfaceDetails = Lists.newArrayList(detail); + when(jvppNat.nat44InterfaceDump(any())).thenReturn(future(details)); assertTrue(getReader().read(id, ctx).isPresent()); } @@ -124,6 +124,6 @@ public class InterfaceInboundNatCustomizerTest @Override protected ReaderCustomizer<Inbound, InboundBuilder> initCustomizer() { - return new InterfaceInboundNatCustomizer(jvppSnat, ifcContext); + return new InterfaceInboundNatCustomizer(jvppNat, ifcContext); } }
\ No newline at end of file diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceOutboundNatCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceOutboundNatCustomizerTest.java index 4640944a5..0e1bad3da 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceOutboundNatCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceOutboundNatCustomizerTest.java @@ -29,12 +29,12 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.impl.read.GenericReader; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.snat.dto.Nat64InterfaceDetailsReplyDump; -import io.fd.vpp.jvpp.snat.dto.SnatInterfaceDetails; -import io.fd.vpp.jvpp.snat.dto.SnatInterfaceDetailsReplyDump; -import io.fd.vpp.jvpp.snat.dto.SnatInterfaceOutputFeatureDetails; -import io.fd.vpp.jvpp.snat.dto.SnatInterfaceOutputFeatureDetailsReplyDump; -import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade; +import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceDetails; +import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceDetailsReplyDump; +import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceOutputFeatureDetails; +import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceOutputFeatureDetailsReplyDump; +import io.fd.vpp.jvpp.nat.dto.Nat64InterfaceDetailsReplyDump; +import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.nat.rev170816._interface.nat.attributes.NatBuilder; @@ -50,7 +50,7 @@ public class InterfaceOutboundNatCustomizerTest private static final String CTX_NAME = "ifc"; @Mock - private FutureJVppSnatFacade jvppSnat; + private FutureJVppNatFacade jvppNat; private NamingContext ifcContext = new NamingContext(CTX_NAME, CTX_NAME); private InstanceIdentifier<Outbound> id; @@ -62,10 +62,10 @@ public class InterfaceOutboundNatCustomizerTest protected void setUp() throws Exception { id = getId(Outbound.class); defineMapping(mappingContext, IFC_NAME, IFC_IDX, CTX_NAME); - when(jvppSnat.snatInterfaceDump(any())).thenReturn(future(new SnatInterfaceDetailsReplyDump())); - when(jvppSnat.snatInterfaceOutputFeatureDump(any())) - .thenReturn(future(new SnatInterfaceOutputFeatureDetailsReplyDump())); - when(jvppSnat.nat64InterfaceDump(any())) + when(jvppNat.nat44InterfaceDump(any())).thenReturn(future(new Nat44InterfaceDetailsReplyDump())); + when(jvppNat.nat44InterfaceOutputFeatureDump(any())) + .thenReturn(future(new Nat44InterfaceOutputFeatureDetailsReplyDump())); + when(jvppNat.nat64InterfaceDump(any())) .thenReturn(future(new Nat64InterfaceDetailsReplyDump())); } @@ -74,22 +74,22 @@ public class InterfaceOutboundNatCustomizerTest } private void mockPostRoutingDump() { - final SnatInterfaceOutputFeatureDetailsReplyDump details = new SnatInterfaceOutputFeatureDetailsReplyDump(); - final SnatInterfaceOutputFeatureDetails detail = new SnatInterfaceOutputFeatureDetails(); + final Nat44InterfaceOutputFeatureDetailsReplyDump details = new Nat44InterfaceOutputFeatureDetailsReplyDump(); + final Nat44InterfaceOutputFeatureDetails detail = new Nat44InterfaceOutputFeatureDetails(); detail.isInside = 0; detail.swIfIndex = IFC_IDX; - details.snatInterfaceOutputFeatureDetails = Lists.newArrayList(detail); - when(jvppSnat.snatInterfaceOutputFeatureDump(any())).thenReturn(future(details)); + details.nat44InterfaceOutputFeatureDetails = Lists.newArrayList(detail); + when(jvppNat.nat44InterfaceOutputFeatureDump(any())).thenReturn(future(details)); } @Test public void testPresencePreRouting() throws Exception { - final SnatInterfaceDetailsReplyDump details = new SnatInterfaceDetailsReplyDump(); - final SnatInterfaceDetails detail = new SnatInterfaceDetails(); + final Nat44InterfaceDetailsReplyDump details = new Nat44InterfaceDetailsReplyDump(); + final Nat44InterfaceDetails detail = new Nat44InterfaceDetails(); detail.isInside = 0; detail.swIfIndex = IFC_IDX; - details.snatInterfaceDetails = Lists.newArrayList(detail); - when(jvppSnat.snatInterfaceDump(any())).thenReturn(future(details)); + details.nat44InterfaceDetails = Lists.newArrayList(detail); + when(jvppNat.nat44InterfaceDump(any())).thenReturn(future(details)); assertTrue(getReader().read(id, ctx).isPresent()); } @@ -110,6 +110,6 @@ public class InterfaceOutboundNatCustomizerTest @Override protected ReaderCustomizer<Outbound, OutboundBuilder> initCustomizer() { - return new InterfaceOutboundNatCustomizer(jvppSnat, ifcContext); + return new InterfaceOutboundNatCustomizer(jvppNat, ifcContext); } }
\ No newline at end of file |