From 53f7c0c6184692a75cf2838a60ead925073587d5 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Thu, 28 Feb 2019 10:32:46 +0100 Subject: HC2VPP-404: Update package names for JVPP Fix package names for JVPP so it no longer contains vpp since it has been migrated outside of VPP project. Change-Id: I1e7a3fe4713beaaf7a1a0b41e7180d03bb7b74e5 Signed-off-by: Michal Cmarada --- .../io/fd/hc2vpp/routing/Ipv4RouteNamesFactoryTest.java | 4 ++-- .../io/fd/hc2vpp/routing/Ipv6RouteNamesFactoryTest.java | 4 ++-- .../java/io/fd/hc2vpp/routing/RoutingModuleTest.java | 2 +- .../hc2vpp/routing/helpers/RoutingRequestTestHelper.java | 6 +++--- .../routing/read/ControlPlaneProtocolCustomizerTest.java | 10 +++++----- .../fd/hc2vpp/routing/read/Ipv4RouteCustomizerTest.java | 6 +++--- .../fd/hc2vpp/routing/read/Ipv6RouteCustomizerTest.java | 6 +++--- .../fd/hc2vpp/routing/write/Ipv4RouteCustomizerTest.java | 2 +- .../fd/hc2vpp/routing/write/Ipv6RouteCustomizerTest.java | 2 +- .../io/fd/hc2vpp/routing/write/PrefixCustomizerTest.java | 16 ++++++++-------- .../write/RouterAdvertisementsCustomizerTest.java | 4 ++-- .../factory/MultipathHopRequestFactoryIpv4Test.java | 2 +- .../factory/MultipathHopRequestFactoryIpv6Test.java | 2 +- .../write/factory/SimpleHopRequestFactoryIpv4Test.java | 2 +- .../write/factory/SimpleHopRequestFactoryIpv6Test.java | 2 +- .../factory/SpecialNextHopRequestFactoryIpv4Test.java | 2 +- .../factory/SpecialNextHopRequestFactoryIpv6Test.java | 2 +- 17 files changed, 37 insertions(+), 37 deletions(-) (limited to 'routing/routing-impl/src/test/java/io') diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/Ipv4RouteNamesFactoryTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/Ipv4RouteNamesFactoryTest.java index 0b1e1adb9..1bfe0c799 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/Ipv4RouteNamesFactoryTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/Ipv4RouteNamesFactoryTest.java @@ -26,8 +26,8 @@ import io.fd.hc2vpp.routing.naming.Ipv4RouteNamesFactory; import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.dto.IpFibDetails; -import io.fd.vpp.jvpp.core.types.FibPath; +import io.fd.jvpp.core.dto.IpFibDetails; +import io.fd.jvpp.core.types.FibPath; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/Ipv6RouteNamesFactoryTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/Ipv6RouteNamesFactoryTest.java index 2bf3018d7..412b7f223 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/Ipv6RouteNamesFactoryTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/Ipv6RouteNamesFactoryTest.java @@ -27,8 +27,8 @@ import io.fd.hc2vpp.routing.naming.Ipv6RouteNamesFactory; import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.dto.Ip6FibDetails; -import io.fd.vpp.jvpp.core.types.FibPath; +import io.fd.jvpp.core.dto.Ip6FibDetails; +import io.fd.jvpp.core.types.FibPath; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/RoutingModuleTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/RoutingModuleTest.java index 679b90316..103044fbe 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/RoutingModuleTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/RoutingModuleTest.java @@ -39,7 +39,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/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java index 052a7f2ec..cee89241d 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java @@ -27,9 +27,9 @@ import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.routing.trait.RouteMapper; import io.fd.hc2vpp.routing.write.trait.RouteRequestProducer; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; -import io.fd.vpp.jvpp.core.dto.IpAddDelRouteReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRouteReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import org.mockito.ArgumentCaptor; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizerTest.java index 61338e1e6..99c5b6981 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizerTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizerTest.java @@ -32,11 +32,11 @@ import io.fd.hc2vpp.routing.Ipv6RouteData; 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.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.vpp.jvpp.core.types.FibPath; +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 io.fd.jvpp.core.types.FibPath; import java.util.Arrays; import java.util.List; import org.junit.Test; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizerTest.java index 052dcb7ef..f6d0b6335 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizerTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizerTest.java @@ -38,9 +38,9 @@ import io.fd.honeycomb.translate.read.ReadFailedException; 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.core.dto.IpFibDetails; -import io.fd.vpp.jvpp.core.dto.IpFibDetailsReplyDump; -import io.fd.vpp.jvpp.core.types.FibPath; +import io.fd.jvpp.core.dto.IpFibDetails; +import io.fd.jvpp.core.dto.IpFibDetailsReplyDump; +import io.fd.jvpp.core.types.FibPath; import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizerTest.java index b0f15e1d3..6927c6c1f 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizerTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizerTest.java @@ -39,9 +39,9 @@ import io.fd.honeycomb.translate.read.ReadFailedException; 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.core.dto.Ip6FibDetails; -import io.fd.vpp.jvpp.core.dto.Ip6FibDetailsReplyDump; -import io.fd.vpp.jvpp.core.types.FibPath; +import io.fd.jvpp.core.dto.Ip6FibDetails; +import io.fd.jvpp.core.dto.Ip6FibDetailsReplyDump; +import io.fd.jvpp.core.types.FibPath; import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv4RouteCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv4RouteCustomizerTest.java index 07d16610a..2220a042e 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv4RouteCustomizerTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv4RouteCustomizerTest.java @@ -33,7 +33,7 @@ import io.fd.hc2vpp.routing.naming.Ipv4RouteNamesFactory; 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.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRoute; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizerTest.java index 1a56ced1b..ec748e59f 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizerTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizerTest.java @@ -27,7 +27,7 @@ import io.fd.hc2vpp.routing.naming.Ipv6RouteNamesFactory; 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.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRoute; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/PrefixCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/PrefixCustomizerTest.java index 3f99b791d..67cb15790 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/PrefixCustomizerTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/PrefixCustomizerTest.java @@ -27,12 +27,12 @@ import io.fd.hc2vpp.routing.helpers.SchemaContextTestHelper; 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.core.dto.SwInterfaceIp6NdRaPrefix; -import io.fd.vpp.jvpp.core.dto.SwInterfaceIp6NdRaPrefixReply; -import io.fd.vpp.jvpp.core.types.Address; -import io.fd.vpp.jvpp.core.types.AddressFamily; -import io.fd.vpp.jvpp.core.types.AddressUnion; -import io.fd.vpp.jvpp.core.types.Ip6Address; +import io.fd.jvpp.core.dto.SwInterfaceIp6NdRaPrefix; +import io.fd.jvpp.core.dto.SwInterfaceIp6NdRaPrefixReply; +import io.fd.jvpp.core.types.Address; +import io.fd.jvpp.core.types.AddressFamily; +import io.fd.jvpp.core.types.AddressUnion; +import io.fd.jvpp.core.types.Ip6Address; import org.junit.Test; import org.junit.runner.RunWith; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces; @@ -94,8 +94,8 @@ public class PrefixCustomizerTest extends WriterCustomizerTest implements Schema verify(api).swInterfaceIp6NdRaPrefix(request); } - public io.fd.vpp.jvpp.core.types.Prefix getPrefix(byte[] ip6address, byte length) { - io.fd.vpp.jvpp.core.types.Prefix prefix = new io.fd.vpp.jvpp.core.types.Prefix(); + public io.fd.jvpp.core.types.Prefix getPrefix(byte[] ip6address, byte length) { + io.fd.jvpp.core.types.Prefix prefix = new io.fd.jvpp.core.types.Prefix(); Address address = new Address(); address.af = AddressFamily.ADDRESS_IP6; Ip6Address ip6Address = new Ip6Address(); diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RouterAdvertisementsCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RouterAdvertisementsCustomizerTest.java index 1bec72e19..300281430 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RouterAdvertisementsCustomizerTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RouterAdvertisementsCustomizerTest.java @@ -27,8 +27,8 @@ import io.fd.hc2vpp.routing.helpers.SchemaContextTestHelper; 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.core.dto.SwInterfaceIp6NdRaConfig; -import io.fd.vpp.jvpp.core.dto.SwInterfaceIp6NdRaConfigReply; +import io.fd.jvpp.core.dto.SwInterfaceIp6NdRaConfig; +import io.fd.jvpp.core.dto.SwInterfaceIp6NdRaConfigReply; import org.junit.Test; import org.junit.runner.RunWith; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv4Test.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv4Test.java index b4ec3d91d..a58ef8e2d 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv4Test.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv4Test.java @@ -28,7 +28,7 @@ import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRoute; import java.util.List; import org.junit.Before; import org.junit.Test; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv6Test.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv6Test.java index 50ada6ef3..42a1376a5 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv6Test.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv6Test.java @@ -28,7 +28,7 @@ import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRoute; import java.util.List; import org.junit.Before; import org.junit.Test; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv4Test.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv4Test.java index 5f3632b77..cbe5f3782 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv4Test.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv4Test.java @@ -28,7 +28,7 @@ import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRoute; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv6Test.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv6Test.java index f0a2998e3..b85e5a1cf 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv6Test.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv6Test.java @@ -28,7 +28,7 @@ import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRoute; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv4Test.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv4Test.java index c8cffa7e5..578121b92 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv4Test.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv4Test.java @@ -35,7 +35,7 @@ import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRoute; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv6Test.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv6Test.java index 9f435d21b..14252d9d2 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv6Test.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv6Test.java @@ -34,7 +34,7 @@ import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRoute; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -- cgit 1.2.3-korg