HONEYCOMB-117: add support for jvpp plugins

Change-Id: I9f1dd5562b13a37392ce92b170a466c48d61bcc5
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

4 files changed, 17 insertions, 12 deletions

diff --git a/vpp-common/vpp-translate-utils/pom.xml b/vpp-common/vpp-translate-utils/pom.xml
index 613fc0bff..32466c2e1 100644
--- a/vpp-common/vpp-translate-utils/pom.xml
+++ b/vpp-common/vpp-translate-utils/pom.xml
@@ -53,7 +53,12 @@
         </dependency>
         <dependency>
             <groupId>io.fd.vpp</groupId>
-            <artifactId>jvpp</artifactId>
+            <artifactId>jvpp-registry</artifactId>
+            <version>16.09-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>io.fd.vpp</groupId>
+            <artifactId>jvpp-core</artifactId>
             <version>16.09-SNAPSHOT</version>
         </dependency>
         <dependency>
diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/AbstractInterfaceTypeCustomizer.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/AbstractInterfaceTypeCustomizer.java
index 7f3422fb8..cf6f29370 100644
--- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/AbstractInterfaceTypeCustomizer.java
+++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/AbstractInterfaceTypeCustomizer.java
@@ -28,7 +28,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.openvpp.jvpp.future.FutureJVpp;
+import org.openvpp.jvpp.core.future.FutureJVppCore;
 
 /**
  * Validation WriteCustomizers for Interface subnodes.
@@ -40,8 +40,8 @@ import org.openvpp.jvpp.future.FutureJVpp;
 public abstract class AbstractInterfaceTypeCustomizer<D extends DataObject>
     extends FutureJVppCustomizer implements WriterCustomizer<D> {
 
-    protected AbstractInterfaceTypeCustomizer(final FutureJVpp futureJvpp) {
-        super(futureJvpp);
+    protected AbstractInterfaceTypeCustomizer(final FutureJVppCore futureJVppCore) {
+        super(futureJVppCore);
     }
 
     private void checkProperInterfaceType(@Nonnull final WriteContext writeContext,
diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/FutureJVppCustomizer.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/FutureJVppCustomizer.java
index 45453259f..d0379e7d2 100644
--- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/FutureJVppCustomizer.java
+++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/FutureJVppCustomizer.java
@@ -18,7 +18,7 @@ package io.fd.honeycomb.translate.v3po.util;
 
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
-import org.openvpp.jvpp.future.FutureJVpp;
+import org.openvpp.jvpp.core.future.FutureJVppCore;
 
 import javax.annotation.Nonnull;
 
@@ -28,10 +28,10 @@ import javax.annotation.Nonnull;
 @Beta
 public abstract class FutureJVppCustomizer {
 
-    private final FutureJVpp futureJvpp;
+    private final FutureJVppCore futureJVppCore;
 
-    public FutureJVppCustomizer(@Nonnull final FutureJVpp futureJvpp) {
-        this.futureJvpp = Preconditions.checkNotNull(futureJvpp, "futureJvpp should not be null");
+    public FutureJVppCustomizer(@Nonnull final FutureJVppCore futureJVppCore) {
+        this.futureJVppCore = Preconditions.checkNotNull(futureJVppCore, "futureJVppCore should not be null");
     }
 
     /**
@@ -39,7 +39,7 @@ public abstract class FutureJVppCustomizer {
      *
      * @return vppApi reference
      */
-    public FutureJVpp getFutureJVpp() {
-        return futureJvpp;
+    public FutureJVppCore getFutureJVpp() {
+        return futureJVppCore;
     }
 }
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/cache/DumpCacheManagerTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/cache/DumpCacheManagerTest.java
index 9eaa024e3..21b3646c4 100644
--- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/cache/DumpCacheManagerTest.java
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/cache/DumpCacheManagerTest.java
@@ -27,8 +27,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.openvpp.jvpp.dto.IpDetails;
-import org.openvpp.jvpp.dto.IpDetailsReplyDump;
+import org.openvpp.jvpp.core.dto.IpDetails;
+import org.openvpp.jvpp.core.dto.IpDetailsReplyDump;
 
 public class DumpCacheManagerTest {