44 files changed, 65 insertions, 214 deletions

diff --git a/vpp-common/naming-context-api/pom.xml b/vpp-common/naming-context-api/pom.xml
index f197daaff..ec38c6425 100644
--- a/vpp-common/naming-context-api/pom.xml
+++ b/vpp-common/naming-context-api/pom.xml
@@ -18,11 +18,10 @@
     <groupId>io.fd.honeycomb.common</groupId>
     <artifactId>api-parent</artifactId>
     <version>1.16.12-SNAPSHOT</version>
-    <relativePath>../../common/api-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>io.fd.honeycomb.vpp</groupId>
+  <groupId>io.fd.hc2vpp.common</groupId>
   <artifactId>naming-context-api</artifactId>
   <name>${project.artifactId}</name>
   <version>1.16.12-SNAPSHOT</version>
diff --git a/vpp-common/naming-context-impl/pom.xml b/vpp-common/naming-context-impl/pom.xml
index 68a2bc74a..90e651b30 100644
--- a/vpp-common/naming-context-impl/pom.xml
+++ b/vpp-common/naming-context-impl/pom.xml
@@ -20,11 +20,10 @@
     <groupId>io.fd.honeycomb.common</groupId>
     <artifactId>impl-parent</artifactId>
     <version>1.16.12-SNAPSHOT</version>
-    <relativePath>../../common/impl-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>io.fd.honeycomb.vpp</groupId>
+  <groupId>io.fd.hc2vpp.common</groupId>
   <artifactId>naming-context-impl</artifactId>
   <name>${project.artifactId}</name>
   <version>1.16.12-SNAPSHOT</version>
diff --git a/vpp-common/naming-context-impl/src/main/java/io/fd/honeycomb/vpp/context/ContextsReaderFactory.java b/vpp-common/naming-context-impl/src/main/java/io/fd/hc2vpp/common/context/ContextsReaderFactory.java
index 0745475f7..83603695e 100644
--- a/vpp-common/naming-context-impl/src/main/java/io/fd/honeycomb/vpp/context/ContextsReaderFactory.java
+++ b/vpp-common/naming-context-impl/src/main/java/io/fd/hc2vpp/common/context/ContextsReaderFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fd.honeycomb.vpp.context;
+package io.fd.hc2vpp.common.context;
 
 import io.fd.honeycomb.translate.read.ReaderFactory;
 import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder;
diff --git a/vpp-common/pom.xml b/vpp-common/pom.xml
index e7180aea2..7c4e977db 100644
--- a/vpp-common/pom.xml
+++ b/vpp-common/pom.xml
@@ -19,10 +19,9 @@
     <groupId>io.fd.honeycomb.common</groupId>
     <artifactId>honeycomb-parent</artifactId>
     <version>1.16.12-SNAPSHOT</version>
-    <relativePath>../common/honeycomb-parent</relativePath>
   </parent>
 
-  <groupId>io.fd.honeycomb.vpp</groupId>
+  <groupId>io.fd.hc2vpp.common</groupId>
   <artifactId>vpp-common-aggregator</artifactId>
   <version>1.16.12-SNAPSHOT</version>
   <name>${project.artifactId}</name>
diff --git a/vpp-common/vpp-common-integration/pom.xml b/vpp-common/vpp-common-integration/pom.xml
index 2cb031ec8..bf34268ea 100644
--- a/vpp-common/vpp-common-integration/pom.xml
+++ b/vpp-common/vpp-common-integration/pom.xml
@@ -20,11 +20,10 @@
         <groupId>io.fd.honeycomb.common</groupId>
         <artifactId>impl-parent</artifactId>
         <version>1.16.12-SNAPSHOT</version>
-        <relativePath>../../common/impl-parent</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.fd.honeycomb.vpp</groupId>
+    <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>vpp-common-integration</artifactId>
     <version>1.16.12-SNAPSHOT</version>
 
