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 <mcmarada@cisco.com>

5 files changed, 21 insertions, 21 deletions

diff --git a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/ImposeAndForwardTest.java b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/ImposeAndForwardTest.java
index bcd888bef..13ec86056 100644
--- a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/ImposeAndForwardTest.java
+++ b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/ImposeAndForwardTest.java
@@ -26,10 +26,10 @@ import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
 import io.fd.hc2vpp.common.translate.util.MplsLabelTranslator;
 import io.fd.hc2vpp.common.translate.util.NamingContext;
 import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.IpAddDelRoute;
-import io.fd.vpp.jvpp.core.dto.IpAddDelRouteReply;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
-import io.fd.vpp.jvpp.core.types.FibMplsLabel;
+import io.fd.jvpp.core.dto.IpAddDelRoute;
+import io.fd.jvpp.core.dto.IpAddDelRouteReply;
+import io.fd.jvpp.core.future.FutureJVppCoreFacade;
+import io.fd.jvpp.core.types.FibMplsLabel;
 import java.util.Arrays;
 import java.util.Collections;
 import org.junit.Test;
diff --git a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/MplsInterfaceCustomizerTest.java b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/MplsInterfaceCustomizerTest.java
index 1a86102cc..d3850305a 100644
--- a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/MplsInterfaceCustomizerTest.java
+++ b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/MplsInterfaceCustomizerTest.java
@@ -24,11 +24,11 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
 import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
 import io.fd.hc2vpp.common.translate.util.NamingContext;
 import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.MplsTableAddDel;
-import io.fd.vpp.jvpp.core.dto.MplsTableAddDelReply;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceSetMplsEnable;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceSetMplsEnableReply;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
+import io.fd.jvpp.core.dto.MplsTableAddDel;
+import io.fd.jvpp.core.dto.MplsTableAddDelReply;
+import io.fd.jvpp.core.dto.SwInterfaceSetMplsEnable;
+import io.fd.jvpp.core.dto.SwInterfaceSetMplsEnableReply;
+import io.fd.jvpp.core.future.FutureJVppCoreFacade;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls.rev170702.Routing1;
diff --git a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndIpv4LookupTest.java b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndIpv4LookupTest.java
index 6aade405d..18f5e736f 100644
--- a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndIpv4LookupTest.java
+++ b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndIpv4LookupTest.java
@@ -24,10 +24,10 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
 import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
 import io.fd.hc2vpp.common.translate.util.NamingContext;
 import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.MplsRouteAddDel;
-import io.fd.vpp.jvpp.core.dto.MplsRouteAddDelReply;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
-import io.fd.vpp.jvpp.core.types.FibMplsLabel;
+import io.fd.jvpp.core.dto.MplsRouteAddDel;
+import io.fd.jvpp.core.dto.MplsRouteAddDelReply;
+import io.fd.jvpp.core.future.FutureJVppCoreFacade;
+import io.fd.jvpp.core.types.FibMplsLabel;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.mpls.rev171120.LookupType;
diff --git a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndMplsLookupTest.java b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndMplsLookupTest.java
index 096f035c1..d09e1a56c 100644
--- a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndMplsLookupTest.java
+++ b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndMplsLookupTest.java
@@ -24,10 +24,10 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
 import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
 import io.fd.hc2vpp.common.translate.util.NamingContext;
 import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.MplsRouteAddDel;
-import io.fd.vpp.jvpp.core.dto.MplsRouteAddDelReply;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
-import io.fd.vpp.jvpp.core.types.FibMplsLabel;
+import io.fd.jvpp.core.dto.MplsRouteAddDel;
+import io.fd.jvpp.core.dto.MplsRouteAddDelReply;
+import io.fd.jvpp.core.future.FutureJVppCoreFacade;
+import io.fd.jvpp.core.types.FibMplsLabel;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.mpls.rev171120.LookupType;
diff --git a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/SwapAndForwardTest.java b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/SwapAndForwardTest.java
index 0ed07097e..c3dc6e499 100644
--- a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/SwapAndForwardTest.java
+++ b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/SwapAndForwardTest.java
@@ -25,10 +25,10 @@ import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
 import io.fd.hc2vpp.common.translate.util.MplsLabelTranslator;
 import io.fd.hc2vpp.common.translate.util.NamingContext;
 import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.MplsRouteAddDel;
-import io.fd.vpp.jvpp.core.dto.MplsRouteAddDelReply;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
-import io.fd.vpp.jvpp.core.types.FibMplsLabel;
+import io.fd.jvpp.core.dto.MplsRouteAddDel;
+import io.fd.jvpp.core.dto.MplsRouteAddDelReply;
+import io.fd.jvpp.core.future.FutureJVppCoreFacade;
+import io.fd.jvpp.core.types.FibMplsLabel;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;