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>

10 files changed, 36 insertions, 36 deletions

diff --git a/it/api-coverage/src/test/java/io/fd/hc2vpp/it/JVppCoverageTest.java b/it/api-coverage/src/test/java/io/fd/hc2vpp/it/JVppCoverageTest.java
index ebe1123a8..c8808d2a2 100644
--- a/it/api-coverage/src/test/java/io/fd/hc2vpp/it/JVppCoverageTest.java
+++ b/it/api-coverage/src/test/java/io/fd/hc2vpp/it/JVppCoverageTest.java
@@ -16,14 +16,14 @@
 
 package io.fd.hc2vpp.it;
 
-import io.fd.vpp.jvpp.acl.JVppAcl;
-import io.fd.vpp.jvpp.core.JVppCore;
-import io.fd.vpp.jvpp.gtpu.JVppGtpu;
-import io.fd.vpp.jvpp.ioamexport.JVppIoamexport;
-import io.fd.vpp.jvpp.ioampot.JVppIoampot;
-import io.fd.vpp.jvpp.ioamtrace.JVppIoamtrace;
-import io.fd.vpp.jvpp.nat.JVppNat;
-import io.fd.vpp.jvpp.pppoe.JVppPppoe;
+import io.fd.jvpp.acl.JVppAcl;
+import io.fd.jvpp.core.JVppCore;
+import io.fd.jvpp.gtpu.JVppGtpu;
+import io.fd.jvpp.ioamexport.JVppIoamexport;
+import io.fd.jvpp.ioampot.JVppIoampot;
+import io.fd.jvpp.ioamtrace.JVppIoamtrace;
+import io.fd.jvpp.nat.JVppNat;
+import io.fd.jvpp.pppoe.JVppPppoe;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.Scanner;
diff --git a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProvider.java b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProvider.java
index f3459916e..3a454f809 100644
--- a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProvider.java
+++ b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProvider.java
@@ -16,7 +16,7 @@
 
 package io.fd.hc2vpp.it.jvpp.benchmark.acl;
 