@@ -84,7 +83,7 @@
             <version>${jvpp.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>io.fd.hc2vpp.common</groupId>
             <artifactId>vpp-translate-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/ContextsReaderFactoryProvider.java b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/ContextsReaderFactoryProvider.java
index d33b8b717..9b581ebd3 100644
--- a/vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/ContextsReaderFactoryProvider.java
+++ b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/ContextsReaderFactoryProvider.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.vpp.common.integration;
+package io.fd.hc2vpp.common.integration;
 
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
 import io.fd.honeycomb.infra.distro.ProviderTrait;
 import io.fd.honeycomb.infra.distro.data.context.ContextPipelineModule;
 import io.fd.honeycomb.translate.read.ReaderFactory;
-import io.fd.honeycomb.vpp.context.ContextsReaderFactory;
+import io.fd.hc2vpp.common.context.ContextsReaderFactory;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 
 /**
diff --git a/vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/JVppCoreProvider.java b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppCoreProvider.java
index bbd30fbfb..f180bc408 100644
--- a/vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/JVppCoreProvider.java
+++ b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppCoreProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.vpp.common.integration;
+package io.fd.hc2vpp.common.integration;
 
 import com.google.inject.Inject;
 import io.fd.honeycomb.infra.distro.ProviderTrait;
diff --git a/vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/JVppRegistryProvider.java b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppRegistryProvider.java
index fa1d47480..ccd31ef01 100644
--- a/vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/JVppRegistryProvider.java
+++ b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppRegistryProvider.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.vpp.common.integration;
+package io.fd.hc2vpp.common.integration;
 
 import com.google.inject.Inject;
 import io.fd.honeycomb.infra.distro.ProviderTrait;
-import io.fd.honeycomb.translate.vpp.util.VppStatusListener;
+import io.fd.hc2vpp.common.translate.util.VppStatusListener;
 import java.io.IOException;
 import io.fd.vpp.jvpp.JVppRegistry;
 import io.fd.vpp.jvpp.JVppRegistryImpl;
diff --git a/vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/VppCommonModule.java b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/VppCommonModule.java
index 9bdba1b14..c7a1cc9f5 100644
--- a/vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/VppCommonModule.java
+++ b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/VppCommonModule.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.vpp.common.integration;
+package io.fd.hc2vpp.common.integration;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Singleton;
 import com.google.inject.multibindings.Multibinder;
 import io.fd.honeycomb.translate.read.ReaderFactory;
-import io.fd.honeycomb.translate.vpp.util.VppStatusListener;
+import io.fd.hc2vpp.common.translate.util.VppStatusListener;
 import net.jmob.guice.conf.core.ConfigurationModule;
 import io.fd.vpp.jvpp.JVppRegistry;
 import io.fd.vpp.jvpp.core.future.FutureJVppCore;
diff --git a/vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/VppConfigAttributes.java b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/VppConfigAttributes.java
index af06e05db..7ac53e63b 100644
--- a/vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/VppConfigAttributes.java
+++ b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/VppConfigAttributes.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.vpp.common.integration;
+package io.fd.hc2vpp.common.integration;
 
 import net.jmob.guice.conf.core.BindConfig;
 import net.jmob.guice.conf.core.InjectConfig;
diff --git a/vpp-common/vpp-common-integration/src/test/java/io/fd/honeycomb/vpp/common/integration/VppCommonModuleTest.java b/vpp-common/vpp-common-integration/src/test/java/io/fd/hc2vpp/common/integration/VppCommonModuleTest.java
index 476e15919..b63601de5 100644
--- a/vpp-common/vpp-common-integration/src/test/java/io/fd/honeycomb/vpp/common/integration/VppCommonModuleTest.java
+++ b/vpp-common/vpp-common-integration/src/test/java/io/fd/hc2vpp/common/integration/VppCommonModuleTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.vpp.common.integration;
+package io.fd.hc2vpp.common.integration;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
diff --git a/vpp-common/vpp-impl-parent/pom.xml b/vpp-common/vpp-impl-parent/pom.xml
index 83be57ba8..7636a040c 100644
--- a/vpp-common/vpp-impl-parent/pom.xml
+++ b/vpp-common/vpp-impl-parent/pom.xml
@@ -20,11 +20,10 @@
     <groupId>io.fd.honeycomb.common</groupId>
     <artifactId>impl-parent</artifactId>
     <version>1.16.12-SNAPSHOT</version>
-    <relativePath>../../common/impl-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>io.fd.honeycomb.vpp</groupId>
+  <groupId>io.fd.hc2vpp.common</groupId>
   <artifactId>vpp-impl-parent</artifactId>
   <name>${project.artifactId}</name>
   <version>1.16.12-SNAPSHOT</version>
@@ -47,7 +46,7 @@
         <version>${jvpp.version}</version>
       </dependency>
       <dependency>
-        <groupId>io.fd.honeycomb.vpp</groupId>
+        <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>vpp-translate-utils</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/vpp-common/vpp-translate-test/pom.xml b/vpp-common/vpp-translate-test/pom.xml
index 4dff6183d..e3fb45bbb 100644
--- a/vpp-common/vpp-translate-test/pom.xml
+++ b/vpp-common/vpp-translate-test/pom.xml
@@ -18,14 +18,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>io.fd.honeycomb.vpp</groupId>
+        <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>vpp-impl-parent</artifactId>
         <version>1.16.12-SNAPSHOT</version>
         <relativePath>../../vpp-common/vpp-impl-parent</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.fd.honeycomb.vpp</groupId>
     <artifactId>vpp-translate-test</artifactId>
     <version>1.16.12-SNAPSHOT</version>
     <packaging>bundle</packaging>
@@ -36,7 +35,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.fd.honeycomb.vpp</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>naming-context-api</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/JvppDumpExecutorTest.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/JvppDumpExecutorTest.java
index 500c31387..1259e89c8 100644
--- a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/JvppDumpExecutorTest.java
+++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/JvppDumpExecutorTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.vpp.test.read;
+package io.fd.hc2vpp.common.test.read;
 
 import static org.mockito.Matchers.anyLong;
 import static org.mockito.Matchers.eq;
@@ -23,7 +23,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor;
-import io.fd.honeycomb.vpp.test.util.FutureProducer;
+import io.fd.hc2vpp.common.test.util.FutureProducer;
 import io.fd.vpp.jvpp.VppInvocationException;
 import io.fd.vpp.jvpp.core.future.FutureJVppCore;
 import java.util.concurrent.CompletableFuture;
diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/ListReaderCustomizerTest.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/ListReaderCustomizerTest.java
index 8917c02db..3c11b2d3c 100644
--- a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/ListReaderCustomizerTest.java
+++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/ListReaderCustomizerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.vpp.test.read;
+package io.fd.hc2vpp.common.test.read;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/ReaderCustomizerTest.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/ReaderCustomizerTest.java
index d4cb385c6..d403dce55 100644
--- a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/ReaderCustomizerTest.java
+++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/ReaderCustomizerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.vpp.test.read;
+package io.fd.hc2vpp.common.test.read;
 
 import static org.junit.Assert.assertNotNull;
 import static org.mockito.Mockito.mock;
@@ -26,8 +26,8 @@ import io.fd.honeycomb.translate.read.ReadContext;
 import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
 import io.fd.honeycomb.translate.read.ReadContext;
 import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.vpp.test.util.FutureProducer;
-import io.fd.honeycomb.vpp.test.util.NamingContextHelper;
+import io.fd.hc2vpp.common.test.util.FutureProducer;
+import io.fd.hc2vpp.common.test.util.NamingContextHelper;
 import java.lang.reflect.Method;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/util/FutureProducer.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/FutureProducer.java
index a75b3c0ab..2bedb9507 100644
--- a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/util/FutureProducer.java
+++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/FutureProducer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.vpp.test.util;
+package io.fd.hc2vpp.common.test.util;
 
 import java.util.concurrent.CompletableFuture;
 import javax.annotation.Nonnull;
diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/util/InterfaceDumpHelper.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/InterfaceDumpHelper.java
index c88ad3f44..81d29c8f4 100644
--- a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/util/InterfaceDumpHelper.java
+++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/InterfaceDumpHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.vpp.test.util;
+package io.fd.hc2vpp.common.test.util;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.when;
diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/util/NamingContextHelper.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/NamingContextHelper.java
index 9fc9cd457..719339cbf 100644
--- a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/util/NamingContextHelper.java
+++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/NamingContextHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.vpp.test.util;
+package io.fd.hc2vpp.common.test.util;
 
 import static org.mockito.Mockito.doReturn;
 
@@ -35,7 +35,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
 
 /**
- * Utility that helps stubbing {@link io.fd.honeycomb.translate.vpp.util.NamingContext} methods.
+ * Utility that helps stubbing {@link io.fd.hc2vpp.common.translate.util.NamingContext} methods.
  */
 // TODO(HONEYCOMB-226): the class needs to be refactored or even removed after extracting interface from NamingContext
 public interface NamingContextHelper {
diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/write/WriterCustomizerTest.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/write/WriterCustomizerTest.java
index 900418c4c..7067a0c39 100644
--- a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/write/WriterCustomizerTest.java
+++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/write/WriterCustomizerTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.vpp.test.write;
+package io.fd.hc2vpp.common.test.write;
 
 import io.fd.honeycomb.translate.MappingContext;
 import io.fd.honeycomb.translate.ModificationCache;
 import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
 import io.fd.honeycomb.translate.write.WriteContext;
-import io.fd.honeycomb.vpp.test.util.FutureProducer;
-import io.fd.honeycomb.vpp.test.util.NamingContextHelper;
+import io.fd.hc2vpp.common.test.util.FutureProducer;
+import io.fd.hc2vpp.common.test.util.NamingContextHelper;
 import org.junit.Before;
 import org.mockito.Mock;
 import org.mockito.Mockito;
diff --git a/vpp-common/vpp-translate-utils/pom.xml b/vpp-common/vpp-translate-utils/pom.xml
index 85994feb3..c217bdb26 100644
--- a/vpp-common/vpp-translate-utils/pom.xml
+++ b/vpp-common/vpp-translate-utils/pom.xml
@@ -17,7 +17,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>io.fd.honeycomb.vpp</groupId>
+        <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>vpp-impl-parent</artifactId>
         <version>1.16.12-SNAPSHOT</version>
         <relativePath>../../vpp-common/vpp-impl-parent</relativePath>
diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/AbstractInterfaceTypeCustomizer.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AbstractInterfaceTypeCustomizer.java
index faf9be5d8..2a9af4604 100644
--- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/AbstractInterfaceTypeCustomizer.java
+++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AbstractInterfaceTypeCustomizer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
@@ -23,12 +23,12 @@ import com.google.common.base.Optional;
 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.core.future.FutureJVppCore;
 import javax.annotation.Nonnull;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfaceType;
 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 io.fd.vpp.jvpp.core.future.FutureJVppCore;
 
 /**
  * Validation WriteCustomizers for Interface subnodes.
diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/AddressTranslator.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AddressTranslator.java
index bfcb41e3c..b9665df9a 100644
--- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/AddressTranslator.java
+++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AddressTranslator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/ByteDataTranslator.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/ByteDataTranslator.java
index b7df219aa..a96542623 100644
--- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/ByteDataTranslator.java
+++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/ByteDataTranslator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/FutureJVppCustomizer.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/FutureJVppCustomizer.java
index 2a43ab503..6d527c702 100644
--- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/FutureJVppCustomizer.java
+++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/FutureJVppCustomizer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
 
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/Ipv4AddressRange.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/Ipv4AddressRange.java
index 7528c5464..032b9051d 100644
--- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/Ipv4AddressRange.java
+++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/Ipv4AddressRange.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
 
 import java.util.Objects;
 import javax.annotation.Nonnull;
diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/Ipv4Translator.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/Ipv4Translator.java
index b5f93dfba..255639655 100644
--- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/Ipv4Translator.java
+++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/Ipv4Translator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/Ipv6Translator.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/Ipv6Translator.java
index 6197b38ef..0d645c3c0 100644
--- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/Ipv6Translator.java
+++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/Ipv6Translator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/JvppReplyConsumer.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/JvppReplyConsumer.java
index 9e85c5d8b..db656e721 100644
--- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/JvppReplyConsumer.java
+++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/JvppReplyConsumer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/MacTranslator.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/MacTranslator.java
index 14cc28909..b31dc30b2 100644
--- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/MacTranslator.java
+++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/MacTranslator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/NamingContext.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/NamingContext.java
index 467ac5161..393df0898 100644
--- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/NamingContext.java
+++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/NamingContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/ReadTimeoutException.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/ReadTimeoutException.java
index cacca39f5..e9c451791 100644
--- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/ReadTimeoutException.java
+++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/ReadTimeoutException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
 
 import com.google.common.annotations.Beta;
 import io.fd.honeycomb.translate.read.ReadFailedException;
diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/TagRewriteOperation.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/TagRewriteOperation.java
index 0bfd28587..32b2b16cd 100644
--- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/TagRewriteOperation.java
+++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/TagRewriteOperation.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
 
 import com.google.common.base.Preconditions;
 import com.google.common.primitives.UnsignedBytes;
diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/VppStatusListener.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/VppStatusListener.java
index 1ea196651..5377f5786 100644
--- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/VppStatusListener.java
+++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/VppStatusListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
 
 import io.fd.honeycomb.translate.util.read.KeepaliveReaderWrapper;
 import org.slf4j.Logger;
diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/WriteTimeoutException.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/WriteTimeoutException.java
index 7d5bac3d0..d762201ff 100644
--- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/WriteTimeoutException.java
+++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/WriteTimeoutException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
 
 import com.google.common.annotations.Beta;
 import io.fd.honeycomb.translate.write.WriteFailedException;
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/AddressTranslatorTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/AddressTranslatorTest.java
index 71a41dd5e..97fb2747c 100644
--- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/AddressTranslatorTest.java
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/AddressTranslatorTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/ByteDataTranslatorTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/ByteDataTranslatorTest.java
index 3462b4cf8..8494568ec 100644
--- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/ByteDataTranslatorTest.java
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/ByteDataTranslatorTest.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
 import org.junit.Test;
 
 public class ByteDataTranslatorTest implements ByteDataTranslator {
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/Ipv4AddressRangeTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/Ipv4AddressRangeTest.java
index aef81fce6..ebaa65f43 100644
--- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/Ipv4AddressRangeTest.java
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/Ipv4AddressRangeTest.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
 
 import static org.junit.Assert.assertEquals;
 
+import io.fd.hc2vpp.common.translate.util.Ipv4AddressRange;
 import java.util.Arrays;
 import java.util.Collection;
 import org.junit.Test;
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/Ipv4TranslatorTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/Ipv4TranslatorTest.java
index 39fc620b2..722e2c62c 100644
--- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/Ipv4TranslatorTest.java
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/Ipv4TranslatorTest.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
 
 import static org.junit.Assert.assertEquals;
 
+import io.fd.hc2vpp.common.translate.util.Ipv4Translator;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/Ipv6TranslatorTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/Ipv6TranslatorTest.java
index 6a5d13613..073754a98 100644
--- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/Ipv6TranslatorTest.java
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/Ipv6TranslatorTest.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
 
 import static org.junit.Assert.assertEquals;
 
+import io.fd.hc2vpp.common.translate.util.Ipv6Translator;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6AddressNoZone;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/JvppReplyConsumerTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/JvppReplyConsumerTest.java
index 9b1cecf38..daf68d2b6 100644
--- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/JvppReplyConsumerTest.java
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/JvppReplyConsumerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -24,6 +24,9 @@ import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.ReadTimeoutException;
+import io.fd.hc2vpp.common.translate.util.WriteTimeoutException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/MacTranslatorTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/MacTranslatorTest.java
index 2b5df66fd..f716b0f0a 100644
--- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/MacTranslatorTest.java
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/MacTranslatorTest.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
 
 import static org.junit.Assert.assertEquals;
 
+import io.fd.hc2vpp.common.translate.util.MacTranslator;
 import org.junit.Test;
 
 public class MacTranslatorTest implements MacTranslator {
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/VppStatusListenerTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/VppStatusListenerTest.java
index 93ee8ef06..39edd6091 100644
--- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/VppStatusListenerTest.java
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/VppStatusListenerTest.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.common.translate.util;
 
 import static org.junit.Assert.assertTrue;
 
+import io.fd.hc2vpp.common.translate.util.VppStatusListener;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.contrib.java.lang.system.ExpectedSystemExit;
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/cache/DumpCacheManagerTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/cache/DumpCacheManagerTest.java
deleted file mode 100644
index 81a47e8a2..000000000
--- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/cache/DumpCacheManagerTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.honeycomb.translate.vpp.util.cache;
-
-import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.when;
-
-import com.google.common.base.Optional;
-import io.fd.honeycomb.translate.ModificationCache;
-import io.fd.honeycomb.translate.read.ReadFailedException;
-import io.fd.honeycomb.translate.util.read.cache.CacheKeyFactory;
-import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
-import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor;
-import io.fd.honeycomb.translate.util.read.cache.EntityDumpPostProcessingFunction;
-import io.fd.honeycomb.translate.util.read.cache.IdentifierCacheKeyFactory;
-import io.fd.vpp.jvpp.core.dto.IpDetails;
-import io.fd.vpp.jvpp.core.dto.IpDetailsReplyDump;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class DumpCacheManagerTest {
-
-    private interface DataObj extends DataObject {}
-
-    @Mock
-    private EntityDumpExecutor<IpDetailsReplyDump, Void> executor;
-
-    private InstanceIdentifier<DataObj> identifier;
-
-    private DumpCacheManager<IpDetailsReplyDump, Void> managerPositive;
-    private DumpCacheManager<IpDetailsReplyDump, Void> managerPositiveWithPostProcessing;
-    private DumpCacheManager<IpDetailsReplyDump, Void> managerNegative;
-    private ModificationCache cache;
-    private CacheKeyFactory cacheKeyFactory;
-
-    @Before
-    public void init() {
-        MockitoAnnotations.initMocks(this);
-        managerPositive =
-                new DumpCacheManager.DumpCacheManagerBuilder<IpDetailsReplyDump, Void>()
-                        .withExecutor(executor)
-                        .build();
-
-        managerPositiveWithPostProcessing =
-                new DumpCacheManager.DumpCacheManagerBuilder<IpDetailsReplyDump, Void>()
-                        .withExecutor(executor)
-                        .withPostProcessingFunction(createPostProcessor())
-                        .build();
-
-        managerNegative =
-                new DumpCacheManager.DumpCacheManagerBuilder<IpDetailsReplyDump, Void>()
-                        .withExecutor(executor)
-                        .build();
-
-        cache = new ModificationCache();
-        identifier = InstanceIdentifier.create(DataObj.class);
-        //manager uses this implementation by default, so it can be used to test behaviour
-        cacheKeyFactory = new IdentifierCacheKeyFactory();
-
-    }
-
-    /**
-     * This test verify full dump-caching cycle
-     */
-    @Test
-    public void testCaching() throws ReadFailedException {
-        final IpDetailsReplyDump stage1Data = new IpDetailsReplyDump();
-        final String key = cacheKeyFactory.createKey(identifier);
-
-
-        // executor cant return null data
-        when(executor.executeDump(identifier, NO_PARAMS)).thenReturn(new IpDetailsReplyDump());
-
-        final Optional<IpDetailsReplyDump> stage1Optional = managerNegative.getDump(identifier, cache, NO_PARAMS);
-
-        // this is first call so instance should be from executor
-        // and it should be cached after calling executor
-        assertEquals(true, stage1Optional.isPresent());
-        assertEquals(stage1Data, stage1Optional.get());
-        assertEquals(true, cache.containsKey(key));
-        assertEquals(stage1Data, cache.get(key));
-
-        //rebind executor with other data
-        IpDetailsReplyDump stage2LoadedDump = new IpDetailsReplyDump();
-        when(executor.executeDump(identifier, NO_PARAMS)).thenReturn(stage2LoadedDump);
-
-        final Optional<IpDetailsReplyDump> stage2Optional = managerPositive.getDump(identifier, cache, NO_PARAMS);
-
-        assertEquals(true, stage2Optional.isPresent());
-        assertEquals(stage2LoadedDump, stage2Optional.get());
-
-        //rebind executor with other data
-        IpDetailsReplyDump stage3LoadedDump = new IpDetailsReplyDump();
-        when(executor.executeDump(identifier, NO_PARAMS)).thenReturn(stage3LoadedDump);
-
-        final Optional<IpDetailsReplyDump> stage3Optional = managerPositive.getDump(identifier, cache, NO_PARAMS);
-        assertEquals(true, stage3Optional.isPresent());
-        //check if it returns instance cached from previous stage
-        assertEquals(stage2LoadedDump, stage3Optional.get());
-    }
-
-    @Test
-    public void testPostprocessing() throws ReadFailedException {
-        IpDetailsReplyDump dump = new IpDetailsReplyDump();
-        IpDetails details = new IpDetails();
-        details.swIfIndex = 2;
-        dump.ipDetails.add(details);
-
-        when(executor.executeDump(identifier, null)).thenReturn(dump);
-
-        Optional<IpDetailsReplyDump> optionalDump =
-                managerPositiveWithPostProcessing.getDump(identifier, cache, NO_PARAMS);
-
-        assertEquals(true, optionalDump.isPresent());
-        assertEquals(1, optionalDump.get().ipDetails.size());
-        assertEquals(7, optionalDump.get().ipDetails.get(0).swIfIndex);
-    }
-
-    private EntityDumpPostProcessingFunction<IpDetailsReplyDump> createPostProcessor() {
-        return ipDetailsReplyDump -> {
-            IpDetailsReplyDump modified = new IpDetailsReplyDump();
-
-            for (IpDetails detail : ipDetailsReplyDump.ipDetails) {
-                IpDetails modifiedDetail = new IpDetails();
-                modifiedDetail.swIfIndex = detail.swIfIndex + 5;
-
-                modified.ipDetails.add(modifiedDetail);
-            }
-
-            return modified;
-        };
-    }
-}
\ No newline at end of file