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 --- .../main/java/io/fd/hc2vpp/vppioam/impl/VppIoamModule.java | 12 ++++++------ .../vppioam/impl/config/IoamExportWriterCustomizer.java | 6 +++--- .../hc2vpp/vppioam/impl/config/IoamPotWriterCustomizer.java | 10 +++++----- .../vppioam/impl/config/IoamTraceWriterCustomizer.java | 10 +++++----- .../fd/hc2vpp/vppioam/impl/config/VppIoamWriterFactory.java | 6 +++--- .../hc2vpp/vppioam/impl/oper/PotProfileReaderCustomizer.java | 8 ++++---- .../vppioam/impl/oper/TraceProfileReaderCustomizer.java | 6 +++--- .../io/fd/hc2vpp/vppioam/impl/oper/VppIoamReaderFactory.java | 4 ++-- .../vppioam/impl/util/FutureJVppIoamexportCustomizer.java | 2 +- .../vppioam/impl/util/FutureJVppIoampotCustomizer.java | 2 +- .../vppioam/impl/util/FutureJVppIoamtraceCustomizer.java | 2 +- .../fd/hc2vpp/vppioam/impl/util/JVppIoamExportProvider.java | 6 +++--- .../io/fd/hc2vpp/vppioam/impl/util/JVppIoamPotProvider.java | 6 +++--- .../fd/hc2vpp/vppioam/impl/util/JVppIoamTraceProvider.java | 6 +++--- .../java/io/fd/hc2vpp/vppioam/impl/VppIoamModuleTest.java | 8 ++++---- .../vppioam/impl/config/IoamExportWriterCustomizerTest.java | 6 +++--- .../vppioam/impl/config/IoamPotWriterCustomizerTest.java | 10 +++++----- .../vppioam/impl/config/IoamTraceWriterCustomizerTest.java | 10 +++++----- .../vppioam/impl/oper/PotProfileReaderCustomizerTest.java | 8 ++++---- .../vppioam/impl/oper/TraceProfileReaderCustomizerTest.java | 6 +++--- 20 files changed, 67 insertions(+), 67 deletions(-) (limited to 'ioam/impl') diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/VppIoamModule.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/VppIoamModule.java index 1feaf9a68..6000d4f8f 100755 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/VppIoamModule.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/VppIoamModule.java @@ -28,12 +28,12 @@ import io.fd.hc2vpp.vppioam.impl.util.JVppIoamPotProvider; import io.fd.hc2vpp.vppioam.impl.util.JVppIoamTraceProvider; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexport; -import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexportFacade; -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampot; -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampotFacade; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade; +import io.fd.jvpp.ioamexport.future.FutureJVppIoamexport; +import io.fd.jvpp.ioamexport.future.FutureJVppIoamexportFacade; +import io.fd.jvpp.ioampot.future.FutureJVppIoampot; +import io.fd.jvpp.ioampot.future.FutureJVppIoampotFacade; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtrace; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamExportWriterCustomizer.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamExportWriterCustomizer.java index 1d90b0e85..095f16397 100644 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamExportWriterCustomizer.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamExportWriterCustomizer.java @@ -22,9 +22,9 @@ import io.fd.hc2vpp.vppioam.impl.util.FutureJVppIoamexportCustomizer; 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.ioamexport.dto.IoamExportIp6EnableDisable; -import io.fd.vpp.jvpp.ioamexport.dto.IoamExportIp6EnableDisableReply; -import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexport; +import io.fd.jvpp.ioamexport.dto.IoamExportIp6EnableDisable; +import io.fd.jvpp.ioamexport.dto.IoamExportIp6EnableDisableReply; +import io.fd.jvpp.ioamexport.future.FutureJVppIoamexport; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.export.rev170206.IoamExport; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamPotWriterCustomizer.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamPotWriterCustomizer.java index 19b1069ee..2ea4d4f46 100644 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamPotWriterCustomizer.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamPotWriterCustomizer.java @@ -22,11 +22,11 @@ import io.fd.hc2vpp.vppioam.impl.util.FutureJVppIoampotCustomizer; 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.ioampot.dto.PotProfileAdd; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileAddReply; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileDel; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileDelReply; -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampot; +import io.fd.jvpp.ioampot.dto.PotProfileAdd; +import io.fd.jvpp.ioampot.dto.PotProfileAddReply; +import io.fd.jvpp.ioampot.dto.PotProfileDel; +import io.fd.jvpp.ioampot.dto.PotProfileDelReply; +import io.fd.jvpp.ioampot.future.FutureJVppIoampot; import java.nio.charset.StandardCharsets; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.ioam.sb.pot.rev170112.pot.profile.PotProfileList; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizer.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizer.java index a04ef33ab..213bb4ff9 100755 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizer.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizer.java @@ -22,11 +22,11 @@ import io.fd.hc2vpp.vppioam.impl.util.FutureJVppIoamtraceCustomizer; 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.ioamtrace.dto.TraceProfileAdd; -import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileAddReply; -import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileDel; -import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileDelReply; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace; +import io.fd.jvpp.ioamtrace.dto.TraceProfileAdd; +import io.fd.jvpp.ioamtrace.dto.TraceProfileAddReply; +import io.fd.jvpp.ioamtrace.dto.TraceProfileDel; +import io.fd.jvpp.ioamtrace.dto.TraceProfileDelReply; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtrace; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev170327.ioam.trace.config.TraceConfig; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev170327.ioam.trace.config.TraceConfigKey; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/VppIoamWriterFactory.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/VppIoamWriterFactory.java index 610a44ae9..6b661e083 100755 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/VppIoamWriterFactory.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/VppIoamWriterFactory.java @@ -22,9 +22,9 @@ 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.ioamexport.future.FutureJVppIoamexport; -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampot; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace; +import io.fd.jvpp.ioamexport.future.FutureJVppIoamexport; +import io.fd.jvpp.ioampot.future.FutureJVppIoampot; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtrace; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.export.rev170206.IoamExport; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev170327.IoamTraceConfig; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/PotProfileReaderCustomizer.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/PotProfileReaderCustomizer.java index f9d229a9c..ad14f2279 100644 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/PotProfileReaderCustomizer.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/PotProfileReaderCustomizer.java @@ -22,10 +22,10 @@ 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.ioampot.dto.PotProfileShowConfigDetails; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileShowConfigDetailsReplyDump; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileShowConfigDump; -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampot; +import io.fd.jvpp.ioampot.dto.PotProfileShowConfigDetails; +import io.fd.jvpp.ioampot.dto.PotProfileShowConfigDetailsReplyDump; +import io.fd.jvpp.ioampot.dto.PotProfileShowConfigDump; +import io.fd.jvpp.ioampot.future.FutureJVppIoampot; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/TraceProfileReaderCustomizer.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/TraceProfileReaderCustomizer.java index 42a80c2dd..b389eeb17 100644 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/TraceProfileReaderCustomizer.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/TraceProfileReaderCustomizer.java @@ -23,9 +23,9 @@ 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.ioamtrace.dto.TraceProfileShowConfig; -import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileShowConfigReply; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace; +import io.fd.jvpp.ioamtrace.dto.TraceProfileShowConfig; +import io.fd.jvpp.ioamtrace.dto.TraceProfileShowConfigReply; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtrace; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev170327.IoamTraceConfigBuilder; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/VppIoamReaderFactory.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/VppIoamReaderFactory.java index 21f79c0e7..f9c87b669 100644 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/VppIoamReaderFactory.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/VppIoamReaderFactory.java @@ -19,8 +19,8 @@ package io.fd.hc2vpp.vppioam.impl.oper; 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.ioampot.future.FutureJVppIoampot; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace; +import io.fd.jvpp.ioampot.future.FutureJVppIoampot; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtrace; import java.util.Arrays; import java.util.List; import javax.annotation.Nonnull; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoamexportCustomizer.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoamexportCustomizer.java index adc2ffc10..f103078a7 100644 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoamexportCustomizer.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoamexportCustomizer.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.vppioam.impl.util; import com.google.common.base.Preconditions; -import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexport; +import io.fd.jvpp.ioamexport.future.FutureJVppIoamexport; import javax.annotation.Nonnull; public abstract class FutureJVppIoamexportCustomizer { diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoampotCustomizer.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoampotCustomizer.java index f59f91e18..7dc467d34 100755 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoampotCustomizer.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoampotCustomizer.java @@ -18,7 +18,7 @@ package io.fd.hc2vpp.vppioam.impl.util; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampot; +import io.fd.jvpp.ioampot.future.FutureJVppIoampot; import javax.annotation.Nonnull; /** diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoamtraceCustomizer.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoamtraceCustomizer.java index 8a5d2833c..fc3fd4308 100755 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoamtraceCustomizer.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoamtraceCustomizer.java @@ -18,7 +18,7 @@ package io.fd.hc2vpp.vppioam.impl.util; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtrace; import javax.annotation.Nonnull; /** diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamExportProvider.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamExportProvider.java index a90bafee2..2b8fe33b2 100644 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamExportProvider.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamExportProvider.java @@ -19,9 +19,9 @@ package io.fd.hc2vpp.vppioam.impl.util; import com.google.inject.Inject; 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.ioamexport.JVppIoamexportImpl; -import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexportFacade; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.ioamexport.JVppIoamexportImpl; +import io.fd.jvpp.ioamexport.future.FutureJVppIoamexportFacade; import java.io.IOException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamPotProvider.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamPotProvider.java index 03db9f01a..f5b3006fd 100644 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamPotProvider.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamPotProvider.java @@ -19,9 +19,9 @@ package io.fd.hc2vpp.vppioam.impl.util; import com.google.inject.Inject; 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.ioampot.JVppIoampotImpl; -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampotFacade; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.ioampot.JVppIoampotImpl; +import io.fd.jvpp.ioampot.future.FutureJVppIoampotFacade; import java.io.IOException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamTraceProvider.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamTraceProvider.java index f7e15fb68..6e065c6f8 100755 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamTraceProvider.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamTraceProvider.java @@ -19,9 +19,9 @@ package io.fd.hc2vpp.vppioam.impl.util; import com.google.inject.Inject; 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.ioamtrace.JVppIoamtraceImpl; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.ioamtrace.JVppIoamtraceImpl; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade; import java.io.IOException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/VppIoamModuleTest.java b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/VppIoamModuleTest.java index 469b9a254..4ff8d0dbd 100644 --- a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/VppIoamModuleTest.java +++ b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/VppIoamModuleTest.java @@ -35,10 +35,10 @@ 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.JVppRegistry; -import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexportFacade; -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampotFacade; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.ioamexport.future.FutureJVppIoamexportFacade; +import io.fd.jvpp.ioampot.future.FutureJVppIoampotFacade; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade; import java.util.HashSet; import java.util.Set; import org.junit.Before; diff --git a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamExportWriterCustomizerTest.java b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamExportWriterCustomizerTest.java index d54e46a88..6c5512da8 100644 --- a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamExportWriterCustomizerTest.java +++ b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamExportWriterCustomizerTest.java @@ -24,9 +24,9 @@ import static org.mockito.Mockito.verify; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.ioamexport.dto.IoamExportIp6EnableDisable; -import io.fd.vpp.jvpp.ioamexport.dto.IoamExportIp6EnableDisableReply; -import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexport; +import io.fd.jvpp.ioamexport.dto.IoamExportIp6EnableDisable; +import io.fd.jvpp.ioamexport.dto.IoamExportIp6EnableDisableReply; +import io.fd.jvpp.ioamexport.future.FutureJVppIoamexport; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.export.rev170206.IoamExport; diff --git a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamPotWriterCustomizerTest.java b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamPotWriterCustomizerTest.java index 261a6a39e..2ae26e1a9 100644 --- a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamPotWriterCustomizerTest.java +++ b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamPotWriterCustomizerTest.java @@ -23,11 +23,11 @@ import static org.mockito.Mockito.verify; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileAdd; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileAddReply; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileDel; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileDelReply; -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampot; +import io.fd.jvpp.ioampot.dto.PotProfileAdd; +import io.fd.jvpp.ioampot.dto.PotProfileAddReply; +import io.fd.jvpp.ioampot.dto.PotProfileDel; +import io.fd.jvpp.ioampot.dto.PotProfileDelReply; +import io.fd.jvpp.ioampot.future.FutureJVppIoampot; import java.math.BigInteger; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizerTest.java b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizerTest.java index 1f867b2d4..233ca1eb1 100644 --- a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizerTest.java +++ b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizerTest.java @@ -23,11 +23,11 @@ import static org.mockito.Mockito.verify; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileAdd; -import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileAddReply; -import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileDel; -import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileDelReply; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace; +import io.fd.jvpp.ioamtrace.dto.TraceProfileAdd; +import io.fd.jvpp.ioamtrace.dto.TraceProfileAddReply; +import io.fd.jvpp.ioamtrace.dto.TraceProfileDel; +import io.fd.jvpp.ioamtrace.dto.TraceProfileDelReply; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtrace; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev170327.IoamTraceConfig; diff --git a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/oper/PotProfileReaderCustomizerTest.java b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/oper/PotProfileReaderCustomizerTest.java index 80e71f610..ba4d56ca5 100644 --- a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/oper/PotProfileReaderCustomizerTest.java +++ b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/oper/PotProfileReaderCustomizerTest.java @@ -25,10 +25,10 @@ import com.google.common.collect.Lists; import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileShowConfigDetails; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileShowConfigDetailsReplyDump; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileShowConfigDump; -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampot; +import io.fd.jvpp.ioampot.dto.PotProfileShowConfigDetails; +import io.fd.jvpp.ioampot.dto.PotProfileShowConfigDetailsReplyDump; +import io.fd.jvpp.ioampot.dto.PotProfileShowConfigDump; +import io.fd.jvpp.ioampot.future.FutureJVppIoampot; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.ioam.sb.pot.rev170112.PotProfiles; diff --git a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/oper/TraceProfileReaderCustomizerTest.java b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/oper/TraceProfileReaderCustomizerTest.java index ec7c0637c..84646c7a1 100644 --- a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/oper/TraceProfileReaderCustomizerTest.java +++ b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/oper/TraceProfileReaderCustomizerTest.java @@ -24,9 +24,9 @@ import static org.mockito.Mockito.verify; import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileShowConfig; -import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileShowConfigReply; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace; +import io.fd.jvpp.ioamtrace.dto.TraceProfileShowConfig; +import io.fd.jvpp.ioamtrace.dto.TraceProfileShowConfigReply; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtrace; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev170327.IoamTraceConfig; -- cgit 1.2.3-korg