-import io.fd.vpp.jvpp.acl.dto.AclAddReplace;
+import io.fd.jvpp.acl.dto.AclAddReplace;
 
 /**
  * Provides ACLs for JVpp Benchmark.
diff --git a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProviderImpl.java b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProviderImpl.java
index ca0ddbb8f..35dcabfd8 100644
--- a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProviderImpl.java
+++ b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProviderImpl.java
@@ -16,8 +16,8 @@
 
 package io.fd.hc2vpp.it.jvpp.benchmark.acl;
 
-import io.fd.vpp.jvpp.acl.dto.AclAddReplace;
-import io.fd.vpp.jvpp.acl.types.AclRule;
+import io.fd.jvpp.acl.dto.AclAddReplace;
+import io.fd.jvpp.acl.types.AclRule;
 import javax.annotation.concurrent.NotThreadSafe;
 
 @NotThreadSafe
diff --git a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclUpdateBenchmark.java b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclUpdateBenchmark.java
index b1f598253..1735355c4 100644
--- a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclUpdateBenchmark.java
+++ b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclUpdateBenchmark.java
@@ -20,18 +20,18 @@ import static io.fd.hc2vpp.it.jvpp.benchmark.acl.AclUpdateBenchmark.InterfaceMod
 import static io.fd.hc2vpp.it.jvpp.benchmark.acl.AclUpdateBenchmark.InterfaceMode.L3;
 
 import io.fd.hc2vpp.it.jvpp.benchmark.util.JVppBenchmark;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.acl.JVppAclImpl;
-import io.fd.vpp.jvpp.acl.dto.AclInterfaceSetAclList;
-import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.dto.BridgeDomainAddDel;
-import io.fd.vpp.jvpp.core.dto.CreateLoopback;
-import io.fd.vpp.jvpp.core.dto.CreateLoopbackReply;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceAddDelAddress;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlags;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceSetL2Bridge;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.acl.JVppAclImpl;
+import io.fd.jvpp.acl.dto.AclInterfaceSetAclList;
+import io.fd.jvpp.acl.future.FutureJVppAclFacade;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.dto.BridgeDomainAddDel;
+import io.fd.jvpp.core.dto.CreateLoopback;
+import io.fd.jvpp.core.dto.CreateLoopbackReply;
+import io.fd.jvpp.core.dto.SwInterfaceAddDelAddress;
+import io.fd.jvpp.core.dto.SwInterfaceSetFlags;
+import io.fd.jvpp.core.dto.SwInterfaceSetL2Bridge;
+import io.fd.jvpp.core.future.FutureJVppCoreFacade;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 import org.openjdk.jmh.annotations.Benchmark;
diff --git a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableBenchmark.java b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableBenchmark.java
index c37fa0765..f9fcc829b 100644
--- a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableBenchmark.java
+++ b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableBenchmark.java
@@ -17,10 +17,10 @@
 package io.fd.hc2vpp.it.jvpp.benchmark.classify;
 
 import io.fd.hc2vpp.it.jvpp.benchmark.util.JVppBenchmark;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTableReply;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.dto.ClassifyAddDelTableReply;
+import io.fd.jvpp.core.future.FutureJVppCoreFacade;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 import org.openjdk.jmh.annotations.Benchmark;
diff --git a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProvider.java b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProvider.java
index e23ecc6a1..1066c26ab 100644
--- a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProvider.java
+++ b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProvider.java
@@ -16,7 +16,7 @@
 
 package io.fd.hc2vpp.it.jvpp.benchmark.classify;
 
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
+import io.fd.jvpp.core.dto.ClassifyAddDelTable;
 
 interface ClassifyTableProvider {
     ClassifyAddDelTable next();
diff --git a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProviderImpl.java b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProviderImpl.java
index 8a737d216..15099371a 100644
--- a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProviderImpl.java
+++ b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProviderImpl.java
@@ -16,7 +16,7 @@
 
 package io.fd.hc2vpp.it.jvpp.benchmark.classify;
 
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
+import io.fd.jvpp.core.dto.ClassifyAddDelTable;
 import java.util.Random;
 import javax.annotation.concurrent.NotThreadSafe;
 
diff --git a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/util/JVppBenchmark.java b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/util/JVppBenchmark.java
index 761ee98d0..a2f5ce171 100644
--- a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/util/JVppBenchmark.java
+++ b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/util/JVppBenchmark.java
@@ -17,9 +17,9 @@
 package io.fd.hc2vpp.it.jvpp.benchmark.util;
 
 import com.google.common.io.CharStreams;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.dto.JVppReply;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.dto.JVppReply;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
diff --git a/it/jvpp-benchmark/src/test/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProviderImplTest.java b/it/jvpp-benchmark/src/test/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProviderImplTest.java
index d54d178e1..505c053ba 100644
--- a/it/jvpp-benchmark/src/test/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProviderImplTest.java
+++ b/it/jvpp-benchmark/src/test/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProviderImplTest.java
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 
-import io.fd.vpp.jvpp.acl.dto.AclAddReplace;
+import io.fd.jvpp.acl.dto.AclAddReplace;
 import java.util.Arrays;
 import org.junit.Test;
 
diff --git a/it/jvpp-benchmark/src/test/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProviderImplTest.java b/it/jvpp-benchmark/src/test/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProviderImplTest.java
index 8f11077e0..042a635d1 100644
--- a/it/jvpp-benchmark/src/test/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProviderImplTest.java
+++ b/it/jvpp-benchmark/src/test/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProviderImplTest.java
@@ -16,10 +16,10 @@
 
 package io.fd.hc2vpp.it.jvpp.benchmark.classify;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 
-import io.fd.vpp.jvpp.acl.dto.AclAddReplace;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
+import io.fd.jvpp.core.dto.ClassifyAddDelTable;
 import org.junit.Test;
 
 public class ClassifyTableProviderImplTest {