diff options
Diffstat (limited to 'nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read')
6 files changed, 28 insertions, 29 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 daae91c7c..db23b7a24 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 @@ -28,11 +28,11 @@ import static org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.nat.rev180 import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -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 io.fd.jvpp.nat.dto.Nat44AddressDetails; +import io.fd.jvpp.nat.dto.Nat44AddressDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat64PoolAddrDetails; +import io.fd.jvpp.nat.dto.Nat64PoolAddrDetailsReplyDump; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import java.util.Arrays; import java.util.List; import java.util.stream.LongStream; 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 919f7b362..d0541dc24 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 @@ -18,7 +18,6 @@ package io.fd.hc2vpp.nat.read; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsCollectionContaining.hasItems; -import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; @@ -27,10 +26,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.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 io.fd.jvpp.nat.dto.Nat44StaticMappingDetails; +import io.fd.jvpp.nat.dto.Nat44StaticMappingDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat64BibDetails; +import io.fd.jvpp.nat.dto.Nat64BibDetailsReplyDump; import java.util.Arrays; import java.util.List; import java.util.Optional; diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/Nat64PrefixesCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/Nat64PrefixesCustomizerTest.java index 5ba5d7bdf..a3f757389 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/Nat64PrefixesCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/Nat64PrefixesCustomizerTest.java @@ -26,9 +26,9 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.nat.dto.Nat64PrefixDetails; -import io.fd.vpp.jvpp.nat.dto.Nat64PrefixDetailsReplyDump; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.dto.Nat64PrefixDetails; +import io.fd.jvpp.nat.dto.Nat64PrefixDetailsReplyDump; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import java.util.List; import org.junit.Test; import org.mockito.Mock; 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 9f81ab388..0bd68ba70 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.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 io.fd.jvpp.nat.dto.Nat44StaticMappingDetails; +import io.fd.jvpp.nat.dto.Nat44StaticMappingDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat64BibDetails; +import io.fd.jvpp.nat.dto.Nat64BibDetailsReplyDump; import java.util.Arrays; import java.util.List; import org.junit.Test; 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 9afd69235..8d62782a2 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.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 io.fd.jvpp.nat.dto.Nat44InterfaceDetails; +import io.fd.jvpp.nat.dto.Nat44InterfaceDetailsReplyDump; +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 org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816.NatInterfaceStateAugmentation; 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 db2900fb2..dcf3a3c2b 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.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 io.fd.jvpp.nat.dto.Nat44InterfaceDetails; +import io.fd.jvpp.nat.dto.Nat44InterfaceDetailsReplyDump; +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 org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.NatBuilder; |