diff options
Diffstat (limited to 'nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write')
7 files changed, 22 insertions, 24 deletions
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 42d34fc6d..9da83bf76 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 @@ -28,11 +28,11 @@ import io.fd.hc2vpp.nat.NatTestSchemaContext; 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.nat.dto.Nat44AddDelAddressRange; -import io.fd.vpp.jvpp.nat.dto.Nat44AddDelAddressRangeReply; -import io.fd.vpp.jvpp.nat.dto.Nat64AddDelPoolAddrRange; -import io.fd.vpp.jvpp.nat.dto.Nat64AddDelPoolAddrRangeReply; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.dto.Nat44AddDelAddressRange; +import io.fd.jvpp.nat.dto.Nat44AddDelAddressRangeReply; +import io.fd.jvpp.nat.dto.Nat64AddDelPoolAddrRange; +import io.fd.jvpp.nat.dto.Nat64AddDelPoolAddrRangeReply; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; 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 ede39e4b3..129fb8f2c 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 @@ -27,11 +27,11 @@ 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.nat.dto.Nat44AddDelStaticMapping; -import io.fd.vpp.jvpp.nat.dto.Nat44AddDelStaticMappingReply; -import io.fd.vpp.jvpp.nat.dto.Nat64AddDelStaticBib; -import io.fd.vpp.jvpp.nat.dto.Nat64AddDelStaticBibReply; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.dto.Nat44AddDelStaticMapping; +import io.fd.jvpp.nat.dto.Nat44AddDelStaticMappingReply; +import io.fd.jvpp.nat.dto.Nat64AddDelStaticBib; +import io.fd.jvpp.nat.dto.Nat64AddDelStaticBibReply; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/MappingEntryValidatorTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/MappingEntryValidatorTest.java index 1cb98cc0e..a7b5b9e68 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/MappingEntryValidatorTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/MappingEntryValidatorTest.java @@ -20,7 +20,6 @@ import static io.fd.hc2vpp.nat.write.MappingEntryCustomizerTest.IID; import static io.fd.hc2vpp.nat.write.MappingEntryCustomizerTest.MAPPING_TABLE_PATH; import static io.fd.hc2vpp.nat.write.MappingEntryCustomizerTest.extractMappingEntry; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; @@ -30,7 +29,6 @@ import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.write.DataValidationFailedException; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.nat.dto.Nat44AddDelStaticMapping; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/Nat64PrefixesCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/Nat64PrefixesCustomizerTest.java index 8d64b6cb2..b16de9032 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/Nat64PrefixesCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/Nat64PrefixesCustomizerTest.java @@ -23,9 +23,9 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; -import io.fd.vpp.jvpp.nat.dto.Nat64AddDelPrefix; -import io.fd.vpp.jvpp.nat.dto.Nat64AddDelPrefixReply; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.dto.Nat64AddDelPrefix; +import io.fd.jvpp.nat.dto.Nat64AddDelPrefixReply; +import io.fd.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.inet.types.rev130715.Ipv6Prefix; diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/AbstractNatCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/AbstractNatCustomizerTest.java index 4f3041441..52eeb82a3 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/AbstractNatCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/AbstractNatCustomizerTest.java @@ -24,13 +24,13 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceAddDelFeature; -import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceAddDelFeatureReply; -import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceAddDelOutputFeature; -import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceAddDelOutputFeatureReply; -import io.fd.vpp.jvpp.nat.dto.Nat64AddDelInterface; -import io.fd.vpp.jvpp.nat.dto.Nat64AddDelInterfaceReply; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.dto.Nat44InterfaceAddDelFeature; +import io.fd.jvpp.nat.dto.Nat44InterfaceAddDelFeatureReply; +import io.fd.jvpp.nat.dto.Nat44InterfaceAddDelOutputFeature; +import io.fd.jvpp.nat.dto.Nat44InterfaceAddDelOutputFeatureReply; +import io.fd.jvpp.nat.dto.Nat64AddDelInterface; +import io.fd.jvpp.nat.dto.Nat64AddDelInterfaceReply; +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.InterfaceNatVppFeatureAttributes; diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceInboundNatCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceInboundNatCustomizerTest.java index d0a36f63b..fdeec629d 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceInboundNatCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceInboundNatCustomizerTest.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.nat.write.ifc; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816.NatInterfaceAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.Nat; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.nat.Inbound; diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceOutboundNatCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceOutboundNatCustomizerTest.java index 277e0f3db..83c155876 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceOutboundNatCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceOutboundNatCustomizerTest.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.nat.write.ifc; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816.NatInterfaceAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.Nat; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.nat.Outbound; |