diff options
Diffstat (limited to 'lisp/lisp2vpp/src/test/java')
46 files changed, 109 insertions, 109 deletions
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/LispModuleTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/LispModuleTest.java index 10d4833e5..ffaf3206b 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/LispModuleTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/LispModuleTest.java @@ -34,7 +34,7 @@ import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.util.YangDAG; import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.HashSet; import java.util.Set; import org.junit.Before; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/GpeModuleTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/GpeModuleTest.java index 982239c80..c6d3e73e3 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/GpeModuleTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/GpeModuleTest.java @@ -35,7 +35,7 @@ import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.util.YangDAG; import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.HashSet; import java.util.Set; import org.junit.Before; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeFeatureCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeFeatureCustomizerTest.java index 40f350652..a6dce4257 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeFeatureCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeFeatureCustomizerTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.read.InitializingReaderCustomizerTest; import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.vpp.jvpp.core.dto.ShowLispStatusReply; +import io.fd.jvpp.core.dto.ShowLispStatusReply; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.gpe.rev170801.Gpe; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.gpe.rev170801.GpeState; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeForwardEntryCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeForwardEntryCustomizerTest.java index 87c91a782..2447c0e15 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeForwardEntryCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeForwardEntryCustomizerTest.java @@ -29,14 +29,14 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.lisp.gpe.translate.service.GpeStateCheckService; import io.fd.hc2vpp.lisp.translate.util.EidTranslator; import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.vpp.jvpp.core.dto.GpeFwdEntriesGet; -import io.fd.vpp.jvpp.core.dto.GpeFwdEntriesGetReply; -import io.fd.vpp.jvpp.core.dto.GpeFwdEntryPathDetails; -import io.fd.vpp.jvpp.core.dto.GpeFwdEntryPathDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.GpeFwdEntryPathDump; -import io.fd.vpp.jvpp.core.dto.GpeFwdEntryVnisGetReply; -import io.fd.vpp.jvpp.core.types.GpeFwdEntry; -import io.fd.vpp.jvpp.core.types.GpeLocator; +import io.fd.jvpp.core.dto.GpeFwdEntriesGet; +import io.fd.jvpp.core.dto.GpeFwdEntriesGetReply; +import io.fd.jvpp.core.dto.GpeFwdEntryPathDetails; +import io.fd.jvpp.core.dto.GpeFwdEntryPathDetailsReplyDump; +import io.fd.jvpp.core.dto.GpeFwdEntryPathDump; +import io.fd.jvpp.core.dto.GpeFwdEntryVnisGetReply; +import io.fd.jvpp.core.types.GpeFwdEntry; +import io.fd.jvpp.core.types.GpeLocator; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizerTest.java index 4ed94e838..5c15ec0bd 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizerTest.java @@ -26,9 +26,9 @@ import io.fd.hc2vpp.common.test.read.InitializingListReaderCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.GpeNativeFwdRpathsGet; -import io.fd.vpp.jvpp.core.dto.GpeNativeFwdRpathsGetReply; -import io.fd.vpp.jvpp.core.types.GpeNativeFwdRpath; +import io.fd.jvpp.core.dto.GpeNativeFwdRpathsGet; +import io.fd.jvpp.core.dto.GpeNativeFwdRpathsGetReply; +import io.fd.jvpp.core.types.GpeNativeFwdRpath; import java.util.List; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.gpe.rev170801.NativeForwardPathsTablesState; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizerTest.java index fd7301996..7a96a8290 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizerTest.java @@ -24,11 +24,11 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.read.InitializingListReaderCustomizerTest; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.GpeNativeFwdRpathsGet; -import io.fd.vpp.jvpp.core.dto.Ip6FibDetails; -import io.fd.vpp.jvpp.core.dto.Ip6FibDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpFibDetails; -import io.fd.vpp.jvpp.core.dto.IpFibDetailsReplyDump; +import io.fd.jvpp.core.dto.GpeNativeFwdRpathsGet; +import io.fd.jvpp.core.dto.Ip6FibDetails; +import io.fd.jvpp.core.dto.Ip6FibDetailsReplyDump; +import io.fd.jvpp.core.dto.IpFibDetails; +import io.fd.jvpp.core.dto.IpFibDetailsReplyDump; import java.util.Arrays; import java.util.List; import org.junit.Test; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeFeatureCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeFeatureCustomizerTest.java index 41a662322..c9540e0a9 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeFeatureCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeFeatureCustomizerTest.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.GpeEnableDisable; -import io.fd.vpp.jvpp.core.dto.GpeEnableDisableReply; +import io.fd.jvpp.core.dto.GpeEnableDisable; +import io.fd.jvpp.core.dto.GpeEnableDisableReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeForwardEntryCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeForwardEntryCustomizerTest.java index 11d38cf3d..920b0bcbb 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeForwardEntryCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeForwardEntryCustomizerTest.java @@ -34,9 +34,9 @@ import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.test.tools.annotations.InjectablesProcessor; import io.fd.honeycomb.test.tools.annotations.SchemaContextProvider; -import io.fd.vpp.jvpp.core.dto.GpeAddDelFwdEntry; -import io.fd.vpp.jvpp.core.dto.GpeAddDelFwdEntryReply; -import io.fd.vpp.jvpp.core.types.GpeLocator; +import io.fd.jvpp.core.dto.GpeAddDelFwdEntry; +import io.fd.jvpp.core.dto.GpeAddDelFwdEntryReply; +import io.fd.jvpp.core.types.GpeLocator; import java.util.Arrays; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathCustomizerTest.java index 938812d4e..0b6df3a8c 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathCustomizerTest.java @@ -25,8 +25,8 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.GpeAddDelNativeFwdRpath; -import io.fd.vpp.jvpp.core.dto.GpeAddDelNativeFwdRpathReply; +import io.fd.jvpp.core.dto.GpeAddDelNativeFwdRpath; +import io.fd.jvpp.core.dto.GpeAddDelNativeFwdRpathReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathsTableCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathsTableCustomizerTest.java index 479e4db20..87b0fbd81 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathsTableCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathsTableCustomizerTest.java @@ -24,9 +24,9 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.GpeAddDelIface; -import io.fd.vpp.jvpp.core.dto.GpeAddDelIfaceReply; -import io.fd.vpp.jvpp.core.dto.GpeAddDelNativeFwdRpathReply; +import io.fd.jvpp.core.dto.GpeAddDelIface; +import io.fd.jvpp.core.dto.GpeAddDelIfaceReply; +import io.fd.jvpp.core.dto.GpeAddDelNativeFwdRpathReply; import java.util.List; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizerTest.java index 55c7d2e7f..a5b37d893 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizerTest.java @@ -41,8 +41,8 @@ import io.fd.hc2vpp.lisp.translate.util.EidMetadataProvider; import io.fd.hc2vpp.lisp.util.AdjacencyMappingContextTestHelper; import io.fd.hc2vpp.lisp.util.EidMappingContextHelper; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.OneAdjacenciesGetReply; -import io.fd.vpp.jvpp.core.types.OneAdjacency; +import io.fd.jvpp.core.dto.OneAdjacenciesGetReply; +import io.fd.jvpp.core.types.OneAdjacency; import java.util.List; import org.junit.Before; import org.junit.Test; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizerTest.java index c6c879152..8e6258f64 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizerTest.java @@ -28,7 +28,7 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.lisp.translate.read.trait.SubtableReaderTestCase; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.VppCallbackException; +import io.fd.jvpp.VppCallbackException; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.eid.table.grouping.EidTable; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.eid.table.grouping.eid.table.VniTable; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/InterfaceCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/InterfaceCustomizerTest.java index 80718299f..7662e0362 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/InterfaceCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/InterfaceCustomizerTest.java @@ -24,8 +24,8 @@ import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.OneLocatorDetails; -import io.fd.vpp.jvpp.core.dto.OneLocatorDetailsReplyDump; +import io.fd.jvpp.core.dto.OneLocatorDetails; +import io.fd.jvpp.core.dto.OneLocatorDetailsReplyDump; import java.util.List; import org.junit.Before; import org.junit.Test; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java index d5fd198ea..c7a560794 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java @@ -28,9 +28,9 @@ import static org.mockito.Mockito.when; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.VppCallbackException; -import io.fd.vpp.jvpp.core.dto.OneGetMapRequestItrRlocs; -import io.fd.vpp.jvpp.core.dto.OneGetMapRequestItrRlocsReply; +import io.fd.jvpp.VppCallbackException; +import io.fd.jvpp.core.dto.OneGetMapRequestItrRlocs; +import io.fd.jvpp.core.dto.OneGetMapRequestItrRlocsReply; import java.nio.charset.StandardCharsets; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizerTest.java index d0232d248..4ac7a241a 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizerTest.java @@ -34,9 +34,9 @@ import io.fd.honeycomb.test.tools.annotations.InjectablesProcessor; import io.fd.honeycomb.test.tools.annotations.SchemaContextProvider; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.OneLocatorSetDetails; -import io.fd.vpp.jvpp.core.dto.OneLocatorSetDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.ShowOneStatusReply; +import io.fd.jvpp.core.dto.OneLocatorSetDetails; +import io.fd.jvpp.core.dto.OneLocatorSetDetailsReplyDump; +import io.fd.jvpp.core.dto.ShowOneStatusReply; import java.nio.charset.StandardCharsets; import java.util.Arrays; import org.junit.Before; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizerTest.java index 3357f9bbb..3ccea1104 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizerTest.java @@ -31,8 +31,8 @@ import io.fd.hc2vpp.lisp.translate.util.EidTranslator; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.OneEidTableDetails; -import io.fd.vpp.jvpp.core.dto.OneEidTableDetailsReplyDump; +import io.fd.jvpp.core.dto.OneEidTableDetails; +import io.fd.jvpp.core.dto.OneEidTableDetailsReplyDump; import java.nio.charset.StandardCharsets; import java.util.List; import org.junit.Test; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizerTest.java index 1c4a8a900..6752a5643 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizerTest.java @@ -25,8 +25,8 @@ import com.google.common.collect.ImmutableList; import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.OneLocatorSetDetails; -import io.fd.vpp.jvpp.core.dto.OneLocatorSetDetailsReplyDump; +import io.fd.jvpp.core.dto.OneLocatorSetDetails; +import io.fd.jvpp.core.dto.OneLocatorSetDetailsReplyDump; import java.nio.charset.StandardCharsets; import java.util.List; import org.junit.Before; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapRegisterCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapRegisterCustomizerTest.java index 6b8cc768d..bc87147b7 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapRegisterCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapRegisterCustomizerTest.java @@ -23,9 +23,9 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ShowOneMapRegisterFallbackThresholdReply; -import io.fd.vpp.jvpp.core.dto.ShowOneMapRegisterStateReply; -import io.fd.vpp.jvpp.core.dto.ShowOneMapRegisterTtlReply; +import io.fd.jvpp.core.dto.ShowOneMapRegisterFallbackThresholdReply; +import io.fd.jvpp.core.dto.ShowOneMapRegisterStateReply; +import io.fd.jvpp.core.dto.ShowOneMapRegisterTtlReply; import org.junit.Before; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.lisp.feature.data.grouping.LispFeatureDataBuilder; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapRequestModeCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapRequestModeCustomizerTest.java index ea27d2ec5..c4e1238f5 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapRequestModeCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapRequestModeCustomizerTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.when; import static org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.MapRequestMode.DestinationOnly; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ShowOneMapRequestModeReply; +import io.fd.jvpp.core.dto.ShowOneMapRequestModeReply; import org.junit.Before; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.lisp.feature.data.grouping.LispFeatureDataBuilder; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizerTest.java index d69e3b42c..4419b481e 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizerTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableList; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.OneMapResolverDetails; -import io.fd.vpp.jvpp.core.dto.OneMapResolverDetailsReplyDump; +import io.fd.jvpp.core.dto.OneMapResolverDetails; +import io.fd.jvpp.core.dto.OneMapResolverDetailsReplyDump; import java.util.List; import org.junit.Before; import org.junit.Test; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapServerCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapServerCustomizerTest.java index cba9d71c9..711a0d632 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapServerCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapServerCustomizerTest.java @@ -24,9 +24,9 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.OneMapServerDetails; -import io.fd.vpp.jvpp.core.dto.OneMapServerDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.OneMapServerDump; +import io.fd.jvpp.core.dto.OneMapServerDetails; +import io.fd.jvpp.core.dto.OneMapServerDetailsReplyDump; +import io.fd.jvpp.core.dto.OneMapServerDump; import java.util.Arrays; import java.util.List; import org.junit.Before; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/PetrCfgCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/PetrCfgCustomizerTest.java index 1bdd9b7bf..b196fad5e 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/PetrCfgCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/PetrCfgCustomizerTest.java @@ -22,7 +22,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ShowOneUsePetrReply; +import io.fd.jvpp.core.dto.ShowOneUsePetrReply; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.lisp.feature.data.grouping.LispFeatureDataBuilder; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.use.petr.cfg.grouping.PetrCfg; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/PitrCfgCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/PitrCfgCustomizerTest.java index d67ff2425..2897e3cc1 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/PitrCfgCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/PitrCfgCustomizerTest.java @@ -22,7 +22,7 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.when; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ShowOnePitrReply; +import io.fd.jvpp.core.dto.ShowOnePitrReply; import java.nio.charset.StandardCharsets; import org.junit.Before; import org.junit.Test; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/RemoteMappingCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/RemoteMappingCustomizerTest.java index 14b03fe2b..57cd7fd58 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/RemoteMappingCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/RemoteMappingCustomizerTest.java @@ -29,10 +29,10 @@ import io.fd.hc2vpp.lisp.context.util.EidMappingContext; import io.fd.hc2vpp.lisp.translate.util.EidTranslator; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.OneEidTableDetails; -import io.fd.vpp.jvpp.core.dto.OneEidTableDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.OneLocatorDetails; -import io.fd.vpp.jvpp.core.dto.OneLocatorDetailsReplyDump; +import io.fd.jvpp.core.dto.OneEidTableDetails; +import io.fd.jvpp.core.dto.OneEidTableDetailsReplyDump; +import io.fd.jvpp.core.dto.OneLocatorDetails; +import io.fd.jvpp.core.dto.OneLocatorDetailsReplyDump; import java.util.Collections; import java.util.List; import org.junit.Before; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/RlocProbeCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/RlocProbeCustomizerTest.java index 91b8038af..263483f7c 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/RlocProbeCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/RlocProbeCustomizerTest.java @@ -21,7 +21,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ShowOneRlocProbeStateReply; +import io.fd.jvpp.core.dto.ShowOneRlocProbeStateReply; import org.junit.Before; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.lisp.feature.data.grouping.LispFeatureDataBuilder; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizerTest.java index 6f5d7344c..ce2b6a99d 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizerTest.java @@ -26,9 +26,9 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableList; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.VppCallbackException; -import io.fd.vpp.jvpp.core.dto.OneEidTableVniDetails; -import io.fd.vpp.jvpp.core.dto.OneEidTableVniDetailsReplyDump; +import io.fd.jvpp.VppCallbackException; +import io.fd.jvpp.core.dto.OneEidTableVniDetails; +import io.fd.jvpp.core.dto.OneEidTableVniDetailsReplyDump; import java.util.List; import java.util.concurrent.CompletableFuture; import org.junit.Before; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizerTest.java index c08f85098..57b553657 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizerTest.java @@ -27,7 +27,7 @@ import static org.junit.Assert.fail; import io.fd.hc2vpp.lisp.translate.read.trait.SubtableReaderTestCase; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.VppCallbackException; +import io.fd.jvpp.VppCallbackException; import org.junit.Before; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.eid.table.grouping.EidTable; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/trait/SubtableReaderTestCase.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/trait/SubtableReaderTestCase.java index 225b2c39e..8cd2235a5 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/trait/SubtableReaderTestCase.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/trait/SubtableReaderTestCase.java @@ -26,9 +26,9 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableList; import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest; -import io.fd.vpp.jvpp.core.dto.OneEidTableMapDetails; -import io.fd.vpp.jvpp.core.dto.OneEidTableMapDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.OneEidTableMapDump; +import io.fd.jvpp.core.dto.OneEidTableMapDetails; +import io.fd.jvpp.core.dto.OneEidTableMapDetailsReplyDump; +import io.fd.jvpp.core.dto.OneEidTableMapDump; import java.util.Collections; import javax.annotation.Nonnull; import org.mockito.ArgumentCaptor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImplTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImplTest.java index b65a0b8a6..294bd5466 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImplTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImplTest.java @@ -27,8 +27,8 @@ import io.fd.hc2vpp.common.test.util.FutureProducer; import io.fd.honeycomb.translate.ModificationCache; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.ShowOneStatusReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.ShowOneStatusReply; +import io.fd.jvpp.core.future.FutureJVppCore; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizerTest.java index 810d4c112..af8305946 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizerTest.java @@ -37,8 +37,8 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.lisp.context.util.AdjacenciesMappingContext; import io.fd.hc2vpp.lisp.context.util.EidMappingContext; import io.fd.hc2vpp.lisp.util.EidMappingContextHelper; -import io.fd.vpp.jvpp.core.dto.OneAddDelAdjacency; -import io.fd.vpp.jvpp.core.dto.OneAddDelAdjacencyReply; +import io.fd.jvpp.core.dto.OneAddDelAdjacency; +import io.fd.jvpp.core.dto.OneAddDelAdjacencyReply; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainCustomizerTest.java index 940b9bd02..11fc3d30e 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainCustomizerTest.java @@ -23,7 +23,7 @@ import static org.junit.Assert.fail; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.lisp.translate.write.trait.SubtableWriterTestCase; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppCallbackException; +import io.fd.jvpp.VppCallbackException; import org.junit.Before; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.eid.table.grouping.EidTable; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizerTest.java index 5f18852f8..70c24a4b3 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizerTest.java @@ -28,8 +28,8 @@ 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.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneAddDelLocator; -import io.fd.vpp.jvpp.core.dto.OneAddDelLocatorReply; +import io.fd.jvpp.core.dto.OneAddDelLocator; +import io.fd.jvpp.core.dto.OneAddDelLocatorReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizerTest.java index f1fa8de24..7f401a8d3 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizerTest.java @@ -28,9 +28,9 @@ import static org.mockito.MockitoAnnotations.initMocks; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppCallbackException; -import io.fd.vpp.jvpp.core.dto.OneAddDelMapRequestItrRlocs; -import io.fd.vpp.jvpp.core.dto.OneAddDelMapRequestItrRlocsReply; +import io.fd.jvpp.VppCallbackException; +import io.fd.jvpp.core.dto.OneAddDelMapRequestItrRlocs; +import io.fd.jvpp.core.dto.OneAddDelMapRequestItrRlocsReply; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizerTest.java index 193fd95e3..bc9443a49 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizerTest.java @@ -25,8 +25,8 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneEnableDisable; -import io.fd.vpp.jvpp.core.dto.OneEnableDisableReply; +import io.fd.jvpp.core.dto.OneEnableDisable; +import io.fd.jvpp.core.dto.OneEnableDisableReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.Lisp; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizerTest.java index c645d710f..8a6076e8b 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizerTest.java @@ -32,8 +32,8 @@ import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.hc2vpp.lisp.context.util.EidMappingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneAddDelLocalEid; -import io.fd.vpp.jvpp.core.dto.OneAddDelLocalEidReply; +import io.fd.jvpp.core.dto.OneAddDelLocalEid; +import io.fd.jvpp.core.dto.OneAddDelLocalEidReply; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.concurrent.ExecutionException; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java index 02f5f78a1..b8ad46b6f 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java @@ -30,10 +30,10 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneAddDelLocatorSet; -import io.fd.vpp.jvpp.core.dto.OneAddDelLocatorSetReply; -import io.fd.vpp.jvpp.core.dto.OneLocatorSetDetails; -import io.fd.vpp.jvpp.core.dto.OneLocatorSetDetailsReplyDump; +import io.fd.jvpp.core.dto.OneAddDelLocatorSet; +import io.fd.jvpp.core.dto.OneAddDelLocatorSetReply; +import io.fd.jvpp.core.dto.OneLocatorSetDetails; +import io.fd.jvpp.core.dto.OneLocatorSetDetailsReplyDump; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.concurrent.ExecutionException; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRegisterCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRegisterCustomizerTest.java index 729758be6..52873f9dd 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRegisterCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRegisterCustomizerTest.java @@ -27,12 +27,12 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneMapRegisterEnableDisable; -import io.fd.vpp.jvpp.core.dto.OneMapRegisterEnableDisableReply; -import io.fd.vpp.jvpp.core.dto.OneMapRegisterFallbackThreshold; -import io.fd.vpp.jvpp.core.dto.OneMapRegisterFallbackThresholdReply; -import io.fd.vpp.jvpp.core.dto.OneMapRegisterSetTtl; -import io.fd.vpp.jvpp.core.dto.OneMapRegisterSetTtlReply; +import io.fd.jvpp.core.dto.OneMapRegisterEnableDisable; +import io.fd.jvpp.core.dto.OneMapRegisterEnableDisableReply; +import io.fd.jvpp.core.dto.OneMapRegisterFallbackThreshold; +import io.fd.jvpp.core.dto.OneMapRegisterFallbackThresholdReply; +import io.fd.jvpp.core.dto.OneMapRegisterSetTtl; +import io.fd.jvpp.core.dto.OneMapRegisterSetTtlReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRequestModeCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRequestModeCustomizerTest.java index ba6d9714e..776c3029d 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRequestModeCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRequestModeCustomizerTest.java @@ -27,8 +27,8 @@ import static org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013 import static org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.MapRequestMode.SourceDestination; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneMapRequestMode; -import io.fd.vpp.jvpp.core.dto.OneMapRequestModeReply; +import io.fd.jvpp.core.dto.OneMapRequestMode; +import io.fd.jvpp.core.dto.OneMapRequestModeReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java index dbd371800..7ecbc8ad7 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java @@ -26,8 +26,8 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneAddDelMapResolver; -import io.fd.vpp.jvpp.core.dto.OneAddDelMapResolverReply; +import io.fd.jvpp.core.dto.OneAddDelMapResolver; +import io.fd.jvpp.core.dto.OneAddDelMapResolverReply; import java.util.concurrent.ExecutionException; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapServerCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapServerCustomizerTest.java index ba21d22b7..c0cfb5752 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapServerCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapServerCustomizerTest.java @@ -27,8 +27,8 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneAddDelMapServer; -import io.fd.vpp.jvpp.core.dto.OneAddDelMapServerReply; +import io.fd.jvpp.core.dto.OneAddDelMapServer; +import io.fd.jvpp.core.dto.OneAddDelMapServerReply; import java.util.Arrays; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PetrCfgCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PetrCfgCustomizerTest.java index 8b37a7e71..b33511348 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PetrCfgCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PetrCfgCustomizerTest.java @@ -27,8 +27,8 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneUsePetr; -import io.fd.vpp.jvpp.core.dto.OneUsePetrReply; +import io.fd.jvpp.core.dto.OneUsePetr; +import io.fd.jvpp.core.dto.OneUsePetrReply; import java.util.Arrays; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizerTest.java index e9ee71a2c..5fb7f958b 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizerTest.java @@ -26,8 +26,8 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OnePitrSetLocatorSet; -import io.fd.vpp.jvpp.core.dto.OnePitrSetLocatorSetReply; +import io.fd.jvpp.core.dto.OnePitrSetLocatorSet; +import io.fd.jvpp.core.dto.OnePitrSetLocatorSetReply; import java.util.concurrent.ExecutionException; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizerTest.java index ee3b85318..52e7eb94c 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizerTest.java @@ -33,9 +33,9 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.hc2vpp.lisp.context.util.EidMappingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneAddDelRemoteMapping; -import io.fd.vpp.jvpp.core.dto.OneAddDelRemoteMappingReply; -import io.fd.vpp.jvpp.core.types.OneRemoteLocator; +import io.fd.jvpp.core.dto.OneAddDelRemoteMapping; +import io.fd.jvpp.core.dto.OneAddDelRemoteMappingReply; +import io.fd.jvpp.core.types.OneRemoteLocator; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RlocProbeCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RlocProbeCustomizerTest.java index e1303179e..9b2c9ccb8 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RlocProbeCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RlocProbeCustomizerTest.java @@ -26,8 +26,8 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneRlocProbeEnableDisable; -import io.fd.vpp.jvpp.core.dto.OneRlocProbeEnableDisableReply; +import io.fd.jvpp.core.dto.OneRlocProbeEnableDisable; +import io.fd.jvpp.core.dto.OneRlocProbeEnableDisableReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizerTest.java index 80987e5fe..d9ec3375e 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizerTest.java @@ -22,7 +22,7 @@ import static org.junit.Assert.fail; import io.fd.hc2vpp.lisp.translate.write.trait.SubtableWriterTestCase; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppCallbackException; +import io.fd.jvpp.VppCallbackException; import org.junit.Before; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.eid.table.grouping.EidTable; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriterTestCase.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriterTestCase.java index 64fd742e0..f9c0815bd 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriterTestCase.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriterTestCase.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; -import io.fd.vpp.jvpp.core.dto.OneEidTableAddDelMap; -import io.fd.vpp.jvpp.core.dto.OneEidTableAddDelMapReply; +import io.fd.jvpp.core.dto.OneEidTableAddDelMap; +import io.fd.jvpp.core.dto.OneEidTableAddDelMapReply; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mockito; |