From 53f7c0c6184692a75cf2838a60ead925073587d5 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Thu, 28 Feb 2019 10:32:46 +0100 Subject: HC2VPP-404: Update package names for JVPP Fix package names for JVPP so it no longer contains vpp since it has been migrated outside of VPP project. Change-Id: I1e7a3fe4713beaaf7a1a0b41e7180d03bb7b74e5 Signed-off-by: Michal Cmarada --- .../io/fd/hc2vpp/ipsec/FutureJVppIkev2Customizer.java | 2 +- .../src/main/java/io/fd/hc2vpp/ipsec/IpsecModule.java | 2 +- .../java/io/fd/hc2vpp/ipsec/JVppIkev2Provider.java | 6 +++--- .../io/fd/hc2vpp/ipsec/read/IpsecReaderFactory.java | 2 +- .../io/fd/hc2vpp/ipsec/read/IpsecStateCustomizer.java | 12 ++++++------ .../fd/hc2vpp/ipsec/read/IpsecStateSpdCustomizer.java | 16 ++++++++-------- .../write/Ikev2GlobalConfigurationCustomizer.java | 4 ++-- .../fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizer.java | 8 ++++---- .../ipsec/write/Ikev2PolicyIdentityCustomizer.java | 4 ++-- .../fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizer.java | 18 +++++++++--------- .../io/fd/hc2vpp/ipsec/write/IpsecSpdCustomizer.java | 10 +++++----- .../io/fd/hc2vpp/ipsec/write/IpsecWriterFactory.java | 4 ++-- .../test/java/io/fd/hc2vpp/ipsec/IpsecModuleTest.java | 4 ++-- .../fd/hc2vpp/ipsec/read/IpsecStateCustomizerTest.java | 18 +++++++++--------- .../hc2vpp/ipsec/read/IpsecStateSpdCustomizerTest.java | 12 ++++++------ .../write/Ikev2GlobalConfigurationCustomizerTest.java | 6 +++--- .../hc2vpp/ipsec/write/Ikev2PolicyCustomizerTest.java | 14 +++++++------- .../ipsec/write/Ikev2PolicyIdentityCustomizerTest.java | 6 +++--- .../ipsec/write/IpsecSadEntryCustomizerTest.java | 18 +++++++++--------- .../fd/hc2vpp/ipsec/write/IpsecSpdCustomizerTest.java | 12 ++++++------ 20 files changed, 89 insertions(+), 89 deletions(-) (limited to 'ipsec/ipsec-impl') diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/FutureJVppIkev2Customizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/FutureJVppIkev2Customizer.java index c1453681f..c0ac2cd20 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/FutureJVppIkev2Customizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/FutureJVppIkev2Customizer.java @@ -18,7 +18,7 @@ package io.fd.hc2vpp.ipsec; import static com.google.common.base.Preconditions.checkNotNull; -import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; +import io.fd.jvpp.ikev2.future.FutureJVppIkev2Facade; import javax.annotation.Nonnull; /** diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/IpsecModule.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/IpsecModule.java index 8670eb749..dc96690d9 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/IpsecModule.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/IpsecModule.java @@ -26,7 +26,7 @@ import io.fd.hc2vpp.ipsec.read.IpsecReaderFactory; import io.fd.hc2vpp.ipsec.write.IpsecWriterFactory; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; +import io.fd.jvpp.ikev2.future.FutureJVppIkev2Facade; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/JVppIkev2Provider.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/JVppIkev2Provider.java index 5a9681a91..bf0209aa4 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/JVppIkev2Provider.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/JVppIkev2Provider.java @@ -20,9 +20,9 @@ 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.ikev2.JVppIkev2Impl; -import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.ikev2.JVppIkev2Impl; +import io.fd.jvpp.ikev2.future.FutureJVppIkev2Facade; import java.io.IOException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecReaderFactory.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecReaderFactory.java index e148022e8..1a71c3a8f 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecReaderFactory.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecReaderFactory.java @@ -22,7 +22,7 @@ import io.fd.honeycomb.translate.impl.read.GenericInitListReader; 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.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecStateSpdAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecStateSpdAugmentationBuilder; diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecStateCustomizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecStateCustomizer.java index 78a80120a..b63a7d24c 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecStateCustomizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecStateCustomizer.java @@ -27,12 +27,12 @@ import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.core.dto.IpsecSaDetails; -import io.fd.vpp.jvpp.core.dto.IpsecSaDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpsecSaDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.IpsecCryptoAlg; -import io.fd.vpp.jvpp.core.types.IpsecIntegAlg; +import io.fd.jvpp.core.dto.IpsecSaDetails; +import io.fd.jvpp.core.dto.IpsecSaDetailsReplyDump; +import io.fd.jvpp.core.dto.IpsecSaDump; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.IpsecCryptoAlg; +import io.fd.jvpp.core.types.IpsecIntegAlg; import java.util.LinkedList; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecStateSpdAugmentation; diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecStateSpdCustomizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecStateSpdCustomizer.java index a9a20cff0..42f495b5d 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecStateSpdCustomizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecStateSpdCustomizer.java @@ -27,14 +27,14 @@ 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.core.dto.IpsecSpdDetails; -import io.fd.vpp.jvpp.core.dto.IpsecSpdDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpsecSpdDump; -import io.fd.vpp.jvpp.core.dto.IpsecSpdsDetails; -import io.fd.vpp.jvpp.core.dto.IpsecSpdsDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpsecSpdsDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.AddressFamily; +import io.fd.jvpp.core.dto.IpsecSpdDetails; +import io.fd.jvpp.core.dto.IpsecSpdDetailsReplyDump; +import io.fd.jvpp.core.dto.IpsecSpdDump; +import io.fd.jvpp.core.dto.IpsecSpdsDetails; +import io.fd.jvpp.core.dto.IpsecSpdsDetailsReplyDump; +import io.fd.jvpp.core.dto.IpsecSpdsDump; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.AddressFamily; import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizer.java index dd7d34edb..3dc731248 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizer.java @@ -21,8 +21,8 @@ import io.fd.hc2vpp.ipsec.FutureJVppIkev2Customizer; 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.ikev2.dto.Ikev2SetLocalKey; -import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; +import io.fd.jvpp.ikev2.dto.Ikev2SetLocalKey; +import io.fd.jvpp.ikev2.future.FutureJVppIkev2Facade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecIkeGlobalConfAugmentation; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipsec.rev181214.ikev2.IkeGlobalConfiguration; diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizer.java index 47a09c8b1..9858f22cb 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizer.java @@ -24,10 +24,10 @@ import io.fd.hc2vpp.ipsec.dto.AuthMethod; 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.ikev2.dto.Ikev2ProfileAddDel; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileSetAuth; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileSetTs; -import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileAddDel; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileSetAuth; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileSetTs; +import io.fd.jvpp.ikev2.future.FutureJVppIkev2Facade; import java.nio.ByteBuffer; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecIkev2PolicyAugmentation; diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizer.java index 430aebc88..f85ee07f2 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizer.java @@ -24,8 +24,8 @@ import io.fd.hc2vpp.ipsec.FutureJVppIkev2Customizer; 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.ikev2.dto.Ikev2ProfileSetId; -import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileSetId; +import io.fd.jvpp.ikev2.future.FutureJVppIkev2Facade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipsec.rev181214.identity.grouping.identity.FqdnString; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipsec.rev181214.identity.grouping.identity.Ipv4Address; diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizer.java index d5b41cbe1..c1e21ed7a 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizer.java @@ -25,15 +25,15 @@ import io.fd.hc2vpp.common.translate.util.MultiNamingContext; 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.dto.IpsecSadEntryAddDel; -import io.fd.vpp.jvpp.core.dto.IpsecSadEntryAddDelReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.IpsecCryptoAlg; -import io.fd.vpp.jvpp.core.types.IpsecIntegAlg; -import io.fd.vpp.jvpp.core.types.IpsecProto; -import io.fd.vpp.jvpp.core.types.IpsecSadEntry; -import io.fd.vpp.jvpp.core.types.IpsecSadFlags; -import io.fd.vpp.jvpp.core.types.Key; +import io.fd.jvpp.core.dto.IpsecSadEntryAddDel; +import io.fd.jvpp.core.dto.IpsecSadEntryAddDelReply; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.IpsecCryptoAlg; +import io.fd.jvpp.core.types.IpsecIntegAlg; +import io.fd.jvpp.core.types.IpsecProto; +import io.fd.jvpp.core.types.IpsecSadEntry; +import io.fd.jvpp.core.types.IpsecSadFlags; +import io.fd.jvpp.core.types.Key; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecSadEntriesAugmentation; diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSpdCustomizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSpdCustomizer.java index 870eeb776..9c7909eee 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSpdCustomizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSpdCustomizer.java @@ -24,11 +24,11 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; 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.dto.IpsecSpdAddDel; -import io.fd.vpp.jvpp.core.dto.IpsecSpdEntryAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.IpsecSpdAction; -import io.fd.vpp.jvpp.core.types.IpsecSpdEntry; +import io.fd.jvpp.core.dto.IpsecSpdAddDel; +import io.fd.jvpp.core.dto.IpsecSpdEntryAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.IpsecSpdAction; +import io.fd.jvpp.core.types.IpsecSpdEntry; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecSpdEntriesAugmentation; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipsec.rev181214.ipsec.Spd; diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecWriterFactory.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecWriterFactory.java index 4dc7ff1b0..35efe0ab2 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecWriterFactory.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecWriterFactory.java @@ -23,8 +23,8 @@ 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.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.ikev2.future.FutureJVppIkev2Facade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecIkeGlobalConfAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecIkev2PolicyAugmentation; diff --git a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/IpsecModuleTest.java b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/IpsecModuleTest.java index 878edd9ac..41a8e539b 100644 --- a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/IpsecModuleTest.java +++ b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/IpsecModuleTest.java @@ -38,8 +38,8 @@ 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.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.ikev2.future.FutureJVppIkev2Facade; import java.util.HashSet; import java.util.Set; import org.junit.Before; diff --git a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/read/IpsecStateCustomizerTest.java b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/read/IpsecStateCustomizerTest.java index 53cbb4b3e..3d60eb6d0 100644 --- a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/read/IpsecStateCustomizerTest.java +++ b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/read/IpsecStateCustomizerTest.java @@ -16,9 +16,9 @@ package io.fd.hc2vpp.ipsec.read; -import static io.fd.vpp.jvpp.core.types.IpsecCryptoAlg.IPSEC_API_CRYPTO_ALG_AES_CBC_128; -import static io.fd.vpp.jvpp.core.types.IpsecIntegAlg.IPSEC_API_INTEG_ALG_SHA1_96; -import static io.fd.vpp.jvpp.core.types.IpsecProto.IPSEC_API_PROTO_ESP; +import static io.fd.jvpp.core.types.IpsecCryptoAlg.IPSEC_API_CRYPTO_ALG_AES_CBC_128; +import static io.fd.jvpp.core.types.IpsecIntegAlg.IPSEC_API_INTEG_ALG_SHA1_96; +import static io.fd.jvpp.core.types.IpsecProto.IPSEC_API_PROTO_ESP; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; @@ -29,12 +29,12 @@ import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.hc2vpp.common.translate.util.Ipv6Translator; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.IpsecSaDetails; -import io.fd.vpp.jvpp.core.dto.IpsecSaDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpsecSaDump; -import io.fd.vpp.jvpp.core.types.IpsecSadEntry; -import io.fd.vpp.jvpp.core.types.IpsecSadFlags; -import io.fd.vpp.jvpp.core.types.Key; +import io.fd.jvpp.core.dto.IpsecSaDetails; +import io.fd.jvpp.core.dto.IpsecSaDetailsReplyDump; +import io.fd.jvpp.core.dto.IpsecSaDump; +import io.fd.jvpp.core.types.IpsecSadEntry; +import io.fd.jvpp.core.types.IpsecSadFlags; +import io.fd.jvpp.core.types.Key; import java.util.LinkedList; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone; diff --git a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/read/IpsecStateSpdCustomizerTest.java b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/read/IpsecStateSpdCustomizerTest.java index 8c2ad09f9..87aece2f1 100644 --- a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/read/IpsecStateSpdCustomizerTest.java +++ b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/read/IpsecStateSpdCustomizerTest.java @@ -26,12 +26,12 @@ import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.hc2vpp.common.translate.util.Ipv6Translator; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.IpsecSpdDetails; -import io.fd.vpp.jvpp.core.dto.IpsecSpdDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpsecSpdsDetails; -import io.fd.vpp.jvpp.core.dto.IpsecSpdsDetailsReplyDump; -import io.fd.vpp.jvpp.core.types.IpsecSpdAction; -import io.fd.vpp.jvpp.core.types.IpsecSpdEntry; +import io.fd.jvpp.core.dto.IpsecSpdDetails; +import io.fd.jvpp.core.dto.IpsecSpdDetailsReplyDump; +import io.fd.jvpp.core.dto.IpsecSpdsDetails; +import io.fd.jvpp.core.dto.IpsecSpdsDetailsReplyDump; +import io.fd.jvpp.core.types.IpsecSpdAction; +import io.fd.jvpp.core.types.IpsecSpdEntry; import java.util.LinkedList; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecStateSpdAugmentation; diff --git a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizerTest.java b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizerTest.java index 84ae9c7d6..dc703634f 100644 --- a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizerTest.java +++ b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizerTest.java @@ -23,9 +23,9 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.ipsec.helpers.SchemaContextTestHelper; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2SetLocalKey; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2SetLocalKeyReply; -import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; +import io.fd.jvpp.ikev2.dto.Ikev2SetLocalKey; +import io.fd.jvpp.ikev2.dto.Ikev2SetLocalKeyReply; +import io.fd.jvpp.ikev2.future.FutureJVppIkev2Facade; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecIkeGlobalConfAugmentation; diff --git a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizerTest.java b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizerTest.java index b53ab7024..cbab036c6 100644 --- a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizerTest.java +++ b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizerTest.java @@ -30,13 +30,13 @@ import io.fd.hc2vpp.ipsec.helpers.SchemaContextTestHelper; import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileAddDel; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileAddDelReply; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileSetAuth; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileSetAuthReply; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileSetTs; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileSetTsReply; -import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileAddDel; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileAddDelReply; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileSetAuth; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileSetAuthReply; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileSetTs; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileSetTsReply; +import io.fd.jvpp.ikev2.future.FutureJVppIkev2Facade; import java.nio.ByteBuffer; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizerTest.java b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizerTest.java index 2a62b9494..312d3d7bf 100644 --- a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizerTest.java +++ b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizerTest.java @@ -28,9 +28,9 @@ import io.fd.hc2vpp.ipsec.helpers.SchemaContextTestHelper; import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileSetId; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileSetIdReply; -import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileSetId; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileSetIdReply; +import io.fd.jvpp.ikev2.future.FutureJVppIkev2Facade; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizerTest.java b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizerTest.java index 9f1ef23aa..42840a0cf 100644 --- a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizerTest.java +++ b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizerTest.java @@ -30,14 +30,14 @@ import io.fd.hc2vpp.ipsec.helpers.SchemaContextTestHelper; import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.IpsecSadEntryAddDel; -import io.fd.vpp.jvpp.core.dto.IpsecSadEntryAddDelReply; -import io.fd.vpp.jvpp.core.types.IpsecCryptoAlg; -import io.fd.vpp.jvpp.core.types.IpsecIntegAlg; -import io.fd.vpp.jvpp.core.types.IpsecProto; -import io.fd.vpp.jvpp.core.types.IpsecSadEntry; -import io.fd.vpp.jvpp.core.types.IpsecSadFlags; -import io.fd.vpp.jvpp.core.types.Key; +import io.fd.jvpp.core.dto.IpsecSadEntryAddDel; +import io.fd.jvpp.core.dto.IpsecSadEntryAddDelReply; +import io.fd.jvpp.core.types.IpsecCryptoAlg; +import io.fd.jvpp.core.types.IpsecIntegAlg; +import io.fd.jvpp.core.types.IpsecProto; +import io.fd.jvpp.core.types.IpsecSadEntry; +import io.fd.jvpp.core.types.IpsecSadFlags; +import io.fd.jvpp.core.types.Key; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -118,7 +118,7 @@ public class IpsecSadEntryCustomizerTest extends WriterCustomizerTest implements final SadEntries data = sad.getSadEntries().get(0); final IpsecSadEntryAddDel request = new IpsecSadEntryAddDel(); request.isAdd = BYTE_TRUE; - request.entry = new io.fd.vpp.jvpp.core.types.IpsecSadEntry(); + request.entry = new io.fd.jvpp.core.types.IpsecSadEntry(); request.entry.spi = SPI_1002; request.entry.sadId = SAD_ID; request.entry.integrityKey = new Key(); diff --git a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/IpsecSpdCustomizerTest.java b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/IpsecSpdCustomizerTest.java index da9b7425b..d531d6248 100644 --- a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/IpsecSpdCustomizerTest.java +++ b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/IpsecSpdCustomizerTest.java @@ -28,12 +28,12 @@ import io.fd.hc2vpp.ipsec.helpers.SchemaContextTestHelper; import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.IpsecSpdAddDel; -import io.fd.vpp.jvpp.core.dto.IpsecSpdAddDelReply; -import io.fd.vpp.jvpp.core.dto.IpsecSpdEntryAddDel; -import io.fd.vpp.jvpp.core.dto.IpsecSpdEntryAddDelReply; -import io.fd.vpp.jvpp.core.types.IpsecSpdAction; -import io.fd.vpp.jvpp.core.types.IpsecSpdEntry; +import io.fd.jvpp.core.dto.IpsecSpdAddDel; +import io.fd.jvpp.core.dto.IpsecSpdAddDelReply; +import io.fd.jvpp.core.dto.IpsecSpdEntryAddDel; +import io.fd.jvpp.core.dto.IpsecSpdEntryAddDelReply; +import io.fd.jvpp.core.types.IpsecSpdAction; +import io.fd.jvpp.core.types.IpsecSpdEntry; import java.util.Collections; import org.junit.Test; import org.junit.runner.RunWith; -- cgit 1.2.3-korg