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 --- .../src/main/java/io/fd/hc2vpp/acl/AclModule.java | 2 +- .../main/java/io/fd/hc2vpp/acl/JVppAclProvider.java | 12 ++++++------ .../io/fd/hc2vpp/acl/read/AbstractAclCustomizer.java | 12 ++++++------ .../main/java/io/fd/hc2vpp/acl/read/AclCustomizer.java | 14 +++++++------- .../io/fd/hc2vpp/acl/read/EgressAclCustomizer.java | 4 ++-- .../io/fd/hc2vpp/acl/read/IngressAclCustomizer.java | 18 +++++++++--------- .../io/fd/hc2vpp/acl/read/InterfaceAclCustomizer.java | 10 +++++----- .../fd/hc2vpp/acl/read/factory/AclReaderFactory.java | 2 +- .../acl/read/factory/InterfaceAclReaderFactory.java | 4 ++-- .../io/fd/hc2vpp/acl/util/FutureJVppAclCustomizer.java | 2 +- .../java/io/fd/hc2vpp/acl/util/ace/AceConverter.java | 4 ++-- .../acl/util/ace/extractor/MacIpAceDataExtractor.java | 2 +- .../util/ace/extractor/StandardAceDataExtractor.java | 2 +- .../fd/hc2vpp/acl/util/protocol/IpProtocolReader.java | 2 +- .../acl/util/protocol/ProtoPreBindRuleProducer.java | 2 +- .../java/io/fd/hc2vpp/acl/write/AclCustomizer.java | 2 +- .../io/fd/hc2vpp/acl/write/InterfaceAclCustomizer.java | 2 +- .../acl/write/factory/AbstractAclWriterFactory.java | 2 +- .../hc2vpp/acl/write/request/AclAddReplaceRequest.java | 14 +++++++------- .../write/request/AclInterfaceAssignmentRequest.java | 4 ++-- .../write/request/MacIpInterfaceAssignmentRequest.java | 4 ++-- 21 files changed, 60 insertions(+), 60 deletions(-) (limited to 'acl/acl-impl/src/main') diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/AclModule.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/AclModule.java index a21978e73..274f5f6ae 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/AclModule.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/AclModule.java @@ -30,7 +30,7 @@ import io.fd.hc2vpp.acl.write.factory.AclWriterFactory; import io.fd.hc2vpp.acl.write.factory.InterfaceAclWriterFactory; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import javax.annotation.Nonnull; import net.jmob.guice.conf.core.ConfigurationModule; import org.slf4j.Logger; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/JVppAclProvider.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/JVppAclProvider.java index 96e26a4e3..8977690e7 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/JVppAclProvider.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/JVppAclProvider.java @@ -20,12 +20,12 @@ import com.google.inject.Inject; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.data.init.ShutdownHandler; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.acl.JVppAclImpl; -import io.fd.vpp.jvpp.acl.dto.AclPluginGetVersion; -import io.fd.vpp.jvpp.acl.dto.AclPluginGetVersionReply; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.acl.JVppAclImpl; +import io.fd.jvpp.acl.dto.AclPluginGetVersion; +import io.fd.jvpp.acl.dto.AclPluginGetVersionReply; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import java.io.IOException; import java.util.concurrent.TimeoutException; import org.slf4j.Logger; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/AbstractAclCustomizer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/AbstractAclCustomizer.java index 5f6ca36b3..9cc7e7d76 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/AbstractAclCustomizer.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/AbstractAclCustomizer.java @@ -30,12 +30,12 @@ import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager.DumpCacheManagerBuilder; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; import io.fd.honeycomb.translate.util.read.cache.TypeAwareIdentifierCacheKeyFactory; -import io.fd.vpp.jvpp.acl.dto.AclDetailsReplyDump; -import io.fd.vpp.jvpp.acl.dto.AclDump; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetails; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetailsReplyDump; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDump; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.dto.AclDetailsReplyDump; +import io.fd.jvpp.acl.dto.AclDump; +import io.fd.jvpp.acl.dto.AclInterfaceListDetails; +import io.fd.jvpp.acl.dto.AclInterfaceListDetailsReplyDump; +import io.fd.jvpp.acl.dto.AclInterfaceListDump; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import java.util.Arrays; import java.util.stream.Stream; import javax.annotation.Nonnull; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/AclCustomizer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/AclCustomizer.java index e1f0ccf14..3d1516fd2 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/AclCustomizer.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/AclCustomizer.java @@ -30,13 +30,13 @@ import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.acl.dto.AclDetails; -import io.fd.vpp.jvpp.acl.dto.AclDetailsReplyDump; -import io.fd.vpp.jvpp.acl.dto.AclDump; -import io.fd.vpp.jvpp.acl.dto.MacipAclDetails; -import io.fd.vpp.jvpp.acl.dto.MacipAclDetailsReplyDump; -import io.fd.vpp.jvpp.acl.dto.MacipAclDump; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.dto.AclDetails; +import io.fd.jvpp.acl.dto.AclDetailsReplyDump; +import io.fd.jvpp.acl.dto.AclDump; +import io.fd.jvpp.acl.dto.MacipAclDetails; +import io.fd.jvpp.acl.dto.MacipAclDetailsReplyDump; +import io.fd.jvpp.acl.dto.MacipAclDump; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import java.util.ArrayList; import java.util.List; import javax.annotation.Nonnull; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/EgressAclCustomizer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/EgressAclCustomizer.java index 59990d5ea..14fdad2df 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/EgressAclCustomizer.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/EgressAclCustomizer.java @@ -27,8 +27,8 @@ 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.acl.dto.AclInterfaceListDetailsReplyDump; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.dto.AclInterfaceListDetailsReplyDump; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import java.util.List; import java.util.stream.Collectors; import javax.annotation.Nonnull; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/IngressAclCustomizer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/IngressAclCustomizer.java index 467c4e5db..02f2e18f2 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/IngressAclCustomizer.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/IngressAclCustomizer.java @@ -33,15 +33,15 @@ import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; import io.fd.honeycomb.translate.util.read.cache.TypeAwareIdentifierCacheKeyFactory; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetailsReplyDump; -import io.fd.vpp.jvpp.acl.dto.MacipAclDetailsReplyDump; -import io.fd.vpp.jvpp.acl.dto.MacipAclDump; -import io.fd.vpp.jvpp.acl.dto.MacipAclInterfaceGet; -import io.fd.vpp.jvpp.acl.dto.MacipAclInterfaceGetReply; -import io.fd.vpp.jvpp.acl.dto.MacipAclInterfaceListDetails; -import io.fd.vpp.jvpp.acl.dto.MacipAclInterfaceListDetailsReplyDump; -import io.fd.vpp.jvpp.acl.dto.MacipAclInterfaceListDump; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.dto.AclInterfaceListDetailsReplyDump; +import io.fd.jvpp.acl.dto.MacipAclDetailsReplyDump; +import io.fd.jvpp.acl.dto.MacipAclDump; +import io.fd.jvpp.acl.dto.MacipAclInterfaceGet; +import io.fd.jvpp.acl.dto.MacipAclInterfaceGetReply; +import io.fd.jvpp.acl.dto.MacipAclInterfaceListDetails; +import io.fd.jvpp.acl.dto.MacipAclInterfaceListDetailsReplyDump; +import io.fd.jvpp.acl.dto.MacipAclInterfaceListDump; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/InterfaceAclCustomizer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/InterfaceAclCustomizer.java index 64720de5d..2cd1bdd87 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/InterfaceAclCustomizer.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/InterfaceAclCustomizer.java @@ -27,11 +27,11 @@ 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.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetailsReplyDump; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDump; -import io.fd.vpp.jvpp.acl.dto.MacipAclInterfaceListDetailsReplyDump; -import io.fd.vpp.jvpp.acl.dto.MacipAclInterfaceListDump; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.dto.AclInterfaceListDetailsReplyDump; +import io.fd.jvpp.acl.dto.AclInterfaceListDump; +import io.fd.jvpp.acl.dto.MacipAclInterfaceListDetailsReplyDump; +import io.fd.jvpp.acl.dto.MacipAclInterfaceListDump; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/AclReaderFactory.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/AclReaderFactory.java index 6a743ca80..2a09f60c5 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/AclReaderFactory.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/AclReaderFactory.java @@ -28,7 +28,7 @@ import io.fd.hc2vpp.acl.util.AclContextManager; 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.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.AclsBuilder; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/InterfaceAclReaderFactory.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/InterfaceAclReaderFactory.java index 1c4f0d982..61b66730f 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/InterfaceAclReaderFactory.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/InterfaceAclReaderFactory.java @@ -20,15 +20,15 @@ import com.google.inject.Inject; import com.google.inject.name.Named; import io.fd.hc2vpp.acl.AclIIds; import io.fd.hc2vpp.acl.AclModule; -import io.fd.hc2vpp.acl.read.InterfaceAclCustomizer; import io.fd.hc2vpp.acl.read.EgressAclCustomizer; import io.fd.hc2vpp.acl.read.IngressAclCustomizer; +import io.fd.hc2vpp.acl.read.InterfaceAclCustomizer; import io.fd.hc2vpp.acl.util.AclContextManager; import io.fd.hc2vpp.common.translate.util.NamingContext; 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.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.acls.AttachmentPointsBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.acls.attachment.points._interface.EgressBuilder; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/FutureJVppAclCustomizer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/FutureJVppAclCustomizer.java index e2d6bee58..ab3850ed8 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/FutureJVppAclCustomizer.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/FutureJVppAclCustomizer.java @@ -18,7 +18,7 @@ package io.fd.hc2vpp.acl.util; import static com.google.common.base.Preconditions.checkNotNull; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import javax.annotation.Nonnull; /** diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/AceConverter.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/AceConverter.java index 8e774104a..543ec6a09 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/AceConverter.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/AceConverter.java @@ -22,8 +22,8 @@ import io.fd.hc2vpp.acl.util.ace.extractor.MacIpAceDataExtractor; import io.fd.hc2vpp.acl.util.ace.extractor.StandardAceDataExtractor; import io.fd.hc2vpp.acl.util.protocol.ProtoPreBindRuleProducer; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.acl.types.AclRule; -import io.fd.vpp.jvpp.acl.types.MacipAclRule; +import io.fd.jvpp.acl.types.AclRule; +import io.fd.jvpp.acl.types.MacipAclRule; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/MacIpAceDataExtractor.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/MacIpAceDataExtractor.java index 0c7d761a0..96a05c09d 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/MacIpAceDataExtractor.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/MacIpAceDataExtractor.java @@ -18,7 +18,7 @@ package io.fd.hc2vpp.acl.util.ace.extractor; import io.fd.hc2vpp.common.translate.util.MacTranslator; -import io.fd.vpp.jvpp.acl.types.MacipAclRule; +import io.fd.jvpp.acl.types.MacipAclRule; import java.util.Optional; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.Accept; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/StandardAceDataExtractor.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/StandardAceDataExtractor.java index 9f454fd38..ea601db12 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/StandardAceDataExtractor.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/StandardAceDataExtractor.java @@ -19,7 +19,7 @@ package io.fd.hc2vpp.acl.util.ace.extractor; import com.google.common.collect.ImmutableMap; import io.fd.hc2vpp.acl.util.protocol.IpProtocolReader; import io.fd.hc2vpp.acl.util.protocol.ProtoPreBindRuleProducer; -import io.fd.vpp.jvpp.acl.types.AclRule; +import io.fd.jvpp.acl.types.AclRule; import java.util.Map; import java.util.Optional; import javax.annotation.Nonnull; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/protocol/IpProtocolReader.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/protocol/IpProtocolReader.java index 3207ecd4b..e44794b3c 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/protocol/IpProtocolReader.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/protocol/IpProtocolReader.java @@ -22,7 +22,7 @@ import static io.fd.hc2vpp.acl.util.protocol.ProtoPreBindRuleProducer.TCP_INDEX; import static io.fd.hc2vpp.acl.util.protocol.ProtoPreBindRuleProducer.UDP_INDEX; import com.google.common.annotations.VisibleForTesting; -import io.fd.vpp.jvpp.acl.types.AclRule; +import io.fd.jvpp.acl.types.AclRule; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.acl.rev181022.VppIcmpAceAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.acl.rev181022.VppIcmpAceAugmentationBuilder; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.acl.rev181022.VppTcpAceAugmentation; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/protocol/ProtoPreBindRuleProducer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/protocol/ProtoPreBindRuleProducer.java index 3ca18d6e6..f7f578ff2 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/protocol/ProtoPreBindRuleProducer.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/protocol/ProtoPreBindRuleProducer.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.acl.util.protocol; import com.google.common.base.Preconditions; -import io.fd.vpp.jvpp.acl.types.AclRule; +import io.fd.jvpp.acl.types.AclRule; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.acl.rev181022.ValueRange; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/AclCustomizer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/AclCustomizer.java index 1161c09ef..0fa584a12 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/AclCustomizer.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/AclCustomizer.java @@ -23,7 +23,7 @@ import io.fd.hc2vpp.acl.write.request.AclAddReplaceRequest; 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.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.acls.Acl; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.acls.AclKey; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/InterfaceAclCustomizer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/InterfaceAclCustomizer.java index 622a84d93..040b5253c 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/InterfaceAclCustomizer.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/InterfaceAclCustomizer.java @@ -28,7 +28,7 @@ import io.fd.honeycomb.translate.MappingContext; 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.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/factory/AbstractAclWriterFactory.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/factory/AbstractAclWriterFactory.java index 8944e5977..dada20523 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/factory/AbstractAclWriterFactory.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/factory/AbstractAclWriterFactory.java @@ -21,7 +21,7 @@ import com.google.inject.name.Named; import io.fd.hc2vpp.acl.AclModule; import io.fd.hc2vpp.acl.util.AclContextManager; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; /** * Created by jsrnicek on 12.12.2016. diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/AclAddReplaceRequest.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/AclAddReplaceRequest.java index 29a7c7489..07ec09edc 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/AclAddReplaceRequest.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/AclAddReplaceRequest.java @@ -22,13 +22,13 @@ import io.fd.hc2vpp.acl.util.acl.AclDataExtractor; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.acl.dto.AclAddReplace; -import io.fd.vpp.jvpp.acl.dto.AclAddReplaceReply; -import io.fd.vpp.jvpp.acl.dto.AclDel; -import io.fd.vpp.jvpp.acl.dto.MacipAclAdd; -import io.fd.vpp.jvpp.acl.dto.MacipAclAddReply; -import io.fd.vpp.jvpp.acl.dto.MacipAclDel; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.dto.AclAddReplace; +import io.fd.jvpp.acl.dto.AclAddReplaceReply; +import io.fd.jvpp.acl.dto.AclDel; +import io.fd.jvpp.acl.dto.MacipAclAdd; +import io.fd.jvpp.acl.dto.MacipAclAddReply; +import io.fd.jvpp.acl.dto.MacipAclDel; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.acls.Acl; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/AclInterfaceAssignmentRequest.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/AclInterfaceAssignmentRequest.java index 2d7777e35..79fb4126f 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/AclInterfaceAssignmentRequest.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/AclInterfaceAssignmentRequest.java @@ -26,8 +26,8 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceSetAclList; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.dto.AclInterfaceSetAclList; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import java.util.Collections; import java.util.List; import java.util.stream.Stream; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/MacIpInterfaceAssignmentRequest.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/MacIpInterfaceAssignmentRequest.java index b7849991b..9007fd755 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/MacIpInterfaceAssignmentRequest.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/MacIpInterfaceAssignmentRequest.java @@ -25,8 +25,8 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.acl.dto.MacipAclInterfaceAddDel; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.dto.MacipAclInterfaceAddDel; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.acls.attachment.points.Interface; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -- cgit 1.2.3-korg