diff options
Diffstat (limited to 'srv6/srv6-impl/src')
69 files changed, 135 insertions, 135 deletions
diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/Srv6PolicyReaderFactory.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/Srv6PolicyReaderFactory.java index ef15dcf55..ba74b5696 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/Srv6PolicyReaderFactory.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/Srv6PolicyReaderFactory.java @@ -33,7 +33,7 @@ import io.fd.honeycomb.translate.impl.read.GenericListReader; import io.fd.honeycomb.translate.impl.read.GenericReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.oc.srte.policy.rev170918.SegmentRoutingBuilder; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.oc.srte.policy.rev170918.autoroute.include.AutorouteIncludeBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/Srv6ReaderFactory.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/Srv6ReaderFactory.java index 41c33f98b..b99dffebd 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/Srv6ReaderFactory.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/Srv6ReaderFactory.java @@ -25,7 +25,7 @@ import io.fd.hc2vpp.srv6.util.function.LocalSidFunctionReadBindingRegistry; import io.fd.honeycomb.translate.impl.read.GenericInitListReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.Locator1Builder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.routing.srv6.locators.locator.StaticBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/NamedSegmentCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/NamedSegmentCustomizer.java index 9f9c0e2ab..a847b46b5 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/NamedSegmentCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/NamedSegmentCustomizer.java @@ -24,7 +24,7 @@ import io.fd.hc2vpp.srv6.util.PolicyContextManager; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.oc.srte.policy.rev170918.named.segment.lists.NamedSegmentListsBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/PolicyCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/PolicyCustomizer.java index c4c323b52..d804174c8 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/PolicyCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/PolicyCustomizer.java @@ -23,7 +23,7 @@ import io.fd.hc2vpp.srv6.util.PolicyContextManager; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.oc.srte.policy.rev170918.policies.PoliciesBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/request/PolicyReadRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/request/PolicyReadRequest.java index a3c6306c3..680216522 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/request/PolicyReadRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/request/PolicyReadRequest.java @@ -25,12 +25,12 @@ import io.fd.hc2vpp.srv6.util.Srv6Util; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.SrPoliciesDetails; -import io.fd.vpp.jvpp.core.dto.SrPoliciesDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.SrPoliciesDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.Srv6Sid; -import io.fd.vpp.jvpp.core.types.Srv6SidList; +import io.fd.jvpp.core.dto.SrPoliciesDetails; +import io.fd.jvpp.core.dto.SrPoliciesDetailsReplyDump; +import io.fd.jvpp.core.dto.SrPoliciesDump; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.Srv6Sid; +import io.fd.jvpp.core.types.Srv6SidList; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/LocatorCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/LocatorCustomizer.java index 3fc33988c..5133a6864 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/LocatorCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/LocatorCustomizer.java @@ -23,7 +23,7 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6.base.rev180301.srv6.locators.LocatorsBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/SidCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/SidCustomizer.java index 58beb9df3..e6c506dc6 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/SidCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/SidCustomizer.java @@ -24,7 +24,7 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.routing.srv6.locators.locator._static.LocalSidsBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/request/LocalSidReadRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/request/LocalSidReadRequest.java index 044f237fb..418e5d52d 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/request/LocalSidReadRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/request/LocalSidReadRequest.java @@ -29,10 +29,10 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.dto.SrLocalsidsDetailsReplyDump; +import io.fd.jvpp.core.dto.SrLocalsidsDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Arrays; import java.util.List; import java.util.Map; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/request/LocatorReadRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/request/LocatorReadRequest.java index 63d243a69..cadc348d1 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/request/LocatorReadRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/request/LocatorReadRequest.java @@ -27,10 +27,10 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.dto.SrLocalsidsDetailsReplyDump; +import io.fd.jvpp.core.dto.SrLocalsidsDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import java.util.stream.Collectors; import javax.annotation.Nonnull; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/InterfaceCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/InterfaceCustomizer.java index af1420efb..dd89a476b 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/InterfaceCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/InterfaceCustomizer.java @@ -22,7 +22,7 @@ import io.fd.hc2vpp.srv6.read.steering.request.L2SteeringRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.oc.srte.policy.rev180514.segment.routing.traffic.engineering.policies.policy.autoroute.include.InterfacesBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/PrefixCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/PrefixCustomizer.java index b0ee7c3f8..274ffc371 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/PrefixCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/PrefixCustomizer.java @@ -21,7 +21,7 @@ import io.fd.hc2vpp.srv6.read.steering.request.L3SteeringRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.oc.srte.policy.rev170918.prefixes.properties.PrefixesBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/PrefixesStateCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/PrefixesStateCustomizer.java index b099939eb..1e4a09a94 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/PrefixesStateCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/PrefixesStateCustomizer.java @@ -24,7 +24,7 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.oc.srte.policy.rev170918.prefixes.properties.Prefixes; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/L2SteeringRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/L2SteeringRequest.java index e421158bc..b6554ce13 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/L2SteeringRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/L2SteeringRequest.java @@ -20,8 +20,8 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.srv6.read.ReadRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.vpp.jvpp.core.dto.SrSteeringPolDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrSteeringPolDetails; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import java.util.stream.Collectors; import javax.annotation.Nonnull; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/L3SteeringRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/L3SteeringRequest.java index 4c7c943e6..2c3631d1e 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/L3SteeringRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/L3SteeringRequest.java @@ -20,8 +20,8 @@ import com.google.common.base.Preconditions; import io.fd.hc2vpp.srv6.read.ReadRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.vpp.jvpp.core.dto.SrSteeringPolDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrSteeringPolDetails; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import java.util.stream.Collectors; import javax.annotation.Nonnull; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/SteeringRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/SteeringRequest.java index 04b67f67e..14f824069 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/SteeringRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/SteeringRequest.java @@ -18,9 +18,9 @@ package io.fd.hc2vpp.srv6.read.steering.request; import io.fd.hc2vpp.srv6.util.JVppRequest; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.SrSteeringPolDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.SrSteeringPolDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrSteeringPolDetailsReplyDump; +import io.fd.jvpp.core.dto.SrSteeringPolDump; +import io.fd.jvpp.core.future.FutureJVppCore; /** * General template for steering requests diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/JVppRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/JVppRequest.java index 9ea9fff30..340396ef7 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/JVppRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/JVppRequest.java @@ -18,7 +18,7 @@ package io.fd.hc2vpp.srv6.util; import io.fd.hc2vpp.common.translate.util.AddressTranslator; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; public abstract class JVppRequest implements AddressTranslator, JvppReplyConsumer { diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBinder.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBinder.java index ab624fbf7..0bc769f98 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBinder.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBinder.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.srv6.util.function; import io.fd.honeycomb.translate.read.ReadContext; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.SidBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6.types.rev180301.Srv6EndpointType; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBindingRegistry.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBindingRegistry.java index 66586b9c2..945e09e18 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBindingRegistry.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBindingRegistry.java @@ -19,7 +19,7 @@ package io.fd.hc2vpp.srv6.util.function; import io.fd.hc2vpp.srv6.write.sid.request.LocalSidFunctionRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.SidBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBindingRegistryProvider.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBindingRegistryProvider.java index 40e305371..cdaf7bed8 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBindingRegistryProvider.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBindingRegistryProvider.java @@ -27,7 +27,7 @@ import io.fd.hc2vpp.srv6.util.function.xconnect.EndDX2FunctionBinder; import io.fd.hc2vpp.srv6.util.function.xconnect.EndDX4FunctionBinder; import io.fd.hc2vpp.srv6.util.function.xconnect.EndDX6FunctionBinder; import io.fd.hc2vpp.srv6.util.function.xconnect.EndXFunctionBinder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.inject.Named; public class LocalSidFunctionReadBindingRegistryProvider implements Provider<LocalSidFunctionReadBindingRegistry> { diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionWriteBindingRegistryProvider.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionWriteBindingRegistryProvider.java index ead94c90f..532046707 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionWriteBindingRegistryProvider.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionWriteBindingRegistryProvider.java @@ -27,7 +27,7 @@ import io.fd.hc2vpp.srv6.util.function.xconnect.EndDX2FunctionBinder; import io.fd.hc2vpp.srv6.util.function.xconnect.EndDX4FunctionBinder; import io.fd.hc2vpp.srv6.util.function.xconnect.EndDX6FunctionBinder; import io.fd.hc2vpp.srv6.util.function.xconnect.EndXFunctionBinder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.inject.Named; public class LocalSidFunctionWriteBindingRegistryProvider implements Provider<LocalSidFunctionWriteBindingRegistry> { diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndDT4FunctionBinder.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndDT4FunctionBinder.java index 67b739161..7b89d9bb2 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndDT4FunctionBinder.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndDT4FunctionBinder.java @@ -20,8 +20,8 @@ import com.google.common.base.Preconditions; import io.fd.hc2vpp.srv6.write.sid.request.TableLookupLocalSidRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.Sid; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.SidBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndDT6FunctionBinder.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndDT6FunctionBinder.java index d9782a1af..743662115 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndDT6FunctionBinder.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndDT6FunctionBinder.java @@ -20,8 +20,8 @@ import com.google.common.base.Preconditions; import io.fd.hc2vpp.srv6.write.sid.request.TableLookupLocalSidRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.Sid; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.SidBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndTFunctionBinder.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndTFunctionBinder.java index cd9a37c48..957180f35 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndTFunctionBinder.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndTFunctionBinder.java @@ -20,8 +20,8 @@ import com.google.common.base.Preconditions; import io.fd.hc2vpp.srv6.write.sid.request.TableLookupLocalSidRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.Sid; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.SidBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/TableLookupFunctionBinder.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/TableLookupFunctionBinder.java index 31eacc558..fba75ecab 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/TableLookupFunctionBinder.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/TableLookupFunctionBinder.java @@ -22,7 +22,7 @@ import io.fd.hc2vpp.srv6.util.function.LocalSidFunctionReadBinder; import io.fd.hc2vpp.srv6.util.function.LocalSidFunctionWriteBinder; import io.fd.hc2vpp.srv6.write.sid.request.TableLookupLocalSidRequest; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.fib.table.management.rev180521.AddressFamilyIdentity; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.fib.table.management.rev180521.Ipv4; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/nofunction/EndFunctionBinder.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/nofunction/EndFunctionBinder.java index 4d7ad69fe..47450cb49 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/nofunction/EndFunctionBinder.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/nofunction/EndFunctionBinder.java @@ -23,8 +23,8 @@ import io.fd.hc2vpp.srv6.util.function.LocalSidFunctionWriteBinder; import io.fd.hc2vpp.srv6.write.sid.request.NoProtocolLocalSidRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.Sid; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.SidBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX2FunctionBinder.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX2FunctionBinder.java index 5321bffcf..c0010a912 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX2FunctionBinder.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX2FunctionBinder.java @@ -21,8 +21,8 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.srv6.write.sid.request.XConnectLocalSidRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.Sid; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.SidBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX4FunctionBinder.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX4FunctionBinder.java index cb8dbfeb1..506b5aa51 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX4FunctionBinder.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX4FunctionBinder.java @@ -21,8 +21,8 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.srv6.write.sid.request.XConnectLocalSidRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collections; import java.util.Optional; import javax.annotation.Nonnull; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX6FunctionBinder.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX6FunctionBinder.java index 3c1218005..727fdce63 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX6FunctionBinder.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX6FunctionBinder.java @@ -21,8 +21,8 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.srv6.write.sid.request.XConnectLocalSidRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collections; import java.util.Optional; import javax.annotation.Nonnull; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndXFunctionBinder.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndXFunctionBinder.java index e153bd5f8..5bfbb167d 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndXFunctionBinder.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndXFunctionBinder.java @@ -21,8 +21,8 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.srv6.write.sid.request.XConnectLocalSidRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collections; import java.util.Optional; import javax.annotation.Nonnull; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/XConnectFunctionBinder.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/XConnectFunctionBinder.java index eef5d9622..3be28392e 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/XConnectFunctionBinder.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/XConnectFunctionBinder.java @@ -25,7 +25,7 @@ import io.fd.hc2vpp.srv6.util.function.LocalSidFunctionReadBinder; import io.fd.hc2vpp.srv6.util.function.LocalSidFunctionWriteBinder; import io.fd.hc2vpp.srv6.write.sid.request.XConnectLocalSidRequest; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; abstract class XConnectFunctionBinder extends FutureJVppCustomizer diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/Srv6PolicyWriterFactory.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/Srv6PolicyWriterFactory.java index 87e07d216..642086b8e 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/Srv6PolicyWriterFactory.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/Srv6PolicyWriterFactory.java @@ -33,7 +33,7 @@ import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; public class Srv6PolicyWriterFactory implements WriterFactory { diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/Srv6WriterFactory.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/Srv6WriterFactory.java index bb2619755..29e6d9f7e 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/Srv6WriterFactory.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/Srv6WriterFactory.java @@ -28,7 +28,7 @@ import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; public class Srv6WriterFactory implements WriterFactory { diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/EncapsulationSourceCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/EncapsulationSourceCustomizer.java index 375aad0f9..adefcf45c 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/EncapsulationSourceCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/EncapsulationSourceCustomizer.java @@ -23,7 +23,7 @@ import io.fd.hc2vpp.srv6.write.encap.source.request.EncapsulationSourceWriteRequ import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6.base.rev180301.srv6.encap.Encapsulation; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceDeleteRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceDeleteRequest.java index e8877a956..9b839f39c 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceDeleteRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceDeleteRequest.java @@ -19,8 +19,8 @@ package io.fd.hc2vpp.srv6.write.encap.source.request; import io.fd.hc2vpp.srv6.util.JVppRequest; import io.fd.hc2vpp.srv6.write.DeleteRequest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrSetEncapSource; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrSetEncapSource; +import io.fd.jvpp.core.future.FutureJVppCore; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class EncapsulationSourceDeleteRequest extends JVppRequest implements DeleteRequest { diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceWriteRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceWriteRequest.java index 0ecf13108..b2c114d9c 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceWriteRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceWriteRequest.java @@ -21,8 +21,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import io.fd.hc2vpp.srv6.util.JVppRequest; import io.fd.hc2vpp.srv6.write.WriteRequest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrSetEncapSource; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrSetEncapSource; +import io.fd.jvpp.core.future.FutureJVppCore; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/PolicyCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/PolicyCustomizer.java index f1a5c7de0..9072e3991 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/PolicyCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/PolicyCustomizer.java @@ -30,7 +30,7 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.ArrayList; import java.util.Comparator; import java.util.List; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/request/PolicyDeleteRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/request/PolicyDeleteRequest.java index 71b9d72e8..d3981ca23 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/request/PolicyDeleteRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/request/PolicyDeleteRequest.java @@ -21,9 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import io.fd.hc2vpp.srv6.util.JVppRequest; import io.fd.hc2vpp.srv6.write.DeleteRequest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrPolicyDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.Srv6Sid; +import io.fd.jvpp.core.dto.SrPolicyDel; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.Srv6Sid; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/request/PolicyWriteRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/request/PolicyWriteRequest.java index a1523043d..3e2f622c3 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/request/PolicyWriteRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/request/PolicyWriteRequest.java @@ -24,11 +24,11 @@ import io.fd.hc2vpp.srv6.util.JVppRequest; import io.fd.hc2vpp.srv6.write.WriteRequest; import io.fd.hc2vpp.srv6.write.policy.request.dto.SidList; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrPolicyAdd; -import io.fd.vpp.jvpp.core.dto.SrPolicyMod; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.Srv6Sid; -import io.fd.vpp.jvpp.core.types.Srv6SidList; +import io.fd.jvpp.core.dto.SrPolicyAdd; +import io.fd.jvpp.core.dto.SrPolicyMod; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.Srv6Sid; +import io.fd.jvpp.core.types.Srv6SidList; import java.util.ArrayList; import java.util.Comparator; import java.util.List; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/LocatorCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/LocatorCustomizer.java index 41e838ee7..0510fdddf 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/LocatorCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/LocatorCustomizer.java @@ -21,7 +21,7 @@ import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.hc2vpp.srv6.util.LocatorContextManager; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/SidCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/SidCustomizer.java index 83db74364..e29b623c4 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/SidCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/SidCustomizer.java @@ -27,7 +27,7 @@ import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.fib.table.management.rev180521.vpp.fib.table.management.fib.tables.Table; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.fib.table.management.rev180521.vpp.fib.table.management.fib.tables.TableKey; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/LocalSidFunctionRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/LocalSidFunctionRequest.java index e3d64ea6c..f4d96a77d 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/LocalSidFunctionRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/LocalSidFunctionRequest.java @@ -23,9 +23,9 @@ import io.fd.hc2vpp.srv6.util.JVppRequest; import io.fd.hc2vpp.srv6.write.DeleteRequest; import io.fd.hc2vpp.srv6.write.WriteRequest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrLocalsidAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.Srv6Sid; +import io.fd.jvpp.core.dto.SrLocalsidAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.Srv6Sid; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.Srv6SidConfig; import org.opendaylight.yangtools.yang.binding.ChildOf; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/NoProtocolLocalSidRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/NoProtocolLocalSidRequest.java index 18630ccc2..67c7aa158 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/NoProtocolLocalSidRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/NoProtocolLocalSidRequest.java @@ -16,7 +16,7 @@ package io.fd.hc2vpp.srv6.write.sid.request; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; /** * Local SID using End function diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/TableLookupLocalSidRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/TableLookupLocalSidRequest.java index 4642b3349..48dceb161 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/TableLookupLocalSidRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/TableLookupLocalSidRequest.java @@ -16,8 +16,8 @@ package io.fd.hc2vpp.srv6.write.sid.request; -import io.fd.vpp.jvpp.core.dto.SrLocalsidAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; /** * Request for Local SID using table lookup functions diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/XConnectLocalSidRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/XConnectLocalSidRequest.java index 38208aaf1..c5748ef4f 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/XConnectLocalSidRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/XConnectLocalSidRequest.java @@ -17,8 +17,8 @@ package io.fd.hc2vpp.srv6.write.sid.request; import io.fd.hc2vpp.common.translate.util.AddressTranslator; -import io.fd.vpp.jvpp.core.dto.SrLocalsidAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; /** diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/InterfacesConfigCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/InterfacesConfigCustomizer.java index 3f22e0678..a5913ef03 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/InterfacesConfigCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/InterfacesConfigCustomizer.java @@ -24,7 +24,7 @@ import io.fd.hc2vpp.srv6.write.steering.request.L2SteeringRequest; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.oc.srte.policy.rev180514.sr.interfaces.Interface; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.oc.srte.policy.rev180514.sr.interfaces.InterfaceKey; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/PrefixCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/PrefixCustomizer.java index 7973c3203..ec6a1288b 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/PrefixCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/PrefixCustomizer.java @@ -23,7 +23,7 @@ import io.fd.hc2vpp.srv6.write.steering.request.L3SteeringRequest; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.oc.srte.policy.rev170918.prefixes.properties.prefixes.Prefix; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.oc.srte.policy.rev170918.prefixes.properties.prefixes.PrefixKey; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/PrefixesConfigCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/PrefixesConfigCustomizer.java index e366db3a3..ba01fafc2 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/PrefixesConfigCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/PrefixesConfigCustomizer.java @@ -23,7 +23,7 @@ import io.fd.hc2vpp.srv6.write.steering.request.L3SteeringRequest; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.oc.srte.policy.rev170918.prefixes.properties.prefixes.Config; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/L2SteeringRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/L2SteeringRequest.java index 960d17bb9..577935a8f 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/L2SteeringRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/L2SteeringRequest.java @@ -19,8 +19,8 @@ package io.fd.hc2vpp.srv6.write.steering.request; import io.fd.hc2vpp.srv6.write.DeleteRequest; import io.fd.hc2vpp.srv6.write.WriteRequest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrSteeringAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrSteeringAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/L3SteeringRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/L3SteeringRequest.java index 850234c41..abf9d901b 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/L3SteeringRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/L3SteeringRequest.java @@ -22,8 +22,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import io.fd.hc2vpp.srv6.write.DeleteRequest; import io.fd.hc2vpp.srv6.write.WriteRequest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrSteeringAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrSteeringAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/SteeringRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/SteeringRequest.java index 2078ade5b..d2a84ae5e 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/SteeringRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/SteeringRequest.java @@ -19,7 +19,7 @@ package io.fd.hc2vpp.srv6.write.steering.request; import static com.google.common.base.Preconditions.checkNotNull; import io.fd.hc2vpp.srv6.util.JVppRequest; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; /** diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/Srv6ModuleTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/Srv6ModuleTest.java index 068ea128a..b1610a8fa 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/Srv6ModuleTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/Srv6ModuleTest.java @@ -42,7 +42,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.Iterator; import java.util.Set; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/policy/PoliciesTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/policy/PoliciesTest.java index d1abd15e8..cc16964bb 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/policy/PoliciesTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/policy/PoliciesTest.java @@ -28,10 +28,10 @@ import io.fd.hc2vpp.srv6.util.PolicyContextManager; import io.fd.hc2vpp.srv6.write.sid.request.LocalSidRequestTest; import io.fd.honeycomb.translate.ModificationCache; import io.fd.honeycomb.translate.read.ReadContext; -import io.fd.vpp.jvpp.core.dto.SrPoliciesDetails; -import io.fd.vpp.jvpp.core.dto.SrPoliciesDetailsReplyDump; -import io.fd.vpp.jvpp.core.types.Srv6Sid; -import io.fd.vpp.jvpp.core.types.Srv6SidList; +import io.fd.jvpp.core.dto.SrPoliciesDetails; +import io.fd.jvpp.core.dto.SrPoliciesDetailsReplyDump; +import io.fd.jvpp.core.types.Srv6Sid; +import io.fd.jvpp.core.types.Srv6SidList; import java.util.Arrays; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.oc.srte.policy.rev170918.ProvisioningMethodConfig; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/LocatorCustomizerTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/LocatorCustomizerTest.java index 963bc664d..80df9940b 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/LocatorCustomizerTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/LocatorCustomizerTest.java @@ -25,9 +25,9 @@ import io.fd.hc2vpp.srv6.write.sid.request.LocalSidRequestTest; import io.fd.honeycomb.translate.ModificationCache; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetailsReplyDump; -import io.fd.vpp.jvpp.core.types.Srv6Sid; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.dto.SrLocalsidsDetailsReplyDump; +import io.fd.jvpp.core.types.Srv6Sid; import java.util.Collections; import java.util.List; import org.junit.Assert; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/SidCustomizerTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/SidCustomizerTest.java index 237a158dc..e27cd67da 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/SidCustomizerTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/SidCustomizerTest.java @@ -27,9 +27,9 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.ModificationCache; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetailsReplyDump; -import io.fd.vpp.jvpp.core.types.Srv6Sid; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.dto.SrLocalsidsDetailsReplyDump; +import io.fd.jvpp.core.types.Srv6Sid; import java.util.Collections; import java.util.List; import org.junit.Assert; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/request/LocalSidReadRequestTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/request/LocalSidReadRequestTest.java index 21668e3b1..c73972964 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/request/LocalSidReadRequestTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/request/LocalSidReadRequestTest.java @@ -26,9 +26,9 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.ModificationCache; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetailsReplyDump; -import io.fd.vpp.jvpp.core.types.Srv6Sid; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.dto.SrLocalsidsDetailsReplyDump; +import io.fd.jvpp.core.types.Srv6Sid; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/request/LocatorReadRequestTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/request/LocatorReadRequestTest.java index 68806c2af..fd76f9685 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/request/LocatorReadRequestTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/request/LocatorReadRequestTest.java @@ -25,9 +25,9 @@ import io.fd.hc2vpp.srv6.write.sid.request.LocalSidRequestTest; import io.fd.honeycomb.translate.ModificationCache; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetailsReplyDump; -import io.fd.vpp.jvpp.core.types.Srv6Sid; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.dto.SrLocalsidsDetailsReplyDump; +import io.fd.jvpp.core.types.Srv6Sid; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/steering/SteeringTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/steering/SteeringTest.java index 57f4fe806..87cb260f3 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/steering/SteeringTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/steering/SteeringTest.java @@ -24,9 +24,9 @@ import io.fd.hc2vpp.common.translate.util.AddressTranslator; import io.fd.hc2vpp.srv6.write.sid.request.LocalSidRequestTest; import io.fd.honeycomb.translate.ModificationCache; import io.fd.honeycomb.translate.read.ReadContext; -import io.fd.vpp.jvpp.core.dto.SrSteeringPolDetails; -import io.fd.vpp.jvpp.core.dto.SrSteeringPolDetailsReplyDump; -import io.fd.vpp.jvpp.core.types.Srv6Sid; +import io.fd.jvpp.core.dto.SrSteeringPolDetails; +import io.fd.jvpp.core.dto.SrSteeringPolDetailsReplyDump; +import io.fd.jvpp.core.types.Srv6Sid; import java.util.ArrayList; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/util/JvppRequestTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/util/JvppRequestTest.java index c4b77a263..7a1e9896c 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/util/JvppRequestTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/util/JvppRequestTest.java @@ -36,8 +36,8 @@ import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.SchemaContextProvider; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.SrSteeringAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrSteeringAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; import org.junit.Assert; import org.junit.Before; import org.junit.runner.RunWith; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionBindingRegistryTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionBindingRegistryTest.java index 1a1622c2e..7045c8d6f 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionBindingRegistryTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionBindingRegistryTest.java @@ -27,7 +27,7 @@ import io.fd.hc2vpp.srv6.write.sid.request.NoProtocolLocalSidRequest; import io.fd.hc2vpp.srv6.write.sid.request.TableLookupLocalSidRequest; import io.fd.hc2vpp.srv6.write.sid.request.XConnectLocalSidRequest; import io.fd.honeycomb.translate.read.ReadContext; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; import java.util.Collections; import org.junit.Assert; import org.junit.Test; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/encap/source/EncapsulationSourceCustomizerTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/encap/source/EncapsulationSourceCustomizerTest.java index 0daef976a..201314c6a 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/encap/source/EncapsulationSourceCustomizerTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/encap/source/EncapsulationSourceCustomizerTest.java @@ -23,8 +23,8 @@ import io.fd.hc2vpp.common.test.util.FutureProducer; import io.fd.hc2vpp.srv6.Srv6IIds; import io.fd.hc2vpp.srv6.util.JvppRequestTest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrSetEncapSource; -import io.fd.vpp.jvpp.core.dto.SrSetEncapSourceReply; +import io.fd.jvpp.core.dto.SrSetEncapSource; +import io.fd.jvpp.core.dto.SrSetEncapSourceReply; import java.util.Arrays; import org.junit.Assert; import org.junit.Test; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceRequestTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceRequestTest.java index 442b87cdd..2a3cb200e 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceRequestTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceRequestTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import io.fd.hc2vpp.srv6.Srv6IIds; import io.fd.hc2vpp.srv6.util.JvppRequestTest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrSetEncapSource; -import io.fd.vpp.jvpp.core.dto.SrSetEncapSourceReply; +import io.fd.jvpp.core.dto.SrSetEncapSource; +import io.fd.jvpp.core.dto.SrSetEncapSourceReply; import java.util.Arrays; import org.junit.Assert; import org.junit.Test; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/policy/PolicyCustomizerTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/policy/PolicyCustomizerTest.java index 37aee2271..8f974542c 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/policy/PolicyCustomizerTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/policy/PolicyCustomizerTest.java @@ -32,12 +32,12 @@ import io.fd.hc2vpp.srv6.util.JvppRequestTest; import io.fd.hc2vpp.srv6.util.PolicyContextManager; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrPolicyAdd; -import io.fd.vpp.jvpp.core.dto.SrPolicyAddReply; -import io.fd.vpp.jvpp.core.dto.SrPolicyDel; -import io.fd.vpp.jvpp.core.dto.SrPolicyDelReply; -import io.fd.vpp.jvpp.core.dto.SrPolicyMod; -import io.fd.vpp.jvpp.core.dto.SrPolicyModReply; +import io.fd.jvpp.core.dto.SrPolicyAdd; +import io.fd.jvpp.core.dto.SrPolicyAddReply; +import io.fd.jvpp.core.dto.SrPolicyDel; +import io.fd.jvpp.core.dto.SrPolicyDelReply; +import io.fd.jvpp.core.dto.SrPolicyMod; +import io.fd.jvpp.core.dto.SrPolicyModReply; import org.junit.Assert; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/LocalSidRequestTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/LocalSidRequestTest.java index fa30c07fb..dceeb6434 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/LocalSidRequestTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/LocalSidRequestTest.java @@ -26,8 +26,8 @@ import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.srv6.Srv6IIds; import io.fd.hc2vpp.srv6.util.JvppRequestTest; import io.fd.hc2vpp.srv6.util.LocatorContextManager; -import io.fd.vpp.jvpp.core.dto.SrLocalsidAddDel; -import io.fd.vpp.jvpp.core.dto.SrLocalsidAddDelReply; +import io.fd.jvpp.core.dto.SrLocalsidAddDel; +import io.fd.jvpp.core.dto.SrLocalsidAddDelReply; import java.util.Arrays; import org.junit.Assert; import org.mockito.ArgumentCaptor; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/NoProtocolLocalSidRequestTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/NoProtocolLocalSidRequestTest.java index a53fc09ba..b3c92cb5e 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/NoProtocolLocalSidRequestTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/NoProtocolLocalSidRequestTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.verify; import io.fd.hc2vpp.srv6.Srv6IIds; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrLocalsidAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/TableLookupLocalSidRequestTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/TableLookupLocalSidRequestTest.java index 0cedec73b..4380a5c16 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/TableLookupLocalSidRequestTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/TableLookupLocalSidRequestTest.java @@ -16,13 +16,13 @@ package io.fd.hc2vpp.srv6.write.sid.request; -import static io.fd.vpp.jvpp.Assertions.assertEquals; +import static io.fd.jvpp.Assertions.assertEquals; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import io.fd.hc2vpp.srv6.Srv6IIds; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrLocalsidAddDel; +import io.fd.jvpp.core.dto.SrLocalsidAddDel; import org.junit.Test; public class TableLookupLocalSidRequestTest extends LocalSidRequestTest { diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/XConnectLocalSidRequestTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/XConnectLocalSidRequestTest.java index 970295001..73c0f072b 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/XConnectLocalSidRequestTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/XConnectLocalSidRequestTest.java @@ -16,15 +16,15 @@ package io.fd.hc2vpp.srv6.write.sid.request; -import static io.fd.vpp.jvpp.Assertions.assertEquals; +import static io.fd.jvpp.Assertions.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import io.fd.hc2vpp.srv6.Srv6IIds; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrLocalsidAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Arrays; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/InterfacesConfigCustomizerTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/InterfacesConfigCustomizerTest.java index d980dc4f0..738a970f5 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/InterfacesConfigCustomizerTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/InterfacesConfigCustomizerTest.java @@ -29,8 +29,8 @@ import io.fd.hc2vpp.srv6.Srv6PolicyIIds; import io.fd.hc2vpp.srv6.util.JvppRequestTest; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrSteeringAddDel; -import io.fd.vpp.jvpp.core.dto.SrSteeringAddDelReply; +import io.fd.jvpp.core.dto.SrSteeringAddDel; +import io.fd.jvpp.core.dto.SrSteeringAddDelReply; import org.junit.Assert; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/PrefixCustomizerTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/PrefixCustomizerTest.java index 9335ab61c..d70813844 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/PrefixCustomizerTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/PrefixCustomizerTest.java @@ -27,8 +27,8 @@ import io.fd.hc2vpp.srv6.Srv6PolicyIIds; import io.fd.hc2vpp.srv6.util.JvppRequestTest; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrSteeringAddDel; -import io.fd.vpp.jvpp.core.dto.SrSteeringAddDelReply; +import io.fd.jvpp.core.dto.SrSteeringAddDel; +import io.fd.jvpp.core.dto.SrSteeringAddDelReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/PrefixesConfigCustomizerTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/PrefixesConfigCustomizerTest.java index 64e0032e9..10ab55b39 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/PrefixesConfigCustomizerTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/PrefixesConfigCustomizerTest.java @@ -28,8 +28,8 @@ import io.fd.hc2vpp.srv6.util.JvppRequestTest; import io.fd.hc2vpp.srv6.write.steering.request.L3SteeringRequest; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrSteeringAddDel; -import io.fd.vpp.jvpp.core.dto.SrSteeringAddDelReply; +import io.fd.jvpp.core.dto.SrSteeringAddDel; +import io.fd.jvpp.core.dto.SrSteeringAddDelReply; import java.util.List; import org.junit.Test; import org.mockito.ArgumentCaptor; |