Post split cleanup

author Maros Marsalek <mmarsale@cisco.com>

Thu, 10 Nov 2016 12:31:25 +0000 (13:31 +0100)

committer Marek Gradzki <mgradzki@cisco.com>

Sat, 19 Nov 2016 20:29:39 +0000 (21:29 +0100)
author Maros Marsalek <mmarsale@cisco.com>
Thu, 10 Nov 2016 12:31:25 +0000 (13:31 +0100)
committer Marek Gradzki <mgradzki@cisco.com>
Sat, 19 Nov 2016 20:29:39 +0000 (21:29 +0100)
diff --git a/.gitignore b/.gitignore

new file mode 100644 (file)

index 0000000..c55011a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,21 @@
+*~
+.classpath
+.project
+.settings
+target
+*.iml
+.idea
+bin
+xtend-gen
+yang-gen-config
+yang-gen-sal
+target
+.DS_Store
+META-INF
+maven-metadata-local.xml
+*.log
+.asciidoctor/
+**/asciidoc/*.png
+**/asciidoc/*.png.cache
+# usused builders generated by yangtools
+**/org/opendaylight/yang/gen/v1/urn
diff --git a/asciidoc/Readme.adoc b/asciidoc/Readme.adoc

new file mode 100644 (file)

index 0000000..b5f7846
--- /dev/null
+++ b/asciidoc/Readme.adoc
@@ -0,0 +1,3 @@
+= hc2vpp-aggregator
+
+Overview of hc2vpp-aggregator
+\ No newline at end of file
diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml

index ebdadea..456c054 100644 (file)
--- a/ioam/api/pom.xml
+++ b/ioam/api/pom.xml
@@ -19,11 +19,11 @@
      <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.vppioam</groupId>
+  <groupId>io.fd.hc2vpp.ioam</groupId>
    <artifactId>vppioam-api</artifactId>
    <name>${project.artifactId}</name>
    <version>1.16.12-SNAPSHOT</version>
diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml

index dd106d0..1ffdadc 100644 (file)
--- a/ioam/impl/pom.xml
+++ b/ioam/impl/pom.xml
@@ -14,15 +14,15 @@
   limitations under the License.
  -->
  <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.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.vppioam</groupId>
+  <groupId>io.fd.hc2vpp.ioam</groupId>
    <artifactId>vppioam-impl</artifactId>
    <name>${project.artifactId}</name>
    <version>1.16.12-SNAPSHOT</version>
@@ -94,12 +94,12 @@
          <version>${ioam.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>
      <dependency>
-      <groupId>io.fd.honeycomb.vpp</groupId>
+      <groupId>io.fd.hc2vpp.common</groupId>
        <artifactId>vpp-translate-test</artifactId>
        <version>${project.version}</version>
        <scope>test</scope>
diff --git a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/VppIoamModule.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/VppIoamModule.java

similarity index 87%

rename from ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/VppIoamModule.java

rename to ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/VppIoamModule.java

index 34975d7..bf5df63 100755 (executable)
--- a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/VppIoamModule.java
+++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/VppIoamModule.java
@@ -13,19 +13,16 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
-package io.fd.honeycomb.vppioam.impl;
+package io.fd.hc2vpp.vppioam.impl;
  
  import com.google.common.annotations.VisibleForTesting;
  import com.google.inject.AbstractModule;
  import com.google.inject.Singleton;
  import com.google.inject.multibindings.Multibinder;
-import com.google.inject.name.Names;
  import com.google.inject.Provider;
-import io.fd.honeycomb.data.init.DataTreeInitializer;
-import io.fd.honeycomb.translate.read.ReaderFactory;
+import io.fd.hc2vpp.vppioam.impl.config.VppIoamWriterFactory;
  import io.fd.honeycomb.translate.write.WriterFactory;
-import io.fd.honeycomb.vppioam.impl.config.VppIoamWriterFactory;
-import io.fd.honeycomb.vppioam.impl.util.JVppIoamProvider;
+import io.fd.hc2vpp.vppioam.impl.util.JVppIoamProvider;
  import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace;
  import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade;
  import org.slf4j.Logger;
diff --git a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/config/IoamTraceWriterCustomizer.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizer.java

similarity index 94%

rename from ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/config/IoamTraceWriterCustomizer.java

rename to ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizer.java

index 8a45e87..bab92fc 100755 (executable)
--- a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/config/IoamTraceWriterCustomizer.java
+++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizer.java
@@ -13,19 +13,17 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
-package io.fd.honeycomb.vppioam.impl.config;
+package io.fd.hc2vpp.vppioam.impl.config;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  import static com.google.common.base.Preconditions.checkState;
  
-import io.fd.honeycomb.translate.MappingContext;
+import io.fd.hc2vpp.vppioam.impl.util.FutureJVppIoamCustomizer;
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vppioam.impl.util.FutureJVppIoamCustomizer;
  
  import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileAdd;
  import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileAddReply;
@@ -33,7 +31,6 @@ 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 java.util.concurrent.CompletionStage;
  import javax.annotation.Nonnull;
  import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.IoamTraceConfig;
  import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.ioam.trace.config.TraceConfig;
diff --git a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/config/VppIoamWriterFactory.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/VppIoamWriterFactory.java

similarity index 91%

rename from ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/config/VppIoamWriterFactory.java

rename to ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/VppIoamWriterFactory.java

index 40311cd..a577395 100755 (executable)
--- a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/config/VppIoamWriterFactory.java
+++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/VppIoamWriterFactory.java
@@ -14,13 +14,10 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.vppioam.impl.config;
+package io.fd.hc2vpp.vppioam.impl.config;
  
-import com.google.common.collect.Sets;
  import com.google.inject.Inject;
-import com.google.inject.name.Named;
  import io.fd.honeycomb.translate.impl.write.GenericListWriter;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriterFactory;
  import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
  import javax.annotation.Nonnull;
diff --git a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/util/FutureJVppIoamCustomizer.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoamCustomizer.java

similarity index 96%

rename from ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/util/FutureJVppIoamCustomizer.java

rename to ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoamCustomizer.java

index b60581a..a93ea37 100755 (executable)
--- a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/util/FutureJVppIoamCustomizer.java
+++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoamCustomizer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.vppioam.impl.util;
+package io.fd.hc2vpp.vppioam.impl.util;
  
  import com.google.common.annotations.Beta;
  import com.google.common.base.Preconditions;
diff --git a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/util/JVppIoamProvider.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamProvider.java

similarity index 93%

rename from ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/util/JVppIoamProvider.java

rename to ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamProvider.java

index d952664..a34715c 100755 (executable)
--- a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/util/JVppIoamProvider.java
+++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamProvider.java
@@ -14,14 +14,12 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.vppioam.impl.util;
+package io.fd.hc2vpp.vppioam.impl.util;
  
  import com.google.inject.Inject;
-import com.google.inject.Provider;
  import io.fd.honeycomb.infra.distro.ProviderTrait;
  import java.io.IOException;
  import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace;
  import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade;
  import io.fd.vpp.jvpp.ioamtrace.JVppIoamtraceImpl;
  import org.slf4j.Logger;
diff --git a/ioam/impl/src/test/java/io/fd/honeycomb/vppioam/impl/VppIoamModuleTest.java b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/VppIoamModuleTest.java

similarity index 98%

rename from ioam/impl/src/test/java/io/fd/honeycomb/vppioam/impl/VppIoamModuleTest.java

rename to ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/VppIoamModuleTest.java

index d9176d3..b1af9d5 100644 (file)
--- a/ioam/impl/src/test/java/io/fd/honeycomb/vppioam/impl/VppIoamModuleTest.java
+++ b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/VppIoamModuleTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.vppioam.impl;
+package io.fd.hc2vpp.vppioam.impl;
  
  import static org.hamcrest.CoreMatchers.is;
  import static org.hamcrest.CoreMatchers.not;
diff --git a/ioam/impl/src/test/java/io/fd/honeycomb/vppioam/impl/config/IoamTraceWriterCustomizerTest.java b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizerTest.java

similarity index 95%

rename from ioam/impl/src/test/java/io/fd/honeycomb/vppioam/impl/config/IoamTraceWriterCustomizerTest.java

rename to ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizerTest.java

index 8c182dd..9f5290c 100644 (file)
--- a/ioam/impl/src/test/java/io/fd/honeycomb/vppioam/impl/config/IoamTraceWriterCustomizerTest.java
+++ b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizerTest.java
@@ -14,19 +14,16 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.vppioam.impl.config;
+package io.fd.hc2vpp.vppioam.impl.config;
  
  import static org.junit.Assert.assertTrue;
  import static org.junit.Assert.fail;
  import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.times;
  import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
  
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import org.junit.Test;
  import org.mockito.Mock;
  import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -36,8 +33,6 @@ 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.vpp.jvpp.VppBaseCallException;
-import io.fd.vpp.jvpp.VppCallbackException;
  
  import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.IoamTraceConfig;
  import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.ioam.trace.config.TraceConfig;
diff --git a/ioam/pom.xml b/ioam/pom.xml

index 2708114..3153dc2 100644 (file)
--- a/ioam/pom.xml
+++ b/ioam/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.ioam</groupId>
+  <groupId>io.fd.hc2vpp.ioam</groupId>
    <artifactId>vppioam-aggregator</artifactId>
    <version>1.16.12-SNAPSHOT</version>
    <name>${project.artifactId}</name>
diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml

index b16aaea..850d3c5 100755 (executable)
--- a/lisp/api/pom.xml
+++ b/lisp/api/pom.xml
@@ -19,11 +19,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.lisp</groupId>
+    <groupId>io.fd.hc2vpp.lisp</groupId>
      <artifactId>lisp-api</artifactId>
      <name>${project.artifactId}</name>
      <version>1.16.12-SNAPSHOT</version>
@@ -48,7 +47,7 @@
              <artifactId>yang-ext</artifactId>
          </dependency>
          <dependency>
-            <groupId>io.fd.honeycomb.vpp</groupId>
+            <groupId>io.fd.hc2vpp.common</groupId>
              <artifactId>naming-context-api</artifactId>
              <version>${naming.context.version}</version>
          </dependency>
diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml

index b612acc..841dcb9 100755 (executable)
--- a/lisp/lisp2vpp/pom.xml
+++ b/lisp/lisp2vpp/pom.xml
@@ -17,21 +17,21 @@
  <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
           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.lisp</groupId>
+    <groupId>io.fd.hc2vpp.lisp</groupId>
      <artifactId>lisp2vpp</artifactId>
      <name>${project.artifactId}</name>
      <version>1.16.12-SNAPSHOT</version>
      <packaging>bundle</packaging>
  
      <properties>
-        <project.vpp.groupId>io.fd.honeycomb.vpp</project.vpp.groupId>
+        <project.vpp.groupId>io.fd.hc2vpp.common</project.vpp.groupId>
          <project.honeycomb.groupId>io.fd.honeycomb</project.honeycomb.groupId>
      </properties>
  
@@ -102,7 +102,7 @@
              <scope>test</scope>
          </dependency>
          <dependency>
-            <groupId>io.fd.honeycomb.vpp</groupId>
+            <groupId>io.fd.hc2vpp.common</groupId>
              <artifactId>vpp-translate-test</artifactId>
              <version>${project.version}</version>
              <scope>test</scope>
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/LispModule.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/LispModule.java

similarity index 79%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/LispModule.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/LispModule.java

index db5557f..c9acf1d 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/LispModule.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/LispModule.java
@@ -14,26 +14,25 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp;
+package io.fd.hc2vpp.lisp;
  
-
-import static io.fd.honeycomb.lisp.cfgattrs.LispConfiguration.LOCAL_MAPPING_CONTEXT;
-import static io.fd.honeycomb.lisp.cfgattrs.LispConfiguration.LOCATOR_SET_CONTEXT;
-import static io.fd.honeycomb.lisp.cfgattrs.LispConfiguration.LOCATOR_SET_CONTEXT_PREFIX;
-import static io.fd.honeycomb.lisp.cfgattrs.LispConfiguration.REMOTE_MAPPING_CONTEXT;
+import static io.fd.hc2vpp.lisp.cfgattrs.LispConfiguration.LOCAL_MAPPING_CONTEXT;
+import static io.fd.hc2vpp.lisp.cfgattrs.LispConfiguration.LOCATOR_SET_CONTEXT;
+import static io.fd.hc2vpp.lisp.cfgattrs.LispConfiguration.LOCATOR_SET_CONTEXT_PREFIX;
+import static io.fd.hc2vpp.lisp.cfgattrs.LispConfiguration.REMOTE_MAPPING_CONTEXT;
  
  import com.google.inject.AbstractModule;
  import com.google.inject.Singleton;
  import com.google.inject.multibindings.Multibinder;
  import com.google.inject.name.Names;
-import io.fd.honeycomb.lisp.cfgattrs.LispConfiguration;
-import io.fd.honeycomb.lisp.context.util.AdjacenciesMappingContext;
-import io.fd.honeycomb.lisp.context.util.ContextsReaderFactoryProvider;
-import io.fd.honeycomb.lisp.context.util.EidMappingContext;
-import io.fd.honeycomb.lisp.translate.read.factory.LispStateReaderFactory;
-import io.fd.honeycomb.lisp.translate.write.factory.LispWriterFactory;
+import io.fd.hc2vpp.lisp.cfgattrs.LispConfiguration;
+import io.fd.hc2vpp.lisp.context.util.AdjacenciesMappingContext;
+import io.fd.hc2vpp.lisp.context.util.ContextsReaderFactoryProvider;
+import io.fd.hc2vpp.lisp.context.util.EidMappingContext;
+import io.fd.hc2vpp.lisp.translate.read.factory.LispStateReaderFactory;
+import io.fd.hc2vpp.lisp.translate.write.factory.LispWriterFactory;
  import io.fd.honeycomb.translate.read.ReaderFactory;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriterFactory;
  import net.jmob.guice.conf.core.ConfigurationModule;
  import org.slf4j.Logger;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/cfgattrs/LispConfiguration.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/cfgattrs/LispConfiguration.java

similarity index 97%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/cfgattrs/LispConfiguration.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/cfgattrs/LispConfiguration.java

index 177f650..0092bcf 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/cfgattrs/LispConfiguration.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/cfgattrs/LispConfiguration.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.cfgattrs;
+package io.fd.hc2vpp.lisp.cfgattrs;
  
  import net.jmob.guice.conf.core.BindConfig;
  import net.jmob.guice.conf.core.Syntax;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/context/util/AdjacenciesMappingContext.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/context/util/AdjacenciesMappingContext.java

similarity index 99%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/context/util/AdjacenciesMappingContext.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/context/util/AdjacenciesMappingContext.java

index 557dc27..a595928 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/context/util/AdjacenciesMappingContext.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/context/util/AdjacenciesMappingContext.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.context.util;
+package io.fd.hc2vpp.lisp.context.util;
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static com.google.common.base.Preconditions.checkState;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/context/util/ContextsReaderFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/context/util/ContextsReaderFactory.java

similarity index 97%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/context/util/ContextsReaderFactory.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/context/util/ContextsReaderFactory.java

index 29a5e3f..2a329cf 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/context/util/ContextsReaderFactory.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/context/util/ContextsReaderFactory.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.context.util;
+package io.fd.hc2vpp.lisp.context.util;
  
  import io.fd.honeycomb.translate.read.ReaderFactory;
  import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/context/util/ContextsReaderFactoryProvider.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/context/util/ContextsReaderFactoryProvider.java

similarity index 96%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/context/util/ContextsReaderFactoryProvider.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/context/util/ContextsReaderFactoryProvider.java

index d023b3e..e6794ed 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/context/util/ContextsReaderFactoryProvider.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/context/util/ContextsReaderFactoryProvider.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.context.util;
+package io.fd.hc2vpp.lisp.context.util;
  
  import com.google.inject.Inject;
  import com.google.inject.Provider;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/context/util/EidMappingContext.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/context/util/EidMappingContext.java

similarity index 99%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/context/util/EidMappingContext.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/context/util/EidMappingContext.java

index 8f5dab7..8501a42 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/context/util/EidMappingContext.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/context/util/EidMappingContext.java
@@ -14,13 +14,13 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.context.util;
+package io.fd.hc2vpp.lisp.context.util;
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static com.google.common.base.Preconditions.checkState;
  
  import com.google.common.base.Optional;
-import io.fd.honeycomb.lisp.translate.util.EidTranslator;
+import io.fd.hc2vpp.lisp.translate.util.EidTranslator;
  import io.fd.honeycomb.translate.MappingContext;
  import io.fd.honeycomb.translate.util.RWUtils;
  import java.util.stream.Collector;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/AdjacencyCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizer.java

similarity index 95%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/AdjacencyCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizer.java

index d7003c8..710bb8d 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/AdjacencyCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizer.java
@@ -14,16 +14,16 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
  import com.google.common.base.Optional;
-import io.fd.honeycomb.lisp.context.util.AdjacenciesMappingContext;
-import io.fd.honeycomb.lisp.context.util.EidMappingContext;
-import io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams;
-import io.fd.honeycomb.lisp.translate.util.EidTranslator;
+import io.fd.hc2vpp.lisp.context.util.AdjacenciesMappingContext;
+import io.fd.hc2vpp.lisp.context.util.EidMappingContext;
+import io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams;
+import io.fd.hc2vpp.lisp.translate.util.EidTranslator;
  import io.fd.honeycomb.translate.MappingContext;
  import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
@@ -31,8 +31,8 @@ import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
  import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
  import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.vpp.jvpp.core.dto.LispAdjacenciesGet;
  import io.fd.vpp.jvpp.core.dto.LispAdjacenciesGetReply;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/BridgeDomainSubtableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizer.java

similarity index 94%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/BridgeDomainSubtableCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizer.java

index 1d0d8a0..1e6ce3a 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/BridgeDomainSubtableCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizer.java
@@ -14,20 +14,20 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
  import com.google.common.base.Optional;
-import io.fd.honeycomb.lisp.translate.read.dump.executor.params.SubtableDumpParams;
-import io.fd.honeycomb.lisp.translate.read.trait.SubtableReader;
+import io.fd.hc2vpp.lisp.translate.read.dump.executor.params.SubtableDumpParams;
+import io.fd.hc2vpp.lisp.translate.read.trait.SubtableReader;
  import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
  import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
  import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager.DumpCacheManagerBuilder;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.core.dto.LispEidTableMapDetails;
  import io.fd.vpp.jvpp.core.dto.LispEidTableMapDetailsReplyDump;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/InterfaceCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/InterfaceCustomizer.java

similarity index 94%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/InterfaceCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/InterfaceCustomizer.java

index 7291afb..c4bf0b8 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/InterfaceCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/InterfaceCustomizer.java
@@ -14,23 +14,23 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
  
  import static com.google.common.base.Preconditions.checkNotNull;
  import static com.google.common.base.Preconditions.checkState;
  
  import com.google.common.base.Optional;
-import io.fd.honeycomb.lisp.translate.read.dump.executor.params.LocatorDumpParams;
-import io.fd.honeycomb.lisp.translate.read.dump.executor.params.LocatorDumpParams.LocatorDumpParamsBuilder;
-import io.fd.honeycomb.lisp.translate.read.trait.LocatorReader;
+import io.fd.hc2vpp.lisp.translate.read.dump.executor.params.LocatorDumpParams;
+import io.fd.hc2vpp.lisp.translate.read.dump.executor.params.LocatorDumpParams.LocatorDumpParamsBuilder;
+import io.fd.hc2vpp.lisp.translate.read.trait.LocatorReader;
  import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
  import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.core.dto.LispLocatorDetails;
  import io.fd.vpp.jvpp.core.dto.LispLocatorDetailsReplyDump;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/ItrRemoteLocatorSetCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizer.java

similarity index 94%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/ItrRemoteLocatorSetCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizer.java

index 8e8fd58..eb078fe 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/ItrRemoteLocatorSetCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
  
  import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS;
@@ -25,9 +25,9 @@ import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
  import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
  import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager.DumpCacheManagerBuilder;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.vpp.jvpp.core.dto.LispGetMapRequestItrRlocs;
  import io.fd.vpp.jvpp.core.dto.LispGetMapRequestItrRlocsReply;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/LispStateCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizer.java

similarity index 94%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/LispStateCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizer.java

index 77374f9..7f0d4c8 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/LispStateCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizer.java
@@ -14,16 +14,16 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
  
  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.InitializingReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.vpp.jvpp.VppBaseCallException;
  import io.fd.vpp.jvpp.core.dto.ShowLispStatus;
  import io.fd.vpp.jvpp.core.dto.ShowLispStatusReply;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/LocalMappingCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizer.java

similarity index 91%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/LocalMappingCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizer.java

index e989a39..06d56c1 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/LocalMappingCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizer.java
@@ -14,27 +14,27 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  import static com.google.common.base.Preconditions.checkState;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.valueOf;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.FilterType;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.MappingsDumpParamsBuilder;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.QuantityType;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.valueOf;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.FilterType;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.MappingsDumpParamsBuilder;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.QuantityType;
  
  import com.google.common.base.Optional;
-import io.fd.honeycomb.lisp.context.util.EidMappingContext;
-import io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams;
-import io.fd.honeycomb.lisp.translate.read.trait.MappingReader;
-import io.fd.honeycomb.lisp.translate.util.EidTranslator;
+import io.fd.hc2vpp.lisp.context.util.EidMappingContext;
+import io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams;
+import io.fd.hc2vpp.lisp.translate.read.trait.MappingReader;
+import io.fd.hc2vpp.lisp.translate.util.EidTranslator;
  import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
  import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.core.dto.LispEidTableDetails;
  import io.fd.vpp.jvpp.core.dto.LispEidTableDetailsReplyDump;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/LocatorSetCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizer.java

similarity index 95%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/LocatorSetCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizer.java

index ff0855a..9b2ec5a 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/LocatorSetCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizer.java
@@ -14,20 +14,20 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS;
  
  import com.google.common.base.Optional;
-import io.fd.honeycomb.lisp.translate.read.trait.LocatorSetReader;
+import io.fd.hc2vpp.lisp.translate.read.trait.LocatorSetReader;
  import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer;
  import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.core.dto.LispLocatorSetDetails;
  import io.fd.vpp.jvpp.core.dto.LispLocatorSetDetailsReplyDump;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/MapResolverCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizer.java

similarity index 96%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/MapResolverCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizer.java

index fb44e13..cc73d77 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/MapResolverCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
  import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS;
  
@@ -24,9 +24,9 @@ import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
  import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
-import io.fd.honeycomb.translate.vpp.util.AddressTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.AddressTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.vpp.jvpp.core.dto.LispMapResolverDetails;
  import io.fd.vpp.jvpp.core.dto.LispMapResolverDetailsReplyDump;
  import io.fd.vpp.jvpp.core.dto.LispMapResolverDump;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/PitrCfgCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/PitrCfgCustomizer.java

similarity index 93%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/PitrCfgCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/PitrCfgCustomizer.java

index 7b049c0..8f8a147 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/PitrCfgCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/PitrCfgCustomizer.java
@@ -14,15 +14,15 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
  
  import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import java.util.concurrent.TimeoutException;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.lisp.feature.data.grouping.LispFeatureDataBuilder;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.pitr.cfg.grouping.PitrCfg;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/RemoteMappingCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/RemoteMappingCustomizer.java

similarity index 92%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/RemoteMappingCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/RemoteMappingCustomizer.java

index b0e9056..2a36a25 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/RemoteMappingCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/RemoteMappingCustomizer.java
@@ -14,25 +14,25 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  import static com.google.common.base.Preconditions.checkState;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.valueOf;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.FilterType;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.MappingsDumpParamsBuilder;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.valueOf;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.FilterType;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.MappingsDumpParamsBuilder;
  import static org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.MapReplyAction.NoAction;
  
  import com.google.common.base.Optional;
  import com.google.common.collect.ImmutableSet;
-import io.fd.honeycomb.lisp.context.util.EidMappingContext;
-import io.fd.honeycomb.lisp.translate.read.dump.executor.params.LocatorDumpParams;
-import io.fd.honeycomb.lisp.translate.read.dump.executor.params.LocatorDumpParams.LocatorDumpParamsBuilder;
-import io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams;
-import io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.QuantityType;
-import io.fd.honeycomb.lisp.translate.read.trait.LocatorReader;
-import io.fd.honeycomb.lisp.translate.read.trait.MappingReader;
-import io.fd.honeycomb.lisp.translate.util.EidTranslator;
+import io.fd.hc2vpp.lisp.context.util.EidMappingContext;
+import io.fd.hc2vpp.lisp.translate.read.dump.executor.params.LocatorDumpParams;
+import io.fd.hc2vpp.lisp.translate.read.dump.executor.params.LocatorDumpParams.LocatorDumpParamsBuilder;
+import io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams;
+import io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.QuantityType;
+import io.fd.hc2vpp.lisp.translate.read.trait.LocatorReader;
+import io.fd.hc2vpp.lisp.translate.read.trait.MappingReader;
+import io.fd.hc2vpp.lisp.translate.util.EidTranslator;
  import io.fd.honeycomb.translate.MappingContext;
  import io.fd.honeycomb.translate.ModificationCache;
  import io.fd.honeycomb.translate.read.ReadContext;
@@ -41,10 +41,10 @@ import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
  import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
  import io.fd.honeycomb.translate.util.read.cache.IdentifierCacheKeyFactory;
-import io.fd.honeycomb.translate.vpp.util.AddressTranslator;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.AddressTranslator;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.core.dto.LispEidTableDetails;
  import io.fd.vpp.jvpp.core.dto.LispEidTableDetailsReplyDump;
  import io.fd.vpp.jvpp.core.dto.LispLocatorDetails;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/VniTableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizer.java

similarity index 97%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/VniTableCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizer.java

index 49047bc..c0680a7 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/VniTableCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
  import static com.google.common.base.Preconditions.checkState;
  import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS;
@@ -25,8 +25,8 @@ import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
  import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.vpp.jvpp.core.dto.LispEidTableVniDetails;
  import io.fd.vpp.jvpp.core.dto.LispEidTableVniDetailsReplyDump;
  import io.fd.vpp.jvpp.core.dto.LispEidTableVniDump;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/VrfSubtableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizer.java

similarity index 94%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/VrfSubtableCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizer.java

index af48a65..0a73dc3 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/VrfSubtableCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizer.java
@@ -14,19 +14,19 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
  import com.google.common.base.Optional;
-import io.fd.honeycomb.lisp.translate.read.dump.executor.params.SubtableDumpParams;
-import io.fd.honeycomb.lisp.translate.read.trait.SubtableReader;
+import io.fd.hc2vpp.lisp.translate.read.dump.executor.params.SubtableDumpParams;
+import io.fd.hc2vpp.lisp.translate.read.trait.SubtableReader;
  import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
  import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
  import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager.DumpCacheManagerBuilder;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
  import io.fd.vpp.jvpp.core.dto.LispEidTableMapDetails;
  import io.fd.vpp.jvpp.core.dto.LispEidTableMapDetailsReplyDump;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/dump/executor/params/LocatorDumpParams.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/dump/executor/params/LocatorDumpParams.java

similarity index 95%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/dump/executor/params/LocatorDumpParams.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/dump/executor/params/LocatorDumpParams.java

index 7528d1d..08be4f6 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/dump/executor/params/LocatorDumpParams.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/dump/executor/params/LocatorDumpParams.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read.dump.executor.params;
+package io.fd.hc2vpp.lisp.translate.read.dump.executor.params;
  
  /**
   * Params for dumping locators
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/dump/executor/params/MappingsDumpParams.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/dump/executor/params/MappingsDumpParams.java

similarity index 98%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/dump/executor/params/MappingsDumpParams.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/dump/executor/params/MappingsDumpParams.java

index d1af212..6b422f5 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/dump/executor/params/MappingsDumpParams.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/dump/executor/params/MappingsDumpParams.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read.dump.executor.params;
+package io.fd.hc2vpp.lisp.translate.read.dump.executor.params;
  
  import java.util.Arrays;
  
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/dump/executor/params/SubtableDumpParams.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/dump/executor/params/SubtableDumpParams.java

similarity index 97%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/dump/executor/params/SubtableDumpParams.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/dump/executor/params/SubtableDumpParams.java

index 678255c..1c034c1 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/dump/executor/params/SubtableDumpParams.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/dump/executor/params/SubtableDumpParams.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read.dump.executor.params;
+package io.fd.hc2vpp.lisp.translate.read.dump.executor.params;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/AbstractLispReaderFactoryBase.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/factory/AbstractLispReaderFactoryBase.java

similarity index 97%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/AbstractLispReaderFactoryBase.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/factory/AbstractLispReaderFactoryBase.java

index 8eb3d53..fe6616d 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/AbstractLispReaderFactoryBase.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/factory/AbstractLispReaderFactoryBase.java
@@ -14,12 +14,12 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read.factory;
+package io.fd.hc2vpp.lisp.translate.read.factory;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
-import io.fd.honeycomb.lisp.context.util.EidMappingContext;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.lisp.context.util.EidMappingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import javax.annotation.Nonnull;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.LispState;
  import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/EidTableReaderFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/factory/EidTableReaderFactory.java

similarity index 95%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/EidTableReaderFactory.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/factory/EidTableReaderFactory.java

index 553b5b5..195b0a0 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/EidTableReaderFactory.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/factory/EidTableReaderFactory.java
@@ -14,25 +14,25 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read.factory;
+package io.fd.hc2vpp.lisp.translate.read.factory;
  
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
  import com.google.common.collect.ImmutableSet;
-import io.fd.honeycomb.lisp.context.util.AdjacenciesMappingContext;
-import io.fd.honeycomb.lisp.context.util.EidMappingContext;
-import io.fd.honeycomb.lisp.translate.read.AdjacencyCustomizer;
-import io.fd.honeycomb.lisp.translate.read.BridgeDomainSubtableCustomizer;
-import io.fd.honeycomb.lisp.translate.read.LocalMappingCustomizer;
-import io.fd.honeycomb.lisp.translate.read.RemoteMappingCustomizer;
-import io.fd.honeycomb.lisp.translate.read.VniTableCustomizer;
-import io.fd.honeycomb.lisp.translate.read.VrfSubtableCustomizer;
+import io.fd.hc2vpp.lisp.context.util.AdjacenciesMappingContext;
+import io.fd.hc2vpp.lisp.context.util.EidMappingContext;
+import io.fd.hc2vpp.lisp.translate.read.AdjacencyCustomizer;
+import io.fd.hc2vpp.lisp.translate.read.BridgeDomainSubtableCustomizer;
+import io.fd.hc2vpp.lisp.translate.read.LocalMappingCustomizer;
+import io.fd.hc2vpp.lisp.translate.read.RemoteMappingCustomizer;
+import io.fd.hc2vpp.lisp.translate.read.VniTableCustomizer;
+import io.fd.hc2vpp.lisp.translate.read.VrfSubtableCustomizer;
  import io.fd.honeycomb.translate.impl.read.GenericListReader;
  import io.fd.honeycomb.translate.impl.read.GenericReader;
  import io.fd.honeycomb.translate.read.ReaderFactory;
  import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
  import javax.annotation.Nonnull;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.LispState;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/LispStateReaderFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/factory/LispStateReaderFactory.java

similarity index 82%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/LispStateReaderFactory.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/factory/LispStateReaderFactory.java

index e96246b..2490764 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/LispStateReaderFactory.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/factory/LispStateReaderFactory.java
@@ -14,25 +14,25 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read.factory;
+package io.fd.hc2vpp.lisp.translate.read.factory;
  
  import static com.google.common.base.Preconditions.checkNotNull;
-import static io.fd.honeycomb.lisp.cfgattrs.LispConfiguration.ADJACENCIES_IDENTIFICATION_CONTEXT;
-import static io.fd.honeycomb.lisp.cfgattrs.LispConfiguration.INTERFACE_CONTEXT;
-import static io.fd.honeycomb.lisp.cfgattrs.LispConfiguration.LOCAL_MAPPING_CONTEXT;
-import static io.fd.honeycomb.lisp.cfgattrs.LispConfiguration.LOCATOR_SET_CONTEXT;
-import static io.fd.honeycomb.lisp.cfgattrs.LispConfiguration.REMOTE_MAPPING_CONTEXT;
+import static io.fd.hc2vpp.lisp.cfgattrs.LispConfiguration.ADJACENCIES_IDENTIFICATION_CONTEXT;
+import static io.fd.hc2vpp.lisp.cfgattrs.LispConfiguration.INTERFACE_CONTEXT;
+import static io.fd.hc2vpp.lisp.cfgattrs.LispConfiguration.LOCAL_MAPPING_CONTEXT;
+import static io.fd.hc2vpp.lisp.cfgattrs.LispConfiguration.LOCATOR_SET_CONTEXT;
+import static io.fd.hc2vpp.lisp.cfgattrs.LispConfiguration.REMOTE_MAPPING_CONTEXT;
  
  import com.google.inject.Inject;
  import com.google.inject.name.Named;
-import io.fd.honeycomb.lisp.context.util.AdjacenciesMappingContext;
-import io.fd.honeycomb.lisp.context.util.EidMappingContext;
-import io.fd.honeycomb.lisp.translate.read.LispStateCustomizer;
-import io.fd.honeycomb.lisp.translate.read.PitrCfgCustomizer;
+import io.fd.hc2vpp.lisp.context.util.AdjacenciesMappingContext;
+import io.fd.hc2vpp.lisp.context.util.EidMappingContext;
+import io.fd.hc2vpp.lisp.translate.read.LispStateCustomizer;
+import io.fd.hc2vpp.lisp.translate.read.PitrCfgCustomizer;
  import io.fd.honeycomb.translate.impl.read.GenericReader;
  import io.fd.honeycomb.translate.read.ReaderFactory;
  import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
  import javax.annotation.Nonnull;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.LispState;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/LocatorSetsReaderFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/factory/LocatorSetsReaderFactory.java

similarity index 93%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/LocatorSetsReaderFactory.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/factory/LocatorSetsReaderFactory.java

index c0d9468..f31c30a 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/LocatorSetsReaderFactory.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/factory/LocatorSetsReaderFactory.java
@@ -14,15 +14,15 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read.factory;
+package io.fd.hc2vpp.lisp.translate.read.factory;
  
  
-import io.fd.honeycomb.lisp.translate.read.InterfaceCustomizer;
-import io.fd.honeycomb.lisp.translate.read.LocatorSetCustomizer;
+import io.fd.hc2vpp.lisp.translate.read.InterfaceCustomizer;
+import io.fd.hc2vpp.lisp.translate.read.LocatorSetCustomizer;
  import io.fd.honeycomb.translate.impl.read.GenericListReader;
  import io.fd.honeycomb.translate.read.ReaderFactory;
  import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import javax.annotation.Nonnull;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.LispState;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.lisp.feature.data.grouping.LispFeatureData;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/MapResolversReaderFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/factory/MapResolversReaderFactory.java

similarity index 95%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/MapResolversReaderFactory.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/factory/MapResolversReaderFactory.java

index 866f137..421b716 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/MapResolversReaderFactory.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/factory/MapResolversReaderFactory.java
@@ -14,10 +14,10 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read.factory;
+package io.fd.hc2vpp.lisp.translate.read.factory;
  
  
-import io.fd.honeycomb.lisp.translate.read.MapResolverCustomizer;
+import io.fd.hc2vpp.lisp.translate.read.MapResolverCustomizer;
  import io.fd.honeycomb.translate.impl.read.GenericListReader;
  import io.fd.honeycomb.translate.read.ReaderFactory;
  import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/trait/LocatorReader.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/LocatorReader.java

similarity index 89%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/trait/LocatorReader.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/LocatorReader.java

index 54fef65..f342d48 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/trait/LocatorReader.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/LocatorReader.java
@@ -14,13 +14,13 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read.trait;
+package io.fd.hc2vpp.lisp.translate.read.trait;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
-import io.fd.honeycomb.lisp.translate.read.dump.executor.params.LocatorDumpParams;
+import io.fd.hc2vpp.lisp.translate.read.dump.executor.params.LocatorDumpParams;
  import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.vpp.jvpp.core.dto.LispLocatorDetailsReplyDump;
  import io.fd.vpp.jvpp.core.dto.LispLocatorDump;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/trait/LocatorSetReader.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/LocatorSetReader.java

similarity index 93%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/trait/LocatorSetReader.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/LocatorSetReader.java

index 7085b04..df4e2ea 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/trait/LocatorSetReader.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/LocatorSetReader.java
@@ -14,10 +14,10 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read.trait;
+package io.fd.hc2vpp.lisp.translate.read.trait;
  
  import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.vpp.jvpp.core.dto.LispLocatorSetDetailsReplyDump;
  import io.fd.vpp.jvpp.core.dto.LispLocatorSetDump;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/trait/MappingProducer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/MappingProducer.java

similarity index 98%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/trait/MappingProducer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/MappingProducer.java

index 92e5c31..98f8f41 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/trait/MappingProducer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/MappingProducer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read.trait;
+package io.fd.hc2vpp.lisp.translate.read.trait;
  
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import javax.annotation.Nonnull;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/trait/MappingReader.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/MappingReader.java

similarity index 88%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/trait/MappingReader.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/MappingReader.java

index 759e52a..f76293e 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/trait/MappingReader.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/MappingReader.java
@@ -14,16 +14,16 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read.trait;
+package io.fd.hc2vpp.lisp.translate.read.trait;
  
  import static com.google.common.base.Preconditions.checkNotNull;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV4;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV6;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.MAC;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV4;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV6;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.MAC;
  
-import io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams;
+import io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams;
  import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.vpp.jvpp.core.dto.LispEidTableDetails;
  import io.fd.vpp.jvpp.core.dto.LispEidTableDetailsReplyDump;
  import io.fd.vpp.jvpp.core.dto.LispEidTableDump;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/trait/SubtableReader.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/SubtableReader.java

similarity index 69%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/trait/SubtableReader.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/SubtableReader.java

index a4a6e21..f768f4f 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/trait/SubtableReader.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/SubtableReader.java
@@ -14,29 +14,23 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read.trait;
+package io.fd.hc2vpp.lisp.translate.read.trait;
  
  
  import static com.google.common.base.Preconditions.checkNotNull;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.SubtableDumpParams.MapLevel.L2;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.SubtableDumpParams.MapLevel.L3;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.SubtableDumpParams.SubtableDumpParamsBuilder;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.SubtableDumpParams.MapLevel.L2;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.SubtableDumpParams.MapLevel.L3;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.SubtableDumpParams.SubtableDumpParamsBuilder;
  
-import com.google.common.base.Optional;
-import io.fd.honeycomb.lisp.translate.read.dump.executor.params.SubtableDumpParams;
-import io.fd.honeycomb.translate.ModificationCache;
-import io.fd.honeycomb.translate.read.ReadFailedException;
-import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
+import io.fd.hc2vpp.lisp.translate.read.dump.executor.params.SubtableDumpParams;
  import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.vpp.jvpp.core.dto.LispEidTableMapDetailsReplyDump;
  import io.fd.vpp.jvpp.core.dto.LispEidTableMapDump;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
  import javax.annotation.Nonnull;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.eid.table.grouping.eid.table.VniTable;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.eid.table.grouping.eid.table.vni.table.VrfSubtable;
-import org.opendaylight.yangtools.yang.binding.ChildOf;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  
  /**
   * Provides common logic for reading Eid subtables
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/util/EidMetadataProvider.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/util/EidMetadataProvider.java

similarity index 98%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/util/EidMetadataProvider.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/util/EidMetadataProvider.java

index 88571f7..3d9feca 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/util/EidMetadataProvider.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/util/EidMetadataProvider.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.util;
+package io.fd.hc2vpp.lisp.translate.util;
  
  import javax.annotation.Nonnull;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.InstanceIdType;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/util/EidTranslator.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/util/EidTranslator.java

similarity index 96%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/util/EidTranslator.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/util/EidTranslator.java

index 0b7faba..3477209 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/util/EidTranslator.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/util/EidTranslator.java
@@ -14,15 +14,15 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.util;
+package io.fd.hc2vpp.lisp.translate.util;
  
  import static com.google.common.base.Preconditions.checkNotNull;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV4;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV6;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.MAC;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV4;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV6;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.MAC;
  
-import io.fd.honeycomb.translate.vpp.util.AddressTranslator;
+import io.fd.hc2vpp.common.translate.util.AddressTranslator;
  import java.util.Arrays;
  import javax.annotation.Nonnull;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/AdjacencyCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizer.java

similarity index 94%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/AdjacencyCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizer.java

index b394f2a..4df60b5 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/AdjacencyCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizer.java
@@ -14,20 +14,20 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static com.google.common.base.Preconditions.checkNotNull;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType;
  
-import io.fd.honeycomb.lisp.context.util.AdjacenciesMappingContext;
-import io.fd.honeycomb.lisp.context.util.EidMappingContext;
-import io.fd.honeycomb.lisp.translate.util.EidTranslator;
+import io.fd.hc2vpp.lisp.context.util.AdjacenciesMappingContext;
+import io.fd.hc2vpp.lisp.context.util.EidMappingContext;
+import io.fd.hc2vpp.lisp.translate.util.EidTranslator;
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.VppBaseCallException;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/BridgeDomainSubtableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainSubtableCustomizer.java

similarity index 95%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/BridgeDomainSubtableCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainSubtableCustomizer.java

index 41e1adc..b176567 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/BridgeDomainSubtableCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainSubtableCustomizer.java
@@ -14,16 +14,16 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  import static com.google.common.base.Preconditions.checkState;
  
-import io.fd.honeycomb.lisp.translate.write.trait.SubtableWriter;
+import io.fd.hc2vpp.lisp.translate.write.trait.SubtableWriter;
  import io.fd.honeycomb.translate.MappingContext;
  import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.VppBaseCallException;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/InterfaceCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizer.java

similarity index 95%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/InterfaceCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizer.java

index fa477e5..ccce2ba 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/InterfaceCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizer.java
@@ -14,17 +14,17 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  import static com.google.common.base.Preconditions.checkState;
  import static java.nio.charset.StandardCharsets.UTF_8;
  
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import java.io.UnsupportedEncodingException;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/ItrRemoteLocatorSetCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizer.java

similarity index 94%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/ItrRemoteLocatorSetCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizer.java

index 8ba1bcf..fd34ec6 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/ItrRemoteLocatorSetCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizer.java
@@ -14,13 +14,13 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
  
  import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import java.nio.charset.StandardCharsets;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LispCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizer.java

similarity index 94%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LispCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizer.java

index ba2e240..1ec4c71 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LispCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizer.java
@@ -14,13 +14,13 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
  import com.google.common.base.Preconditions;
  import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import java.util.concurrent.CompletionStage;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocalMappingCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizer.java

similarity index 90%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocalMappingCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizer.java

index 93f39f4..fc9b2a6 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocalMappingCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizer.java
@@ -14,21 +14,21 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  import static com.google.common.base.Preconditions.checkState;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV4;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV6;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV4;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV6;
  import static java.nio.charset.StandardCharsets.UTF_8;
  
-import io.fd.honeycomb.lisp.context.util.EidMappingContext;
-import io.fd.honeycomb.lisp.translate.read.trait.MappingProducer;
-import io.fd.honeycomb.lisp.translate.util.EidTranslator;
+import io.fd.hc2vpp.lisp.context.util.EidMappingContext;
+import io.fd.hc2vpp.lisp.translate.read.trait.MappingProducer;
+import io.fd.hc2vpp.lisp.translate.util.EidTranslator;
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import java.io.UnsupportedEncodingException;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizer.java

similarity index 91%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizer.java

index 7492558..f929193 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizer.java
@@ -14,22 +14,20 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  import static com.google.common.base.Preconditions.checkState;
  import static java.nio.charset.StandardCharsets.UTF_8;
  
-import io.fd.honeycomb.lisp.translate.read.trait.LocatorSetReader;
+import io.fd.hc2vpp.lisp.translate.read.trait.LocatorSetReader;
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.dto.LispAddDelLocatorSet;
-import io.fd.vpp.jvpp.core.dto.LispLocatorSetDetailsReplyDump;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
  import java.util.List;
  import javax.annotation.Nonnull;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/MapResolverCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizer.java

similarity index 94%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/MapResolverCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizer.java

index 42066c4..0c8a9ec 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/MapResolverCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizer.java
@@ -14,14 +14,14 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.AddressTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.AddressTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import java.util.concurrent.TimeoutException;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/PitrCfgCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizer.java

similarity index 94%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/PitrCfgCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizer.java

index 035db3c..a405b96 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/PitrCfgCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizer.java
@@ -14,15 +14,15 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  import static java.nio.charset.StandardCharsets.UTF_8;
  
  import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import java.util.concurrent.TimeoutException;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/RemoteMappingCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizer.java

similarity index 94%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/RemoteMappingCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizer.java

index cb4313b..2078f57 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/RemoteMappingCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizer.java
@@ -14,23 +14,23 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static com.google.common.base.Preconditions.checkNotNull;
  import static com.google.common.base.Preconditions.checkState;
-import static io.fd.honeycomb.lisp.translate.write.RemoteMappingCustomizer.LocatorListType.NEGATIVE;
-import static io.fd.honeycomb.lisp.translate.write.RemoteMappingCustomizer.LocatorListType.POSITIVE;
+import static io.fd.hc2vpp.lisp.translate.write.RemoteMappingCustomizer.LocatorListType.NEGATIVE;
+import static io.fd.hc2vpp.lisp.translate.write.RemoteMappingCustomizer.LocatorListType.POSITIVE;
  
  import com.google.common.base.Preconditions;
-import io.fd.honeycomb.lisp.context.util.EidMappingContext;
-import io.fd.honeycomb.lisp.translate.read.trait.MappingProducer;
-import io.fd.honeycomb.lisp.translate.util.EidTranslator;
+import io.fd.hc2vpp.lisp.context.util.EidMappingContext;
+import io.fd.hc2vpp.lisp.translate.read.trait.MappingProducer;
+import io.fd.hc2vpp.lisp.translate.util.EidTranslator;
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.AddressTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.AddressTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import java.io.ByteArrayOutputStream;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/VniTableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VniTableCustomizer.java

similarity index 96%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/VniTableCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VniTableCustomizer.java

index 005b336..607c4b7 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/VniTableCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VniTableCustomizer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
  import static com.google.common.base.Preconditions.checkState;
  
@@ -22,7 +22,7 @@ import com.google.common.base.Optional;
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
  
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.eid.table.grouping.eid.table.VniTable;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/VrfSubtableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizer.java

similarity index 95%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/VrfSubtableCustomizer.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizer.java

index a977871..e029879 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/VrfSubtableCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizer.java
@@ -14,11 +14,11 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
-import io.fd.honeycomb.lisp.translate.write.trait.SubtableWriter;
+import io.fd.hc2vpp.lisp.translate.write.trait.SubtableWriter;
  import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import java.util.concurrent.TimeoutException;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/AbstractLispWriterFactoryBase.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/AbstractLispWriterFactoryBase.java

similarity index 96%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/AbstractLispWriterFactoryBase.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/AbstractLispWriterFactoryBase.java

index 366caf8..cf6df82 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/AbstractLispWriterFactoryBase.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/AbstractLispWriterFactoryBase.java
@@ -14,12 +14,12 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write.factory;
+package io.fd.hc2vpp.lisp.translate.write.factory;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
-import io.fd.honeycomb.lisp.context.util.EidMappingContext;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.lisp.context.util.EidMappingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import javax.annotation.Nonnull;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.Lisp;
  import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/LispWriterFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/LispWriterFactory.java

similarity index 82%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/LispWriterFactory.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/LispWriterFactory.java

index 055aa72..5bd02a2 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/LispWriterFactory.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/LispWriterFactory.java
@@ -14,24 +14,24 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write.factory;
+package io.fd.hc2vpp.lisp.translate.write.factory;
  
  
  import static com.google.common.base.Preconditions.checkNotNull;
-import static io.fd.honeycomb.lisp.cfgattrs.LispConfiguration.ADJACENCIES_IDENTIFICATION_CONTEXT;
-import static io.fd.honeycomb.lisp.cfgattrs.LispConfiguration.INTERFACE_CONTEXT;
-import static io.fd.honeycomb.lisp.cfgattrs.LispConfiguration.LOCAL_MAPPING_CONTEXT;
-import static io.fd.honeycomb.lisp.cfgattrs.LispConfiguration.LOCATOR_SET_CONTEXT;
-import static io.fd.honeycomb.lisp.cfgattrs.LispConfiguration.REMOTE_MAPPING_CONTEXT;
+import static io.fd.hc2vpp.lisp.cfgattrs.LispConfiguration.ADJACENCIES_IDENTIFICATION_CONTEXT;
+import static io.fd.hc2vpp.lisp.cfgattrs.LispConfiguration.INTERFACE_CONTEXT;
+import static io.fd.hc2vpp.lisp.cfgattrs.LispConfiguration.LOCAL_MAPPING_CONTEXT;
+import static io.fd.hc2vpp.lisp.cfgattrs.LispConfiguration.LOCATOR_SET_CONTEXT;
+import static io.fd.hc2vpp.lisp.cfgattrs.LispConfiguration.REMOTE_MAPPING_CONTEXT;
  
  import com.google.inject.Inject;
  import com.google.inject.name.Named;
-import io.fd.honeycomb.lisp.context.util.AdjacenciesMappingContext;
-import io.fd.honeycomb.lisp.context.util.EidMappingContext;
-import io.fd.honeycomb.lisp.translate.write.LispCustomizer;
-import io.fd.honeycomb.lisp.translate.write.PitrCfgCustomizer;
+import io.fd.hc2vpp.lisp.context.util.AdjacenciesMappingContext;
+import io.fd.hc2vpp.lisp.context.util.EidMappingContext;
+import io.fd.hc2vpp.lisp.translate.write.LispCustomizer;
+import io.fd.hc2vpp.lisp.translate.write.PitrCfgCustomizer;
  import io.fd.honeycomb.translate.impl.write.GenericWriter;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriterFactory;
  import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/LocatorSetsWriterFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/LocatorSetsWriterFactory.java

similarity index 92%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/LocatorSetsWriterFactory.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/LocatorSetsWriterFactory.java

index eabdfe2..c422763 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/LocatorSetsWriterFactory.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/LocatorSetsWriterFactory.java
@@ -14,12 +14,12 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write.factory;
+package io.fd.hc2vpp.lisp.translate.write.factory;
  
-import io.fd.honeycomb.lisp.translate.write.InterfaceCustomizer;
-import io.fd.honeycomb.lisp.translate.write.LocatorSetCustomizer;
+import io.fd.hc2vpp.lisp.translate.write.InterfaceCustomizer;
+import io.fd.hc2vpp.lisp.translate.write.LocatorSetCustomizer;
  import io.fd.honeycomb.translate.impl.write.GenericListWriter;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriterFactory;
  import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
  import javax.annotation.Nonnull;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/MapResolversWriterFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/MapResolversWriterFactory.java

similarity index 95%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/MapResolversWriterFactory.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/MapResolversWriterFactory.java

index 0586f88..8b0d7d5 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/MapResolversWriterFactory.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/MapResolversWriterFactory.java
@@ -14,10 +14,10 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write.factory;
+package io.fd.hc2vpp.lisp.translate.write.factory;
  
  
-import io.fd.honeycomb.lisp.translate.write.MapResolverCustomizer;
+import io.fd.hc2vpp.lisp.translate.write.MapResolverCustomizer;
  import io.fd.honeycomb.translate.impl.write.GenericListWriter;
  import io.fd.honeycomb.translate.write.WriterFactory;
  import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/VniTableWriterFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/VniTableWriterFactory.java

similarity index 94%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/VniTableWriterFactory.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/VniTableWriterFactory.java

index 9e9152c..64dd7d5 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/VniTableWriterFactory.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/VniTableWriterFactory.java
@@ -14,22 +14,22 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write.factory;
+package io.fd.hc2vpp.lisp.translate.write.factory;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
  import com.google.common.collect.ImmutableSet;
-import io.fd.honeycomb.lisp.context.util.AdjacenciesMappingContext;
-import io.fd.honeycomb.lisp.context.util.EidMappingContext;
-import io.fd.honeycomb.lisp.translate.write.AdjacencyCustomizer;
-import io.fd.honeycomb.lisp.translate.write.BridgeDomainSubtableCustomizer;
-import io.fd.honeycomb.lisp.translate.write.LocalMappingCustomizer;
-import io.fd.honeycomb.lisp.translate.write.RemoteMappingCustomizer;
-import io.fd.honeycomb.lisp.translate.write.VniTableCustomizer;
-import io.fd.honeycomb.lisp.translate.write.VrfSubtableCustomizer;
+import io.fd.hc2vpp.lisp.context.util.AdjacenciesMappingContext;
+import io.fd.hc2vpp.lisp.context.util.EidMappingContext;
+import io.fd.hc2vpp.lisp.translate.write.AdjacencyCustomizer;
+import io.fd.hc2vpp.lisp.translate.write.BridgeDomainSubtableCustomizer;
+import io.fd.hc2vpp.lisp.translate.write.LocalMappingCustomizer;
+import io.fd.hc2vpp.lisp.translate.write.RemoteMappingCustomizer;
+import io.fd.hc2vpp.lisp.translate.write.VniTableCustomizer;
+import io.fd.hc2vpp.lisp.translate.write.VrfSubtableCustomizer;
  import io.fd.honeycomb.translate.impl.write.GenericListWriter;
  import io.fd.honeycomb.translate.impl.write.GenericWriter;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriterFactory;
  import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/trait/SubtableWriter.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriter.java

similarity index 95%

rename from lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/trait/SubtableWriter.java

rename to lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriter.java

index b00bfc0..6372583 100644 (file)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/trait/SubtableWriter.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriter.java
@@ -14,13 +14,13 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write.trait;
+package io.fd.hc2vpp.lisp.translate.write.trait;
  
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import java.util.concurrent.TimeoutException;
  import javax.annotation.Nonnull;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.eid.table.grouping.eid.table.VniTable;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/LispModuleTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/LispModuleTest.java

similarity index 97%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/LispModuleTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/LispModuleTest.java

index 20c6aa3..bd4a32a 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/LispModuleTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/LispModuleTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp;
+package io.fd.hc2vpp.lisp;
  
  import static org.hamcrest.CoreMatchers.is;
  import static org.hamcrest.CoreMatchers.not;
@@ -31,7 +31,7 @@ import com.google.inject.testing.fieldbinder.BoundFieldModule;
  import io.fd.honeycomb.translate.read.ReaderFactory;
  import io.fd.honeycomb.translate.impl.read.registry.CompositeReaderRegistryBuilder;
  import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriterFactory;
  import java.util.HashSet;
  import java.util.Set;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/context/util/AdjacenciesMappingContextTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/context/util/AdjacenciesMappingContextTest.java

similarity index 99%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/context/util/AdjacenciesMappingContextTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/context/util/AdjacenciesMappingContextTest.java

index 4a5302b..220e3e7 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/context/util/AdjacenciesMappingContextTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/context/util/AdjacenciesMappingContextTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.context.util;
+package io.fd.hc2vpp.lisp.context.util;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertTrue;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/context/util/EidMappingContextTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/context/util/EidMappingContextTest.java

similarity index 98%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/context/util/EidMappingContextTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/context/util/EidMappingContextTest.java

index ccd3829..e5daace 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/context/util/EidMappingContextTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/context/util/EidMappingContextTest.java
@@ -14,13 +14,13 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.context.util;
+package io.fd.hc2vpp.lisp.context.util;
  
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertTrue;
  
-import io.fd.honeycomb.lisp.util.EidMappingContextHelper;
+import io.fd.hc2vpp.lisp.util.EidMappingContextHelper;
  import io.fd.honeycomb.translate.MappingContext;
  import org.junit.Before;
  import org.junit.Test;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/AdjacencyData.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/AdjacencyData.java

similarity index 98%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/AdjacencyData.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/AdjacencyData.java

index 2ecfe17..cc3581a 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/AdjacencyData.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/AdjacencyData.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate;
+package io.fd.hc2vpp.lisp.translate;
  
  import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.eid.mapping.context.rev160801.contexts.eid.mapping.context.mappings.mapping.Eid;
  import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.eid.mapping.context.rev160801.contexts.eid.mapping.context.mappings.mapping.EidBuilder;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/AdjacencyCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizerTest.java

similarity index 87%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/AdjacencyCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizerTest.java

index 09d4d27..034d818 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/AdjacencyCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizerTest.java
@@ -14,14 +14,14 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
-
-import static io.fd.honeycomb.lisp.translate.AdjacencyData.ADDRESS_ONE;
-import static io.fd.honeycomb.lisp.translate.AdjacencyData.ADDRESS_THREE;
-import static io.fd.honeycomb.lisp.translate.AdjacencyData.LOCAL_EID_ONE;
-import static io.fd.honeycomb.lisp.translate.AdjacencyData.LOCAL_EID_TWO;
-import static io.fd.honeycomb.lisp.translate.AdjacencyData.REMOTE_EID_ONE;
-import static io.fd.honeycomb.lisp.translate.AdjacencyData.REMOTE_EID_TWO;
+package io.fd.hc2vpp.lisp.translate.read;
+
+import static io.fd.hc2vpp.lisp.translate.AdjacencyData.ADDRESS_ONE;
+import static io.fd.hc2vpp.lisp.translate.AdjacencyData.ADDRESS_THREE;
+import static io.fd.hc2vpp.lisp.translate.AdjacencyData.LOCAL_EID_ONE;
+import static io.fd.hc2vpp.lisp.translate.AdjacencyData.LOCAL_EID_TWO;
+import static io.fd.hc2vpp.lisp.translate.AdjacencyData.REMOTE_EID_ONE;
+import static io.fd.hc2vpp.lisp.translate.AdjacencyData.REMOTE_EID_TWO;
  import static org.hamcrest.MatcherAssert.assertThat;
  import static org.hamcrest.Matchers.contains;
  import static org.hamcrest.Matchers.hasSize;
@@ -29,14 +29,14 @@ import static org.junit.Assert.assertEquals;
  import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.when;
  
-import io.fd.honeycomb.lisp.context.util.AdjacenciesMappingContext;
-import io.fd.honeycomb.lisp.context.util.EidMappingContext;
-import io.fd.honeycomb.lisp.translate.util.EidMetadataProvider;
-import io.fd.honeycomb.lisp.util.AdjacencyMappingContextTestHelper;
-import io.fd.honeycomb.lisp.util.EidMappingContextHelper;
+import io.fd.hc2vpp.lisp.context.util.AdjacenciesMappingContext;
+import io.fd.hc2vpp.lisp.context.util.EidMappingContext;
+import io.fd.hc2vpp.lisp.translate.util.EidMetadataProvider;
+import io.fd.hc2vpp.lisp.util.AdjacencyMappingContextTestHelper;
+import io.fd.hc2vpp.lisp.util.EidMappingContextHelper;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.vpp.test.read.ListReaderCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
  import io.fd.vpp.jvpp.core.dto.LispAdjacenciesGetReply;
  import io.fd.vpp.jvpp.core.types.LispAdjacency;
  import java.util.List;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/BridgeDomainSubtableCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizerTest.java

similarity index 94%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/BridgeDomainSubtableCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizerTest.java

index b230b34..cd36528 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/BridgeDomainSubtableCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizerTest.java
@@ -14,20 +14,20 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
  
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.SubtableDumpParams.MapLevel.L2;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.SubtableDumpParams.MapLevel.L2;
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertNotNull;
  import static org.junit.Assert.assertNull;
  import static org.junit.Assert.assertTrue;
  import static org.junit.Assert.fail;
  
-import io.fd.honeycomb.lisp.translate.read.trait.SubtableReaderTestCase;
+import io.fd.hc2vpp.lisp.translate.read.trait.SubtableReaderTestCase;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.VppCallbackException;
  import org.junit.Test;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.eid.table.grouping.EidTable;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/InterfaceCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/InterfaceCustomizerTest.java

similarity index 96%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/InterfaceCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/InterfaceCustomizerTest.java

index fb97dce..48f0d06 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/InterfaceCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/InterfaceCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
  import static org.junit.Assert.assertEquals;
  import static org.mockito.Mockito.when;
@@ -22,8 +22,8 @@ import static org.mockito.Mockito.when;
  import com.google.common.collect.ImmutableList;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ListReaderCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
  import java.util.List;
  import org.junit.Before;
  import org.junit.Test;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java

similarity index 98%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java

index 9b810b9..acd72ce 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertNotNull;
@@ -28,7 +28,7 @@ import static org.mockito.Mockito.when;
  
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.vpp.test.read.ReaderCustomizerTest;
+import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest;
  import io.fd.vpp.jvpp.VppCallbackException;
  import io.fd.vpp.jvpp.core.dto.LispGetMapRequestItrRlocs;
  import io.fd.vpp.jvpp.core.dto.LispGetMapRequestItrRlocsReply;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/LispStateCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizerTest.java

similarity index 95%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/LispStateCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizerTest.java

index 33d956f..e00d509 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/LispStateCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizerTest.java
@@ -14,14 +14,14 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
  import static org.junit.Assert.assertEquals;
  import static org.mockito.Mockito.when;
  
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.vpp.test.read.ReaderCustomizerTest;
+import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest;
  import org.junit.Before;
  import org.junit.Test;
  import org.mockito.Mockito;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/LocalMappingCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizerTest.java

similarity index 93%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/LocalMappingCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizerTest.java

index 065adcc..5be9837 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/LocalMappingCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizerTest.java
@@ -14,22 +14,21 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV4;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV4;
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertNotNull;
  import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.when;
  
  import com.google.common.collect.ImmutableList;
-import io.fd.honeycomb.lisp.context.util.EidMappingContext;
-import io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams;
-import io.fd.honeycomb.lisp.translate.util.EidTranslator;
+import io.fd.hc2vpp.lisp.context.util.EidMappingContext;
+import io.fd.hc2vpp.lisp.translate.util.EidTranslator;
  import io.fd.honeycomb.translate.MappingContext;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ListReaderCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
  import java.util.List;
  import org.junit.Test;
  import org.mockito.Mock;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/LocatorSetCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizerTest.java

similarity index 95%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/LocatorSetCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizerTest.java

index e863ba2..9c88b29 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/LocatorSetCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertNotNull;
@@ -23,8 +23,8 @@ import static org.mockito.Mockito.when;
  
  import com.google.common.collect.ImmutableList;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ListReaderCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
  import java.nio.charset.StandardCharsets;
  import java.util.List;
  import org.junit.Before;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/MapResolverCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizerTest.java

similarity index 97%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/MapResolverCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizerTest.java

index adcbdb6..e533f88 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/MapResolverCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertNotNull;
@@ -23,7 +23,7 @@ import static org.mockito.Mockito.when;
  
  import com.google.common.collect.ImmutableList;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.vpp.test.read.ListReaderCustomizerTest;
+import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
  import io.fd.vpp.jvpp.core.dto.LispMapResolverDetails;
  import io.fd.vpp.jvpp.core.dto.LispMapResolverDetailsReplyDump;
  import java.util.List;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/PitrCfgCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/PitrCfgCustomizerTest.java

similarity index 96%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/PitrCfgCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/PitrCfgCustomizerTest.java

index 52abdf8..77410f1 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/PitrCfgCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/PitrCfgCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertNotNull;
@@ -22,7 +22,7 @@ import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.when;
  
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.vpp.test.read.ReaderCustomizerTest;
+import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest;
  import java.nio.charset.StandardCharsets;
  import org.junit.Before;
  import org.junit.Test;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/RemoteMappingCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/RemoteMappingCustomizerTest.java

similarity index 97%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/RemoteMappingCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/RemoteMappingCustomizerTest.java

index 27c243e..5ffc770 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/RemoteMappingCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/RemoteMappingCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertNotNull;
@@ -23,12 +23,12 @@ import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.when;
  
  import com.google.common.collect.ImmutableList;
-import io.fd.honeycomb.lisp.context.util.EidMappingContext;
-import io.fd.honeycomb.lisp.translate.util.EidTranslator;
+import io.fd.hc2vpp.lisp.context.util.EidMappingContext;
+import io.fd.hc2vpp.lisp.translate.util.EidTranslator;
  import io.fd.honeycomb.translate.MappingContext;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ListReaderCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
  import io.fd.vpp.jvpp.core.dto.LispEidTableDetails;
  import io.fd.vpp.jvpp.core.dto.LispEidTableDetailsReplyDump;
  import io.fd.vpp.jvpp.core.dto.LispLocatorDetails;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/VniTableCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizerTest.java

similarity index 97%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/VniTableCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizerTest.java

index 1ff6cc6..7da4357 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/VniTableCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
  
  import static org.junit.Assert.assertEquals;
@@ -26,7 +26,7 @@ import static org.mockito.Mockito.when;
  import com.google.common.collect.ImmutableList;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.vpp.test.read.ListReaderCustomizerTest;
+import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
  import io.fd.vpp.jvpp.VppCallbackException;
  import io.fd.vpp.jvpp.core.dto.LispEidTableVniDetails;
  import io.fd.vpp.jvpp.core.dto.LispEidTableVniDetailsReplyDump;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/VrfSubtableCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizerTest.java

similarity index 95%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/VrfSubtableCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizerTest.java

index 58965ed..5757f02 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/VrfSubtableCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizerTest.java
@@ -14,17 +14,17 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read;
+package io.fd.hc2vpp.lisp.translate.read;
  
  
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.SubtableDumpParams.MapLevel.L3;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.SubtableDumpParams.MapLevel.L3;
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertNotNull;
  import static org.junit.Assert.assertNull;
  import static org.junit.Assert.assertTrue;
  import static org.junit.Assert.fail;
  
-import io.fd.honeycomb.lisp.translate.read.trait.SubtableReaderTestCase;
+import io.fd.hc2vpp.lisp.translate.read.trait.SubtableReaderTestCase;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
  import io.fd.vpp.jvpp.VppCallbackException;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/trait/MappingProducerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/trait/MappingProducerTest.java

similarity index 99%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/trait/MappingProducerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/trait/MappingProducerTest.java

index 313f27d..a09f7b8 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/trait/MappingProducerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/trait/MappingProducerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read.trait;
+package io.fd.hc2vpp.lisp.translate.read.trait;
  
  
  import static org.junit.Assert.assertTrue;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/trait/MappingReaderTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/trait/MappingReaderTest.java

similarity index 98%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/trait/MappingReaderTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/trait/MappingReaderTest.java

index 9366037..7945a5b 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/trait/MappingReaderTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/trait/MappingReaderTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read.trait;
+package io.fd.hc2vpp.lisp.translate.read.trait;
  
  
  import static org.junit.Assert.assertEquals;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/trait/SubtableReaderTestCase.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/trait/SubtableReaderTestCase.java

similarity index 94%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/trait/SubtableReaderTestCase.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/trait/SubtableReaderTestCase.java

index 3313395..21ac522 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/read/trait/SubtableReaderTestCase.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/trait/SubtableReaderTestCase.java
@@ -14,10 +14,10 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.read.trait;
+package io.fd.hc2vpp.lisp.translate.read.trait;
  
  
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.SubtableDumpParams.MapLevel;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.SubtableDumpParams.MapLevel;
  import static org.junit.Assert.assertEquals;
  import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.times;
@@ -26,7 +26,7 @@ import static org.mockito.Mockito.when;
  import static org.mockito.MockitoAnnotations.initMocks;
  
  import com.google.common.collect.ImmutableList;
-import io.fd.honeycomb.vpp.test.read.ReaderCustomizerTest;
+import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest;
  import io.fd.vpp.jvpp.VppCallbackException;
  import io.fd.vpp.jvpp.core.dto.LispEidTableMapDetails;
  import io.fd.vpp.jvpp.core.dto.LispEidTableMapDetailsReplyDump;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/util/EidTranslatorTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/util/EidTranslatorTest.java

similarity index 89%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/util/EidTranslatorTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/util/EidTranslatorTest.java

index bc0bfc9..c2fc51b 100755 (executable)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/util/EidTranslatorTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/util/EidTranslatorTest.java
@@ -14,11 +14,11 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.util;
+package io.fd.hc2vpp.lisp.translate.util;
  
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV4;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV6;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.MAC;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV4;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV6;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.MAC;
  import static org.junit.Assert.assertEquals;
  
  import org.junit.Test;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/AdjacencyCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizerTest.java

similarity index 94%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/AdjacencyCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizerTest.java

index 0b2536b..f263e78 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/AdjacencyCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizerTest.java
@@ -14,13 +14,13 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
-import static io.fd.honeycomb.lisp.translate.AdjacencyData.ADDRESS_ONE;
-import static io.fd.honeycomb.lisp.translate.AdjacencyData.ADDRESS_THREE;
-import static io.fd.honeycomb.lisp.translate.AdjacencyData.LOCAL_EID_ONE;
-import static io.fd.honeycomb.lisp.translate.AdjacencyData.REMOTE_EID_ONE;
-import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV4;
+import static io.fd.hc2vpp.lisp.translate.AdjacencyData.ADDRESS_ONE;
+import static io.fd.hc2vpp.lisp.translate.AdjacencyData.ADDRESS_THREE;
+import static io.fd.hc2vpp.lisp.translate.AdjacencyData.LOCAL_EID_ONE;
+import static io.fd.hc2vpp.lisp.translate.AdjacencyData.REMOTE_EID_ONE;
+import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV4;
  import static org.junit.Assert.assertArrayEquals;
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertNotNull;
@@ -30,10 +30,10 @@ import static org.mockito.Mockito.times;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
-import io.fd.honeycomb.lisp.context.util.AdjacenciesMappingContext;
-import io.fd.honeycomb.lisp.context.util.EidMappingContext;
-import io.fd.honeycomb.lisp.util.EidMappingContextHelper;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.lisp.context.util.AdjacenciesMappingContext;
+import io.fd.hc2vpp.lisp.context.util.EidMappingContext;
+import io.fd.hc2vpp.lisp.util.EidMappingContextHelper;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import io.fd.vpp.jvpp.core.dto.LispAddDelAdjacency;
  import io.fd.vpp.jvpp.core.dto.LispAddDelAdjacencyReply;
  import org.junit.Before;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/BridgeDomainCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainCustomizerTest.java

similarity index 96%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/BridgeDomainCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainCustomizerTest.java

index ada98bf..9828581 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/BridgeDomainCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainCustomizerTest.java
@@ -14,14 +14,14 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertTrue;
  import static org.junit.Assert.fail;
  
-import io.fd.honeycomb.lisp.translate.write.trait.SubtableWriterTestCase;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.lisp.translate.write.trait.SubtableWriterTestCase;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.VppCallbackException;
  import org.junit.Before;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/InterfaceCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizerTest.java

similarity index 96%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/InterfaceCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizerTest.java

index a27e5ae..61326ff 100755 (executable)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/InterfaceCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertNotNull;
@@ -24,10 +24,10 @@ import static org.mockito.Mockito.times;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+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.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import org.junit.Test;
  import org.mockito.ArgumentCaptor;
  import org.mockito.Captor;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/ItrRemoteLocatorSetCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizerTest.java

similarity index 97%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/ItrRemoteLocatorSetCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizerTest.java

index 5855894..e86b946 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/ItrRemoteLocatorSetCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertNotNull;
@@ -26,9 +26,9 @@ import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  import static org.mockito.MockitoAnnotations.initMocks;
  
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import io.fd.vpp.jvpp.VppCallbackException;
  import io.fd.vpp.jvpp.core.dto.LispAddDelMapRequestItrRlocs;
  import io.fd.vpp.jvpp.core.dto.LispAddDelMapRequestItrRlocsReply;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/LispCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizerTest.java

similarity index 97%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/LispCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizerTest.java

index 380335c..45e3e00 100755 (executable)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/LispCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertNotNull;
@@ -24,7 +24,7 @@ import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import org.junit.Test;
  import org.mockito.ArgumentCaptor;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.Lisp;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/LocalMappingCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizerTest.java

similarity index 96%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/LocalMappingCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizerTest.java

index cfcc2be..e5663ee 100755 (executable)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/LocalMappingCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertNotNull;
@@ -25,11 +25,11 @@ import static org.mockito.Mockito.times;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
-import io.fd.honeycomb.lisp.context.util.EidMappingContext;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.Ipv4Translator;
+import io.fd.hc2vpp.lisp.context.util.EidMappingContext;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.Ipv4Translator;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import java.util.concurrent.ExecutionException;
  import org.junit.Test;
  import org.mockito.ArgumentCaptor;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java

similarity index 97%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java

index 30d33a5..58049d8 100755 (executable)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertNotNull;
@@ -28,9 +28,9 @@ import static org.mockito.Mockito.when;
  
  import com.google.common.base.Optional;
  import com.google.common.collect.ImmutableList;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import io.fd.vpp.jvpp.core.dto.LispAddDelLocatorSet;
  import io.fd.vpp.jvpp.core.dto.LispAddDelLocatorSetReply;
  import io.fd.vpp.jvpp.core.dto.LispLocatorSetDetails;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/MapResolverCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java

similarity index 96%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/MapResolverCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java

index ba5bf01..0780c68 100755 (executable)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/MapResolverCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
  import static org.junit.Assert.assertEquals;
  import static org.mockito.Matchers.any;
@@ -22,9 +22,9 @@ import static org.mockito.Mockito.times;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
-import io.fd.honeycomb.translate.vpp.util.Ipv4Translator;
+import io.fd.hc2vpp.common.translate.util.Ipv4Translator;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import java.util.concurrent.ExecutionException;
  import org.junit.Test;
  import org.mockito.ArgumentCaptor;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/PitrCfgCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizerTest.java

similarity index 97%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/PitrCfgCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizerTest.java

index fa2061c..7a2a8fe 100755 (executable)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/PitrCfgCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
  import static org.junit.Assert.assertEquals;
  import static org.mockito.Matchers.any;
@@ -24,7 +24,7 @@ import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import java.util.concurrent.ExecutionException;
  import org.junit.Test;
  import org.mockito.ArgumentCaptor;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/RemoteMappingCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizerTest.java

similarity index 97%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/RemoteMappingCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizerTest.java

index f0fe32a..1645a9c 100755 (executable)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/RemoteMappingCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertNotNull;
@@ -25,10 +25,10 @@ import static org.mockito.Mockito.times;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
-import io.fd.honeycomb.lisp.context.util.EidMappingContext;
-import io.fd.honeycomb.translate.vpp.util.Ipv4Translator;
+import io.fd.hc2vpp.lisp.context.util.EidMappingContext;
+import io.fd.hc2vpp.common.translate.util.Ipv4Translator;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import io.fd.vpp.jvpp.core.dto.LispAddDelRemoteMapping;
  import io.fd.vpp.jvpp.core.dto.LispAddDelRemoteMappingReply;
  import org.junit.Test;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/VniTableCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/VniTableCustomizerTest.java

similarity index 97%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/VniTableCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/VniTableCustomizerTest.java

index ac56896..885a6de 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/VniTableCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/VniTableCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
  
  import static org.junit.Assert.fail;
@@ -23,7 +23,7 @@ import static org.mockito.MockitoAnnotations.initMocks;
  
  import com.google.common.base.Optional;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import org.junit.Before;
  import org.junit.Test;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.eid.table.grouping.eid.table.VniTable;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/VrfSubtableCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizerTest.java

similarity index 97%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/VrfSubtableCustomizerTest.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizerTest.java

index 3f814bf..7991cd9 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/VrfSubtableCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizerTest.java
@@ -14,13 +14,13 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write;
+package io.fd.hc2vpp.lisp.translate.write;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertTrue;
  import static org.junit.Assert.fail;
  
-import io.fd.honeycomb.lisp.translate.write.trait.SubtableWriterTestCase;
+import io.fd.hc2vpp.lisp.translate.write.trait.SubtableWriterTestCase;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.VppCallbackException;
  import org.junit.Before;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/trait/SubtableWriterTestCase.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriterTestCase.java

similarity index 95%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/trait/SubtableWriterTestCase.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriterTestCase.java

index 3f80ae5..50186cd 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/trait/SubtableWriterTestCase.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriterTestCase.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.translate.write.trait;
+package io.fd.hc2vpp.lisp.translate.write.trait;
  
  
  import static org.junit.Assert.assertEquals;
@@ -23,7 +23,7 @@ import static org.mockito.Mockito.times;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import io.fd.vpp.jvpp.core.dto.LispEidTableAddDelMap;
  import io.fd.vpp.jvpp.core.dto.LispEidTableAddDelMapReply;
  import org.mockito.ArgumentCaptor;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/util/AdjacencyMappingContextTestHelper.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/util/AdjacencyMappingContextTestHelper.java

similarity index 99%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/util/AdjacencyMappingContextTestHelper.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/util/AdjacencyMappingContextTestHelper.java

index 1d66154..622a5e9 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/util/AdjacencyMappingContextTestHelper.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/util/AdjacencyMappingContextTestHelper.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.util;
+package io.fd.hc2vpp.lisp.util;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  import static org.mockito.Mockito.doReturn;
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/util/EidMappingContextHelper.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/util/EidMappingContextHelper.java

similarity index 99%

rename from lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/util/EidMappingContextHelper.java

rename to lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/util/EidMappingContextHelper.java

index 70d5361..03c4948 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/util/EidMappingContextHelper.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/util/EidMappingContextHelper.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.lisp.util;
+package io.fd.hc2vpp.lisp.util;
  
  
  import static org.mockito.Mockito.doReturn;
diff --git a/lisp/pom.xml b/lisp/pom.xml

index 7b2c3e5..d6cc2e4 100755 (executable)
--- a/lisp/pom.xml
+++ b/lisp/pom.xml
@@ -20,10 +20,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.lisp</groupId>
+    <groupId>io.fd.hc2vpp.lisp</groupId>
      <artifactId>lisp-aggregator</artifactId>
      <version>1.16.12-SNAPSHOT</version>
      <name>${project.artifactId}</name>
diff --git a/nat/nat-api/pom.xml b/nat/nat-api/pom.xml

index 13d8f0c..8061690 100644 (file)
--- a/nat/nat-api/pom.xml
+++ b/nat/nat-api/pom.xml
@@ -13,15 +13,15 @@
   See the License for the specific language governing permissions and
   limitations under the License.
  --><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.common</groupId>
      <artifactId>api-parent</artifactId>
-    <relativePath>../../common/api-parent</relativePath>
      <version>1.16.12-SNAPSHOT</version>
    </parent>
  
    <modelVersion>4.0.0</modelVersion>
-  <groupId>io.fd.honeycomb.nat</groupId>
+  <groupId>io.fd.hc2vpp.nat</groupId>
    <artifactId>nat-api</artifactId>
    <name>${project.artifactId}</name>
    <version>1.16.12-SNAPSHOT</version>
@@ -53,7 +53,7 @@
        <artifactId>yang-ext</artifactId>
      </dependency>
      <dependency>
-      <groupId>io.fd.honeycomb.vpp</groupId>
+      <groupId>io.fd.hc2vpp.common</groupId>
        <artifactId>naming-context-api</artifactId>
        <version>${naming.context.version}</version>
      </dependency>
diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml

index ad81e06..60eb7d4 100644 (file)
--- a/nat/nat2vpp/pom.xml
+++ b/nat/nat2vpp/pom.xml
@@ -15,14 +15,14 @@
  -->
  <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>
          <relativePath>../../vpp-common/vpp-impl-parent</relativePath>
          <version>1.16.12-SNAPSHOT</version>
      </parent>
  
      <modelVersion>4.0.0</modelVersion>
-    <groupId>io.fd.honeycomb.nat</groupId>
+    <groupId>io.fd.hc2vpp.nat</groupId>
      <artifactId>nat2vpp</artifactId>
      <name>${project.artifactId}</name>
      <version>1.16.12-SNAPSHOT</version>
@@ -30,7 +30,7 @@
  
      <properties>
          <honeycomb.infra.version>1.16.12-SNAPSHOT</honeycomb.infra.version>
-        <honeycomb.vpp.common.version>1.16.12-SNAPSHOT</honeycomb.vpp.common.version>
+        <hc2vpp.common.version>1.16.12-SNAPSHOT</hc2vpp.common.version>
      </properties>
  
      <dependencies>
@@ -42,7 +42,7 @@
  
          <!--VPP common-->
          <dependency>
-            <groupId>io.fd.honeycomb.vpp</groupId>
+            <groupId>io.fd.hc2vpp.common</groupId>
              <artifactId>vpp-translate-utils</artifactId>
          </dependency>
  
@@ -102,9 +102,9 @@
              <scope>test</scope>
          </dependency>
          <dependency>
-            <groupId>io.fd.honeycomb.vpp</groupId>
+            <groupId>io.fd.hc2vpp.common</groupId>
              <artifactId>vpp-translate-test</artifactId>
-            <version>${honeycomb.vpp.common.version}</version>
+            <version>${hc2vpp.common.version}</version>
              <scope>test</scope>
          </dependency>
          <dependency>
diff --git a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/NatModule.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/NatModule.java

similarity index 87%

rename from nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/NatModule.java

rename to nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/NatModule.java

index adaaca9..53f7560 100644 (file)
--- a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/NatModule.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/NatModule.java
@@ -14,19 +14,19 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat;
+package io.fd.hc2vpp.nat;
  
  import com.google.common.annotations.VisibleForTesting;
  import com.google.inject.AbstractModule;
  import com.google.inject.Provider;
  import com.google.inject.Singleton;
  import com.google.inject.multibindings.Multibinder;
-import io.fd.honeycomb.nat.jvpp.JVppSnatProvider;
-import io.fd.honeycomb.nat.read.NatReaderFactory;
-import io.fd.honeycomb.nat.read.ifc.IfcNatReaderFactory;
-import io.fd.honeycomb.nat.util.MappingEntryContext;
-import io.fd.honeycomb.nat.write.NatWriterFactory;
-import io.fd.honeycomb.nat.write.ifc.IfcNatWriterFactory;
+import io.fd.hc2vpp.nat.jvpp.JVppSnatProvider;
+import io.fd.hc2vpp.nat.read.NatReaderFactory;
+import io.fd.hc2vpp.nat.read.ifc.IfcNatReaderFactory;
+import io.fd.hc2vpp.nat.util.MappingEntryContext;
+import io.fd.hc2vpp.nat.write.NatWriterFactory;
+import io.fd.hc2vpp.nat.write.ifc.IfcNatWriterFactory;
  import io.fd.honeycomb.translate.read.ReaderFactory;
  import io.fd.honeycomb.translate.write.WriterFactory;
  import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade;
diff --git a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/jvpp/JVppSnatProvider.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/jvpp/JVppSnatProvider.java

similarity index 98%

rename from nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/jvpp/JVppSnatProvider.java

rename to nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/jvpp/JVppSnatProvider.java

index b836656..c16bcba 100755 (executable)
--- a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/jvpp/JVppSnatProvider.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/jvpp/JVppSnatProvider.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat.jvpp;
+package io.fd.hc2vpp.nat.jvpp;
  
  import com.google.inject.Inject;
  import io.fd.honeycomb.infra.distro.ProviderTrait;
diff --git a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/ExternalIpPoolCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizer.java

similarity index 97%

rename from nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/ExternalIpPoolCustomizer.java

rename to nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizer.java

index 0650280..615d9c7 100644 (file)
--- a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/ExternalIpPoolCustomizer.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat.read;
+package io.fd.hc2vpp.nat.read;
  
  import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
@@ -23,8 +23,8 @@ import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
  import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
  import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor;
-import io.fd.honeycomb.translate.vpp.util.Ipv4Translator;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.Ipv4Translator;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.vpp.jvpp.snat.dto.SnatAddressDetails;
  import io.fd.vpp.jvpp.snat.dto.SnatAddressDetailsReplyDump;
  import io.fd.vpp.jvpp.snat.dto.SnatAddressDump;
diff --git a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/MappingEntryCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizer.java

similarity index 97%

rename from nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/MappingEntryCustomizer.java

rename to nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizer.java

index df0a8e8..75e06c2 100644 (file)
--- a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/MappingEntryCustomizer.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizer.java
@@ -14,9 +14,9 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat.read;
+package io.fd.hc2vpp.nat.read;
  
-import io.fd.honeycomb.nat.util.MappingEntryContext;
+import io.fd.hc2vpp.nat.util.MappingEntryContext;
  import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.Initialized;
@@ -24,8 +24,8 @@ import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
  import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
  import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor;
-import io.fd.honeycomb.translate.vpp.util.Ipv4Translator;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.Ipv4Translator;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.vpp.jvpp.snat.dto.SnatStaticMappingDetails;
  import io.fd.vpp.jvpp.snat.dto.SnatStaticMappingDetailsReplyDump;
  import io.fd.vpp.jvpp.snat.dto.SnatStaticMappingDump;
diff --git a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/NatInstanceCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizer.java

similarity index 99%

rename from nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/NatInstanceCustomizer.java

rename to nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizer.java

index 56965f7..9542587 100644 (file)
--- a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/NatInstanceCustomizer.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat.read;
+package io.fd.hc2vpp.nat.read;
  
  import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
diff --git a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/NatReaderFactory.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatReaderFactory.java

similarity index 98%

rename from nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/NatReaderFactory.java

rename to nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatReaderFactory.java

index ff0d188..76c4785 100644 (file)
--- a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/NatReaderFactory.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatReaderFactory.java
@@ -14,11 +14,11 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat.read;
+package io.fd.hc2vpp.nat.read;
  
  import com.google.common.collect.Sets;
  import com.google.inject.Inject;
-import io.fd.honeycomb.nat.util.MappingEntryContext;
+import io.fd.hc2vpp.nat.util.MappingEntryContext;
  import io.fd.honeycomb.translate.impl.read.GenericInitListReader;
  import io.fd.honeycomb.translate.read.ReaderFactory;
  import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder;
diff --git a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/ifc/AbstractInterfaceNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractInterfaceNatCustomizer.java

similarity index 97%

rename from nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/ifc/AbstractInterfaceNatCustomizer.java

rename to nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractInterfaceNatCustomizer.java

index f4d4590..d6cc2b1 100644 (file)
--- a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/ifc/AbstractInterfaceNatCustomizer.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractInterfaceNatCustomizer.java
@@ -14,14 +14,14 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat.read.ifc;
+package io.fd.hc2vpp.nat.read.ifc;
  
  import com.google.common.base.Optional;
  import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer;
  import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.snat.dto.SnatInterfaceDetails;
  import io.fd.vpp.jvpp.snat.dto.SnatInterfaceDetailsReplyDump;
  import javax.annotation.Nonnull;
diff --git a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/ifc/IfcNatReaderFactory.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/IfcNatReaderFactory.java

similarity index 96%

rename from nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/ifc/IfcNatReaderFactory.java

rename to nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/IfcNatReaderFactory.java

index 761986f..87a70f7 100644 (file)
--- a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/ifc/IfcNatReaderFactory.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/IfcNatReaderFactory.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat.read.ifc;
+package io.fd.hc2vpp.nat.read.ifc;
  
  
  import com.google.inject.Inject;
@@ -25,8 +25,8 @@ import io.fd.honeycomb.translate.read.ReaderFactory;
  import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder;
  import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
  import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.snat.dto.SnatInterfaceDetailsReplyDump;
  import io.fd.vpp.jvpp.snat.dto.SnatInterfaceDump;
  import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade;
diff --git a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/ifc/InterfaceInboundNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizer.java

similarity index 97%

rename from nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/ifc/InterfaceInboundNatCustomizer.java

rename to nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizer.java

index 3e4b60f..ea3d05f 100644 (file)
--- a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/ifc/InterfaceInboundNatCustomizer.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizer.java
@@ -14,13 +14,13 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat.read.ifc;
+package io.fd.hc2vpp.nat.read.ifc;
  
  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.util.read.cache.DumpCacheManager;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.snat.dto.SnatInterfaceDetails;
  import io.fd.vpp.jvpp.snat.dto.SnatInterfaceDetailsReplyDump;
  import javax.annotation.Nonnull;
diff --git a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/ifc/InterfaceOutboundNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InterfaceOutboundNatCustomizer.java

similarity index 97%

rename from nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/ifc/InterfaceOutboundNatCustomizer.java

rename to nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InterfaceOutboundNatCustomizer.java

index da940c8..c4974b9 100644 (file)
--- a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/ifc/InterfaceOutboundNatCustomizer.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InterfaceOutboundNatCustomizer.java
@@ -14,12 +14,12 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat.read.ifc;
+package io.fd.hc2vpp.nat.read.ifc;
  
  import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.spi.read.Initialized;
  import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.snat.dto.SnatInterfaceDetails;
  import io.fd.vpp.jvpp.snat.dto.SnatInterfaceDetailsReplyDump;
  import javax.annotation.Nonnull;
diff --git a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/util/MappingEntryContext.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/util/MappingEntryContext.java

similarity index 99%

rename from nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/util/MappingEntryContext.java

rename to nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/util/MappingEntryContext.java

index 0f2df7e..6db8d46 100644 (file)
--- a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/util/MappingEntryContext.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/util/MappingEntryContext.java
@@ -14,14 +14,14 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat.util;
+package io.fd.hc2vpp.nat.util;
  
  import static com.google.common.base.Preconditions.checkArgument;
  
  import com.google.common.annotations.VisibleForTesting;
  import com.google.common.base.Optional;
  import io.fd.honeycomb.translate.MappingContext;
-import io.fd.honeycomb.translate.vpp.util.Ipv4Translator;
+import io.fd.hc2vpp.common.translate.util.Ipv4Translator;
  import io.fd.vpp.jvpp.snat.dto.SnatStaticMappingDetails;
  import java.util.Collections;
  import java.util.Comparator;
diff --git a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/ExternalIpPoolCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizer.java

similarity index 95%

rename from nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/ExternalIpPoolCustomizer.java

rename to nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizer.java

index 856bc13..505318c 100644 (file)
--- a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/ExternalIpPoolCustomizer.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizer.java
@@ -14,14 +14,14 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat.write;
+package io.fd.hc2vpp.nat.write;
  
  import static com.google.common.base.Preconditions.checkArgument;
  
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.Ipv4AddressRange;
-import io.fd.honeycomb.translate.vpp.util.Ipv4Translator;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.Ipv4AddressRange;
+import io.fd.hc2vpp.common.translate.util.Ipv4Translator;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.snat.dto.SnatAddAddressRange;
diff --git a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/MappingEntryCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizer.java

similarity index 97%

rename from nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/MappingEntryCustomizer.java

rename to nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizer.java

index 7856069..c5417d9 100644 (file)
--- a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/MappingEntryCustomizer.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizer.java
@@ -14,15 +14,15 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat.write;
+package io.fd.hc2vpp.nat.write;
  
  import static com.google.common.base.Preconditions.checkArgument;
  
  import com.google.common.base.Optional;
-import io.fd.honeycomb.nat.util.MappingEntryContext;
+import io.fd.hc2vpp.nat.util.MappingEntryContext;
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.Ipv4Translator;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.Ipv4Translator;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.snat.dto.SnatAddStaticMapping;
diff --git a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/NatInstaceCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatInstaceCustomizer.java

similarity index 98%

rename from nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/NatInstaceCustomizer.java

rename to nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatInstaceCustomizer.java

index 3cc477d..5d1c2b5 100644 (file)
--- a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/NatInstaceCustomizer.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatInstaceCustomizer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat.write;
+package io.fd.hc2vpp.nat.write;
  
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
  import io.fd.honeycomb.translate.write.WriteContext;
diff --git a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/NatWriterFactory.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatWriterFactory.java

similarity index 97%

rename from nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/NatWriterFactory.java

rename to nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatWriterFactory.java

index 7887d46..e239721 100644 (file)
--- a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/NatWriterFactory.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatWriterFactory.java
@@ -14,11 +14,11 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat.write;
+package io.fd.hc2vpp.nat.write;
  
  import com.google.common.collect.Sets;
  import com.google.inject.Inject;
-import io.fd.honeycomb.nat.util.MappingEntryContext;
+import io.fd.hc2vpp.nat.util.MappingEntryContext;
  import io.fd.honeycomb.translate.impl.write.GenericListWriter;
  import io.fd.honeycomb.translate.write.WriterFactory;
  import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
diff --git a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/ifc/AbstractInterfaceNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/AbstractInterfaceNatCustomizer.java

similarity index 96%

rename from nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/ifc/AbstractInterfaceNatCustomizer.java

rename to nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/AbstractInterfaceNatCustomizer.java

index 64e7142..6893f0b 100644 (file)
--- a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/ifc/AbstractInterfaceNatCustomizer.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/AbstractInterfaceNatCustomizer.java
@@ -14,11 +14,11 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat.write.ifc;
+package io.fd.hc2vpp.nat.write.ifc;
  
  import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.snat.dto.SnatInterfaceAddDelFeature;
diff --git a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/ifc/IfcNatWriterFactory.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/IfcNatWriterFactory.java

similarity index 96%

rename from nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/ifc/IfcNatWriterFactory.java

rename to nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/IfcNatWriterFactory.java

index bf2c600..5cb10b7 100644 (file)
--- a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/ifc/IfcNatWriterFactory.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/IfcNatWriterFactory.java
@@ -14,12 +14,12 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat.write.ifc;
+package io.fd.hc2vpp.nat.write.ifc;
  
  import com.google.inject.Inject;
  import com.google.inject.name.Named;
  import io.fd.honeycomb.translate.impl.write.GenericWriter;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriterFactory;
  import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
  import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade;
diff --git a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/ifc/InterfaceInboundNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/InterfaceInboundNatCustomizer.java

similarity index 93%

rename from nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/ifc/InterfaceInboundNatCustomizer.java

rename to nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/InterfaceInboundNatCustomizer.java

index e72e12a..3f7c90b 100644 (file)
--- a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/ifc/InterfaceInboundNatCustomizer.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/InterfaceInboundNatCustomizer.java
@@ -14,9 +14,9 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat.write.ifc;
+package io.fd.hc2vpp.nat.write.ifc;
  
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade;
  import javax.annotation.Nonnull;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.nat.rev161214._interface.nat.attributes.nat.Inbound;
diff --git a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/ifc/InterfaceOutboundNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/InterfaceOutboundNatCustomizer.java

similarity index 93%

rename from nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/ifc/InterfaceOutboundNatCustomizer.java

rename to nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/InterfaceOutboundNatCustomizer.java

index 488edc7..970c38b 100644 (file)
--- a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/write/ifc/InterfaceOutboundNatCustomizer.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/InterfaceOutboundNatCustomizer.java
@@ -14,9 +14,9 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat.write.ifc;
+package io.fd.hc2vpp.nat.write.ifc;
  
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade;
  import javax.annotation.Nonnull;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.nat.rev161214._interface.nat.attributes.nat.Outbound;
diff --git a/nat/nat2vpp/src/test/java/io/fd/honeycomb/nat/NatModuleTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/NatModuleTest.java

similarity index 98%

rename from nat/nat2vpp/src/test/java/io/fd/honeycomb/nat/NatModuleTest.java

rename to nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/NatModuleTest.java

index f69672e..6052d7e 100644 (file)
--- a/nat/nat2vpp/src/test/java/io/fd/honeycomb/nat/NatModuleTest.java
+++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/NatModuleTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat;
+package io.fd.hc2vpp.nat;
  
  import static org.hamcrest.CoreMatchers.is;
  import static org.hamcrest.CoreMatchers.not;
@@ -34,7 +34,7 @@ import com.google.inject.testing.fieldbinder.BoundFieldModule;
  import io.fd.honeycomb.translate.read.ReaderFactory;
  import io.fd.honeycomb.translate.impl.read.registry.CompositeReaderRegistryBuilder;
  import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriterFactory;
  import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade;
  import java.util.HashSet;
diff --git a/nat/nat2vpp/src/test/java/io/fd/honeycomb/nat/read/ifc/InterfaceInboundNatCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizerTest.java

similarity index 96%

rename from nat/nat2vpp/src/test/java/io/fd/honeycomb/nat/read/ifc/InterfaceInboundNatCustomizerTest.java

rename to nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizerTest.java

index 3cef188..b5c0dab 100644 (file)
--- a/nat/nat2vpp/src/test/java/io/fd/honeycomb/nat/read/ifc/InterfaceInboundNatCustomizerTest.java
+++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat.read.ifc;
+package io.fd.hc2vpp.nat.read.ifc;
  
  import static org.junit.Assert.assertFalse;
  import static org.junit.Assert.assertTrue;
@@ -25,8 +25,8 @@ import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
  import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
  import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ReaderCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest;
  import io.fd.vpp.jvpp.snat.dto.SnatInterfaceDetails;
  import io.fd.vpp.jvpp.snat.dto.SnatInterfaceDetailsReplyDump;
  import org.junit.Test;
diff --git a/nat/nat2vpp/src/test/java/io/fd/honeycomb/nat/read/ifc/InterfaceOutboundNatCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceOutboundNatCustomizerTest.java

similarity index 94%

rename from nat/nat2vpp/src/test/java/io/fd/honeycomb/nat/read/ifc/InterfaceOutboundNatCustomizerTest.java

rename to nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceOutboundNatCustomizerTest.java

index c33e040..34f5b09 100644 (file)
--- a/nat/nat2vpp/src/test/java/io/fd/honeycomb/nat/read/ifc/InterfaceOutboundNatCustomizerTest.java
+++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceOutboundNatCustomizerTest.java
@@ -14,9 +14,9 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat.read.ifc;
+package io.fd.hc2vpp.nat.read.ifc;
  
-import static io.fd.honeycomb.nat.read.ifc.InterfaceInboundNatCustomizerTest.getId;
+import static io.fd.hc2vpp.nat.read.ifc.InterfaceInboundNatCustomizerTest.getId;
  import static org.junit.Assert.assertFalse;
  import static org.junit.Assert.assertTrue;
  
@@ -26,8 +26,8 @@ import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
  import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
  import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ReaderCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest;
  import io.fd.vpp.jvpp.snat.dto.SnatInterfaceDetails;
  import io.fd.vpp.jvpp.snat.dto.SnatInterfaceDetailsReplyDump;
  import org.junit.Test;
diff --git a/nat/nat2vpp/src/test/java/io/fd/honeycomb/nat/util/MappingEntryContextTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/util/MappingEntryContextTest.java

similarity index 99%

rename from nat/nat2vpp/src/test/java/io/fd/honeycomb/nat/util/MappingEntryContextTest.java

rename to nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/util/MappingEntryContextTest.java

index fee8def..4d8f807 100644 (file)
--- a/nat/nat2vpp/src/test/java/io/fd/honeycomb/nat/util/MappingEntryContextTest.java
+++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/util/MappingEntryContextTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.nat.util;
+package io.fd.hc2vpp.nat.util;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertFalse;
@@ -27,7 +27,7 @@ import static org.mockito.MockitoAnnotations.initMocks;
  import com.google.common.base.Optional;
  import com.google.common.collect.Lists;
  import io.fd.honeycomb.translate.MappingContext;
-import io.fd.honeycomb.translate.vpp.util.Ipv4Translator;
+import io.fd.hc2vpp.common.translate.util.Ipv4Translator;
  import io.fd.vpp.jvpp.snat.dto.SnatStaticMappingDetails;
  import java.util.Collections;
  import java.util.List;
diff --git a/nat/pom.xml b/nat/pom.xml

index 94d035d..742d3f2 100644 (file)
--- a/nat/pom.xml
+++ b/nat/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.nat</groupId>
+  <groupId>io.fd.hc2vpp.nat</groupId>
    <artifactId>nat-aggregator</artifactId>
    <version>1.16.12-SNAPSHOT</version>
    <name>nat-aggregator</name>
diff --git a/nsh/api/pom.xml b/nsh/api/pom.xml

index a6dc041..a9688dd 100644 (file)
--- a/nsh/api/pom.xml
+++ b/nsh/api/pom.xml
@@ -19,11 +19,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.vppnsh</groupId>
+  <groupId>io.fd.hc2vpp.nsh</groupId>
    <artifactId>vppnsh-api</artifactId>
    <name>${project.artifactId}</name>
    <version>1.16.12-SNAPSHOT</version>
diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml

index 8cd0dab..776e0fd 100644 (file)
--- a/nsh/impl/pom.xml
+++ b/nsh/impl/pom.xml
@@ -18,11 +18,11 @@
      <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.vppnsh</groupId>
+  <groupId>io.fd.hc2vpp.nsh</groupId>
    <artifactId>vppnsh-impl</artifactId>
    <name>${project.artifactId}</name>
    <version>1.16.12-SNAPSHOT</version>
@@ -97,12 +97,12 @@
          <version>16.12-SNAPSHOT</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>
      <dependency>
-      <groupId>io.fd.honeycomb.vpp</groupId>
+      <groupId>io.fd.hc2vpp.common</groupId>
        <artifactId>vpp-translate-test</artifactId>
        <version>${project.version}</version>
      </dependency>
diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/VppNshModule.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/VppNshModule.java

similarity index 90%

rename from nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/VppNshModule.java

rename to nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/VppNshModule.java

index 90c826d..1964faf 100755 (executable)
--- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/VppNshModule.java
+++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/VppNshModule.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.vppnsh.impl;
+package io.fd.hc2vpp.vppnsh.impl;
  
  import com.google.common.annotations.VisibleForTesting;
  import com.google.inject.AbstractModule;
@@ -23,11 +23,11 @@ import com.google.inject.Singleton;
  import com.google.inject.multibindings.Multibinder;
  import com.google.inject.name.Names;
  import io.fd.honeycomb.translate.read.ReaderFactory;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriterFactory;
-import io.fd.honeycomb.vppnsh.impl.config.VppNshWriterFactory;
-import io.fd.honeycomb.vppnsh.impl.oper.VppNshReaderFactory;
-import io.fd.honeycomb.vppnsh.impl.util.JVppNshProvider;
+import io.fd.hc2vpp.vppnsh.impl.config.VppNshWriterFactory;
+import io.fd.hc2vpp.vppnsh.impl.oper.VppNshReaderFactory;
+import io.fd.hc2vpp.vppnsh.impl.util.JVppNshProvider;
  import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh;
  import io.fd.vpp.jvpp.nsh.future.FutureJVppNshFacade;
  import org.slf4j.Logger;
diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/NshEntryWriterCustomizer.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizer.java

similarity index 96%

rename from nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/NshEntryWriterCustomizer.java

rename to nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizer.java

index 795e8b9..50b0fa6 100755 (executable)
--- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/NshEntryWriterCustomizer.java
+++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizer.java
@@ -14,19 +14,19 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.vppnsh.impl.config;
+package io.fd.hc2vpp.vppnsh.impl.config;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  import static com.google.common.base.Preconditions.checkState;
  
  import io.fd.honeycomb.translate.MappingContext;
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vppnsh.impl.util.FutureJVppNshCustomizer;
+import io.fd.hc2vpp.vppnsh.impl.util.FutureJVppNshCustomizer;
  import io.fd.vpp.jvpp.nsh.dto.NshAddDelEntry;
  import io.fd.vpp.jvpp.nsh.dto.NshAddDelEntryReply;
  import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh;
diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/NshMapWriterCustomizer.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizer.java

similarity index 95%

rename from nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/NshMapWriterCustomizer.java

rename to nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizer.java

index 7014759..72ae785 100755 (executable)
--- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/NshMapWriterCustomizer.java
+++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizer.java
@@ -14,19 +14,19 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.vppnsh.impl.config;
+package io.fd.hc2vpp.vppnsh.impl.config;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  import static com.google.common.base.Preconditions.checkState;
  
  import io.fd.honeycomb.translate.MappingContext;
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vppnsh.impl.util.FutureJVppNshCustomizer;
+import io.fd.hc2vpp.vppnsh.impl.util.FutureJVppNshCustomizer;
  import io.fd.vpp.jvpp.nsh.dto.NshAddDelMap;
  import io.fd.vpp.jvpp.nsh.dto.NshAddDelMapReply;
  import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh;
diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/VppNshWriterFactory.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/VppNshWriterFactory.java

similarity index 97%

rename from nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/VppNshWriterFactory.java

rename to nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/VppNshWriterFactory.java

index 61c442e..530db4e 100755 (executable)
--- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/VppNshWriterFactory.java
+++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/VppNshWriterFactory.java
@@ -14,13 +14,13 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.vppnsh.impl.config;
+package io.fd.hc2vpp.vppnsh.impl.config;
  
  import com.google.common.collect.Sets;
  import com.google.inject.Inject;
  import com.google.inject.name.Named;
  import io.fd.honeycomb.translate.impl.write.GenericListWriter;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriterFactory;
  import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
  import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh;
diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshEntryReaderCustomizer.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizer.java

similarity index 97%

rename from nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshEntryReaderCustomizer.java

rename to nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizer.java

index 066fb10..00a9025 100755 (executable)
--- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshEntryReaderCustomizer.java
+++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.vppnsh.impl.oper;
+package io.fd.hc2vpp.vppnsh.impl.oper;
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static com.google.common.base.Preconditions.checkNotNull;
@@ -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.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vppnsh.impl.util.FutureJVppNshCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.vppnsh.impl.util.FutureJVppNshCustomizer;
  import io.fd.vpp.jvpp.nsh.dto.NshEntryDetails;
  import io.fd.vpp.jvpp.nsh.dto.NshEntryDetailsReplyDump;
  import io.fd.vpp.jvpp.nsh.dto.NshEntryDump;
diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizer.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizer.java

similarity index 97%

rename from nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizer.java

rename to nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizer.java

index 75ff21f..5680d84 100755 (executable)
--- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizer.java
+++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.vppnsh.impl.oper;
+package io.fd.hc2vpp.vppnsh.impl.oper;
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static com.google.common.base.Preconditions.checkNotNull;
@@ -24,9 +24,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.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vppnsh.impl.util.FutureJVppNshCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.vppnsh.impl.util.FutureJVppNshCustomizer;
  import io.fd.vpp.jvpp.nsh.dto.NshMapDetails;
  import io.fd.vpp.jvpp.nsh.dto.NshMapDetailsReplyDump;
  import io.fd.vpp.jvpp.nsh.dto.NshMapDump;
diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/VppNshReaderFactory.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/VppNshReaderFactory.java

similarity index 97%

rename from nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/VppNshReaderFactory.java

rename to nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/VppNshReaderFactory.java

index 5eb5466..6f941ae 100755 (executable)
--- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/VppNshReaderFactory.java
+++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/VppNshReaderFactory.java
@@ -14,14 +14,14 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.vppnsh.impl.oper;
+package io.fd.hc2vpp.vppnsh.impl.oper;
  
  import com.google.inject.Inject;
  import com.google.inject.name.Named;
  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.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh;
  import javax.annotation.Nonnull;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.VppNshState;
diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/FutureJVppNshCustomizer.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/FutureJVppNshCustomizer.java

similarity index 96%

rename from nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/FutureJVppNshCustomizer.java

rename to nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/FutureJVppNshCustomizer.java

index f9b0b3b..ced6fa7 100755 (executable)
--- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/FutureJVppNshCustomizer.java
+++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/FutureJVppNshCustomizer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.vppnsh.impl.util;
+package io.fd.hc2vpp.vppnsh.impl.util;
  
  import com.google.common.annotations.Beta;
  import com.google.common.base.Preconditions;
diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/JVppNshProvider.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/JVppNshProvider.java

similarity index 98%

rename from nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/JVppNshProvider.java

rename to nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/JVppNshProvider.java

index 6778bae..bc09241 100755 (executable)
--- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/JVppNshProvider.java
+++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/JVppNshProvider.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.vppnsh.impl.util;
+package io.fd.hc2vpp.vppnsh.impl.util;
  
  import com.google.inject.Inject;
  import io.fd.honeycomb.infra.distro.ProviderTrait;
diff --git a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/VppNshModuleTest.java b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/VppNshModuleTest.java

similarity index 97%

rename from nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/VppNshModuleTest.java

rename to nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/VppNshModuleTest.java

index 0da2c1b..4bf5f25 100644 (file)
--- a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/VppNshModuleTest.java
+++ b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/VppNshModuleTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.vppnsh.impl;
+package io.fd.hc2vpp.vppnsh.impl;
  
  import static org.hamcrest.CoreMatchers.is;
  import static org.hamcrest.CoreMatchers.not;
@@ -33,7 +33,7 @@ import com.google.inject.testing.fieldbinder.BoundFieldModule;
  import io.fd.honeycomb.translate.read.ReaderFactory;
  import io.fd.honeycomb.translate.impl.read.registry.CompositeReaderRegistryBuilder;
  import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriterFactory;
  import io.fd.vpp.jvpp.JVppRegistry;
  import io.fd.vpp.jvpp.nsh.future.FutureJVppNshFacade;
diff --git a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/config/NshEntryWriterCustomizerTest.java b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizerTest.java

similarity index 97%

rename from nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/config/NshEntryWriterCustomizerTest.java

rename to nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizerTest.java

index 23f8610..d519122 100644 (file)
--- a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/config/NshEntryWriterCustomizerTest.java
+++ b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.vppnsh.impl.config;
+package io.fd.hc2vpp.vppnsh.impl.config;
  
  import static org.junit.Assert.assertTrue;
  import static org.junit.Assert.fail;
@@ -22,9 +22,9 @@ import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.doReturn;
  import static org.mockito.Mockito.verify;
  
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import io.fd.vpp.jvpp.VppBaseCallException;
  import io.fd.vpp.jvpp.nsh.dto.NshAddDelEntry;
  import io.fd.vpp.jvpp.nsh.dto.NshAddDelEntryReply;
diff --git a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/config/NshMapWriterCustomizerTest.java b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizerTest.java

similarity index 97%

rename from nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/config/NshMapWriterCustomizerTest.java

rename to nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizerTest.java

index 39297d4..3794d80 100644 (file)
--- a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/config/NshMapWriterCustomizerTest.java
+++ b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.vppnsh.impl.config;
+package io.fd.hc2vpp.vppnsh.impl.config;
  
  import static org.junit.Assert.assertTrue;
  import static org.junit.Assert.fail;
@@ -22,9 +22,9 @@ import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.doReturn;
  import static org.mockito.Mockito.verify;
  
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import io.fd.vpp.jvpp.VppBaseCallException;
  import io.fd.vpp.jvpp.nsh.dto.NshAddDelMap;
  import io.fd.vpp.jvpp.nsh.dto.NshAddDelMapReply;
diff --git a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java

similarity index 97%

rename from nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java

rename to nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java

index 2921d07..4b0f108 100644 (file)
--- a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java
+++ b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.vppnsh.impl.oper;
+package io.fd.hc2vpp.vppnsh.impl.oper;
  
  import static org.junit.Assert.assertEquals;
  import static org.mockito.Matchers.any;
@@ -24,8 +24,8 @@ import static org.mockito.Mockito.verify;
  import com.google.common.collect.Lists;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ListReaderCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
  import io.fd.vpp.jvpp.VppBaseCallException;
  import io.fd.vpp.jvpp.nsh.dto.NshEntryDetails;
  import io.fd.vpp.jvpp.nsh.dto.NshEntryDetailsReplyDump;
diff --git a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizerTest.java b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizerTest.java

similarity index 97%

rename from nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizerTest.java

rename to nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizerTest.java

index 868f851..2424d94 100644 (file)
--- a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizerTest.java
+++ b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.vppnsh.impl.oper;
+package io.fd.hc2vpp.vppnsh.impl.oper;
  
  import static org.junit.Assert.assertEquals;
  import static org.mockito.Matchers.any;
@@ -24,8 +24,8 @@ import static org.mockito.Mockito.verify;
  import com.google.common.collect.Lists;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ListReaderCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
  import io.fd.vpp.jvpp.VppBaseCallException;
  import io.fd.vpp.jvpp.nsh.dto.NshMapDetails;
  import io.fd.vpp.jvpp.nsh.dto.NshMapDetailsReplyDump;
diff --git a/nsh/pom.xml b/nsh/pom.xml

index 52297d8..8ddfef8 100644 (file)
--- a/nsh/pom.xml
+++ b/nsh/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.nsh</groupId>
+  <groupId>io.fd.hc2vpp.nsh</groupId>
    <artifactId>vppnsh-aggregator</artifactId>
    <version>1.16.12-SNAPSHOT</version>
    <name>${project.artifactId}</name>
diff --git a/pom.xml b/pom.xml

new file mode 100644 (file)

index 0000000..22dbbdf
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2015 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.
+--><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.common</groupId>
+    <artifactId>honeycomb-parent</artifactId>
+    <version>1.16.12-SNAPSHOT</version>
+  </parent>
+
+  <groupId>io.fd.hc2vpp</groupId>
+  <artifactId>hc2vpp-aggregator</artifactId>
+  <version>1.16.12-SNAPSHOT</version>
+  <name>hc2vpp</name>
+  <packaging>pom</packaging>
+  <modelVersion>4.0.0</modelVersion>
+
+  <description>Honeycomb based management agent for VPP</description>
+
+  <scm>
+    <url>https://git.fd.io/cgit/hc2vpp/tree/</url>
+  </scm>
+
+  <modules>
+    <module>vpp-common</module>
+    <module>v3po</module>
+    <module>ioam</module>
+    <module>nsh</module>
+    <module>routing</module>
+    <module>nat</module>
+    <module>lisp</module>
+    <module>release-notes</module>
+    <module>vpp-integration</module>
+  </modules>
+</project>
diff --git a/release-notes/pom.xml b/release-notes/pom.xml

index 2f08472..a29ee5d 100644 (file)
--- a/release-notes/pom.xml
+++ b/release-notes/pom.xml
@@ -20,10 +20,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.nat</groupId>
+  <groupId>io.fd.hc2vpp</groupId>
    <artifactId>release-notes-aggregator</artifactId>
    <version>1.16.12-SNAPSHOT</version>
    <name>${project.artifactId}</name>
@@ -87,7 +86,7 @@
                  <!-- TODO set snapshot version to project-snat-version after VPP is released-->
                  <!--<project-snat-snapshot-version>1.0</project-snat-snapshot-version>-->
                  <project-snat-snapshot-version>1.0-SNAPSHOT</project-snat-snapshot-version>
-                <project-git-web>https://git.fd.io/cgit/honeycomb/tree</project-git-web>
+                <project-git-web>https://git.fd.io/cgit/hc2vpp/tree</project-git-web>
                </attributes>
              </configuration>
            </execution>
diff --git a/release-notes/src/main/asciidoc/devel_guide/devel_guide.adoc b/release-notes/src/main/asciidoc/devel_guide/devel_guide.adoc

index 78664e6..5d664ec 100644 (file)
--- a/release-notes/src/main/asciidoc/devel_guide/devel_guide.adoc
+++ b/release-notes/src/main/asciidoc/devel_guide/devel_guide.adoc
@@ -3,8 +3,8 @@
  Honeycomb plugin development guide.
  
  === Tutorials
-* link:devel_plugin_overview.html[Honeycomb plugin overview]
-* link:devel_plugin_tutorial.html[How to write Honeycomb plugins]
+!!!!! fixme link here tutorials from honeycomb !!!!!
+
  * link:devel_plugin_vpp_tutorial.html[How to write Honeycomb plugins for VPP]
  
  === Samples
diff --git a/release-notes/src/main/asciidoc/devel_guide/devel_plugin_overview.adoc b/release-notes/src/main/asciidoc/devel_guide/devel_plugin_overview.adoc

deleted file mode 100644 (file)

index d844a2f..0000000
--- a/release-notes/src/main/asciidoc/devel_guide/devel_plugin_overview.adoc
+++ /dev/null
@@ -1,26 +0,0 @@
-= Plugin overview
-
-link:release_notes.html[< Home]
-
-Honeycomb provides a framework for plugins to participate in the data handling. The plugins use YANG modeling language to describe what:
-
-* *data* they can handle (Create, Read, Update, Delete operations)
-* *notifications* do they emit
-
-NOTE: RPCs are not supported in this release.
-
-A plugin usually consists of:
-
-* *YANG models* - These models contain data and notification definitions that are implemented by the plugin. ODL's Yangtools project is used to generate Java APIs from those models (called Binding Aware APIs in ODL) and are later used in the translation code.
-* *Set of readers* - Readers provide operational/state data from plugin or its underlying layer. This means that operational/state data is current state of the plugin or its underlying layer. Readers return these operational data by e.g. reading from underlying layer and transforming it into YANG modeled data.
-* *Set of writers* - Writers handle configuration data for the plugin or its underlying layer This means that configuration data is the intent being sent to Honeycomb, that should be passed to plugins or their underlying layers. Writers handle these configuration data by transforming YANG modeled data into e.g. underlying layer calls.
-* *Set of initializers* - Initializers are invoked right after Honeycomb starts. The gould here is to read current operational/state data of the plugin or its underlying layer and then transform the operational data into configuration data. This enables reconciliation in cases when Honeycomb looses it's persisted data, or is started fresh while the underlying layer already contains some configuration that is manifested as operational/state data
-* *Plugin configuration* - Usually configuration in json format + it's Java equivalent.
-* *Set of notification producers* - If there are any notifications, the producers transform the data into YANG model notifications and emit them.
-* *Module* - Small class instantiating & exposing plugin's components
-
-What's good to add:
-
-* *Unit tests*
-* *Documentation* (as Readme.adoc + update global release notes if the plugin is included into honeycomb integration distribution)
-* *Sample REST or NETCONF requests* (as POSTMAN request collection)
-\ No newline at end of file
diff --git a/release-notes/src/main/asciidoc/devel_guide/devel_plugin_tutorial.adoc b/release-notes/src/main/asciidoc/devel_guide/devel_plugin_tutorial.adoc

deleted file mode 100644 (file)

index 1efa49f..0000000
--- a/release-notes/src/main/asciidoc/devel_guide/devel_plugin_tutorial.adoc
+++ /dev/null
@@ -1,368 +0,0 @@
-= Developing generic plugins
-
-link:release_notes.html[< Home]
-
-Since Honeycomb is a generic agent. Any plugin (translation code) can be injected into the framework, creating a custom agent providing RESTCONF/NETCONF northbound interfaces out-of-box.
-
-== Developing plugin code
-
-Honeycomb provides a maven archetype to generate a plugin skeleton. To use that archetype, run maven:
-
-[subs="+attributes"]
- mvn -X archetype:generate -DarchetypeGroupId=io.fd.honeycomb.tools -DarchetypeArtifactId=honeycomb-plugin-archetype -DarchetypeVersion={project-version}
-
-Fill in the parameters e.g.
-
-[subs="+attributes"]
- groupId: io.fd.honeycomb.tutorial
- artifactId: sample-plugin
- version: {project-version}
- package: io.fd.honeycomb.tutorial
-
-And following structure should be created:
-
-[source]
-----
-sample-plugin/
-├── pom.xml
-├── sample-plugin-api
-│   ├── pom.xml
-│   └── src
-│       └── main
-│           ├── java
-│           └── yang
-│               └── sample-plugin.yang
-└── sample-plugin-impl
- ├── pom.xml
- ├── Readme.adoc
- └── src
-     ├── main
-     │   └── java
-     │       └── io
-     │           └── fd
-     │               └── honeycomb
-     │                   └── tutorial
-     │                       ├── CrudService.java
-     │                       ├── ElementCrudService.java
-     │                       ├── init
-     │                       │   └── ConfigDataInitializer.java
-     │                       ├── ModuleConfiguration.java
-     │                       ├── Module.java
-     │                       ├── read
-     │                       │   ├── ElementStateCustomizer.java
-     │                       │   └── ModuleStateReaderFactory.java
-     │                       └── write
-     │                           ├── ElementCustomizer.java
-     │                           └── ModuleWriterFactory.java
-     └── test
-         └── java
-----
-
-There are 2 modules:
-
-* sample-plugin-api - Contains YANG models and generates Java APIs from the models.
-* sample-plugin-impl - Contains: Readers, Writers, Initializers, Notification producers (not yet), Configuration and Wiring.
-
-There is plenty of comments within the code, so its is advised to import the code into an IDE and take a look around.
-
-*The archetype generates a plugin that is fully working right from the start*. Since it contains all the components necessary, works on a sample yang model and provides some sample values.
-
-== Building the code
-
-To build the code, just execute maven:
-
- mvn clean install
-
-And that's it. This is a working Honeycomb plugin.
-
-== Adding notifications
-
-No notification producer is generated by the archetype, but it is pretty straightforward to add one.
-
-First, the notification has to be defined in YANG (sample-plugin-api/src/main/yang/sample-plugin.yang) e.g.
-
-[source,yang]
-----
-notification sample-notification {
- leaf content {
-     type string;
- }
-}
-----
-
-Now rebuild the plugin to generate new APIs for our notification.
-
-Next part is implementing the Notification producer. First thing to do is to add a dependency on notification-api, since it's not included by default. Update sample-plugin-impl's pom file with:
-
-[source,xml]
-----
-<dependency>
-    <groupId>io.fd.honeycomb</groupId>
-    <artifactId>notification-api</artifactId>
-    <version>${honeycomb.infra.version}</version>
-</dependency>
-----
-
-Now, the producer code can be added:
-
-[source,java]
-----
-package io.fd.honeycomb.tutorial.notif;
-
-import io.fd.honeycomb.notification.ManagedNotificationProducer;
-import io.fd.honeycomb.notification.NotificationCollector;
-import java.util.Collection;
-import java.util.Collections;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.sample.plugin.rev160918.SampleNotification;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.sample.plugin.rev160918.SampleNotificationBuilder;
-import org.opendaylight.yangtools.yang.binding.Notification;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Notification producer for sample plugin
- */
-public class SampleNotificationProducer implements ManagedNotificationProducer {
-
-    private static final Logger LOG = LoggerFactory.getLogger(SampleNotificationProducer.class);
-
-    private Thread thread;
-
-    @Override
-    public void start(@Nonnull final NotificationCollector collector) {
-        LOG.info("Starting notification stream for interfaces");
-
-        // Simulating notification producer
-        thread = new Thread(() -> {
-            while(true) {
-                if (Thread.currentThread().isInterrupted()) {
-                    return;
-                }
-
-                try {
-                    Thread.sleep(2000);
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    break;
-                }
-
-                final SampleNotification notification = new SampleNotificationBuilder()
-                        .setContent("Hello world " + System.currentTimeMillis())
-                        .build();
-                LOG.info("Emitting notification: {}", notification);
-                collector.onNotification(notification);
-            }
-        }, "NotificationProducer");
-        thread.setDaemon(true);
-        thread.start();
-    }
-
-    @Override
-    public void stop() {
-        if(thread != null) {
-            thread.interrupt();
-        }
-    }
-
-    @Nonnull
-    @Override
-    public Collection<Class<? extends Notification>> getNotificationTypes() {
-        // Producing only this single type of notification
-        return Collections.singleton(SampleNotification.class);
-    }
-
-    @Override
-    public void close() throws Exception {
-        stop();
-    }
-}
-----
-
-This is placed sample-plugin/sample-plugin-impl/src/main/java/io/fd/honeycomb/tutorial/notif/SampleNotificationProducer.java.
-
-NOTE: This is a sample producer, that creates a thread to periodically emit a sample notification
-
-Now it needs to be exposed from the plugin. The configure method in Module class needs to be updated with:
-
-[source,java]
-----
-    Multibinder.newSetBinder(binder(), ManagedNotificationProducer.class).addBinding().to(SampleNotificationProducer.class);
-----
-
-Plugin needs to be rebuilt, but that's it for notification producers.
-
-== Creating custom distribution
-
-The plugin is now ready to have a Honeycomb distribution for it. This section will provides information on how to create a custom Honeycomb distribution.
-
-A new maven module needs to be created. So in sample-plugin folder:
-
- mkdir sample-distribution
- cd sample-distribution
- mkdir -p src/main/java/io/fd/honeycomb/tutorial
-
-Then create the pom:
-
-[source,xml,subs="+attributes"]
-----
-<?xml version="1.0" encoding="UTF-8"?>
-<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.common</groupId>
-    <artifactId>minimal-distribution-parent</artifactId>
-    <version>{project-version}</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>io.fd.honeycomb.tutorial</groupId>
-  <artifactId>sample-distribution</artifactId>
-  <version>{project-version}</version>
-
-  <properties>
-    <exec.parameters>-Xms128m -Xmx128m</exec.parameters>
-    <main.class>io.fd.honeycomb.tutorial.Main</main.class>
-    <interfaces.mapping.version>{project-version}</interfaces.mapping.version>
-    <honeycomb.min.distro.version>{project-version}</honeycomb.min.distro.version>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.gmaven</groupId>
-        <artifactId>groovy-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <!-- Dependency on sample plugin -->
-    <dependency>
-      <groupId>io.fd.honeycomb.tutorial</groupId>
-      <artifactId>sample-plugin-impl</artifactId>
-      <version>${interfaces.mapping.version}</version>
-    </dependency>
-    <!-- Dependency on distribution base -->
-    <dependency>
-      <groupId>io.fd.honeycomb</groupId>
-      <artifactId>minimal-distribution</artifactId>
-      <version>${honeycomb.min.distro.version}</version>
-    </dependency>
-
-  </dependencies>
-</project>
-----
-
-Now, Main class has to be added in folder src/main/java/io/fd/honeycomb/tutorial:
-
-[source,java]
-----
-package io.fd.honeycomb.tutorial;
-
-import com.google.common.collect.Lists;
-import com.google.inject.Module;
-import java.util.List;
-
-public class Main {
-
-    public static void main(String[] args) {
-        final List<Module> sampleModules = Lists.newArrayList(io.fd.honeycomb.infra.distro.Main.BASE_MODULES);
-
-        sampleModules.add(new io.fd.honeycomb.tutorial.Module());
-
-        io.fd.honeycomb.infra.distro.Main.init(sampleModules);
-    }
-}
-----
-
-Last thing to do is to update sample-plugin/pom.xml with:
-[source,xml]
-----
- <module>sample-distribution</module>
-----
-
-Another rebuild and the distribution should be created in sample-distribution/target.
-
-=== Adding existing plugins to the mix
-
-In previous section, a custom Honeycomb distribution was created. This section will show how to add existing plugins to the new distribution.
-
-So in order to add another existing sample (sample interface plugin from Honeycomb) into the distribution, update the sample-plugin/sample-distribution/pom.xml with:
-
-[source,xml]
-----
-<dependency>
-  <groupId>io.fd.honeycomb.samples.interfaces</groupId>
-  <artifactId>interfaces-mapping</artifactId>
-  <version>${interfaces.mapping.version}</version>
-</dependency>
-----
-
-Now in main, add this line:
-
-[source,java]
-----
-    sampleModules.add(new SampleInterfaceModule());
-----
-
-That's it, just rebuild.
-
-== Verifying distribution
-The distribution with this sample plugin and sample interface plugin is now available and can be tested.
-
-Distribution can now be found in sample-plugin/sample-distribution/target as:
-
-zip archive
-tar.gz archive
-folder
-The distribution can be started by:
-
-[subs="attributes"]
- sudo ./sample-distribution/target/sample-distribution-{project-version}-hc/sample-distribution-{project-version}/honeycomb
-
-NOTE: honeycomb-start script is the background alternative
-
-Honeycomb will display following message in the log:
-
- 2016-09-02 13:20:30.424 CEST [main] INFO  io.fd.honeycomb.infra.distro.Main - Honeycomb started successfully!
-
-and that means Honeycomb was started successfully.
-
-=== Testing over RESTCONF
-Reading sample-plugin operational data:
-
- curl -u admin:admin http://localhost:8181/restconf/operational/sample-plugin:sample-plugin-state
-
-Writing sample-plugin operational data:
-
- Not possible from YANG spec. Operational data is only for read.
-
-Writing sample-plugin config data:
-
- curl -H 'Content-Type: application/json' -H 'Accept: application/json' -u admin:admin -X PUT -d '{"sample-plugin":{"element":[{"id":10,"description":"This is a example of loaded data"}]}}' http://localhost:8181/restconf/config/sample-plugin:sample-plugin
-
-Reading sample-plugin config data:
-
- curl -u admin:admin http://localhost:8181/restconf/config/sample-plugin:sample-plugin
-
-=== Testing over NETCONF
-Netconf testing guide including Notifications, can be found in link:user_running_honeycomb.html[User guide]
-
-== Full working example
-Full working example on github: https://github.com/marosmars/honeycomb-samples
-
diff --git a/release-notes/src/main/asciidoc/release_notes.adoc b/release-notes/src/main/asciidoc/release_notes.adoc

index 940c8e0..2762501 100644 (file)
--- a/release-notes/src/main/asciidoc/release_notes.adoc
+++ b/release-notes/src/main/asciidoc/release_notes.adoc
@@ -1,6 +1,6 @@
  = Honeycomb {project-version} Release notes
  
-Release notes for honeycomb {project-version}. Based on VPP {project-vpp-snapshot-version}
+Release notes for honeycomb for VPP {project-version}. Based on VPP {project-vpp-snapshot-version}
  
  == Release plan
  https://wiki.fd.io/view/Honeycomb/Release_Plans/Release_Plan_{project-public-version}[Release plan]
@@ -16,10 +16,6 @@ Adding to the list of existing features: https://wiki.fd.io/view/Honeycomb/Relea
  
  === Modified features
  * ACL management improvements
-* https://jira.fd.io/browse/HONEYCOMB-73[Initializers tie-in with readers]
-** Instead of root level initializer, initialization can be split among multiple initializing readers
-* https://jira.fd.io/browse/HONEYCOMB-270[Readers/ReadCustomizers able to influence presence of resulting data]
-** Suitable for presence container readers
  
  === Deprecated features
  
diff --git a/routing/pom.xml b/routing/pom.xml

index e947d45..35e3576 100644 (file)
--- a/routing/pom.xml
+++ b/routing/pom.xml
@@ -20,10 +20,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.routing</groupId>
+    <groupId>io.fd.hc2vpp.routing</groupId>
      <artifactId>routing-aggregator</artifactId>
      <version>1.16.12-SNAPSHOT</version>
      <name>${project.artifactId}</name>
diff --git a/routing/routing-api/pom.xml b/routing/routing-api/pom.xml

index 92c8824..0f029d1 100644 (file)
--- a/routing/routing-api/pom.xml
+++ b/routing/routing-api/pom.xml
@@ -19,11 +19,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.routing</groupId>
+    <groupId>io.fd.hc2vpp.routing</groupId>
      <artifactId>routing-api</artifactId>
      <version>1.16.12-SNAPSHOT</version>
      <packaging>bundle</packaging>
@@ -62,7 +61,7 @@
              <artifactId>yang-ext</artifactId>
          </dependency>
          <dependency>
-            <groupId>io.fd.honeycomb.v3po</groupId>
+            <groupId>io.fd.hc2vpp.v3po</groupId>
              <artifactId>v3po-api</artifactId>
              <version>${project.version}</version>
          </dependency>
diff --git a/samples/asciidoc/Readme.adoc b/samples/asciidoc/Readme.adoc

deleted file mode 100644 (file)

index ed405fe..0000000
--- a/samples/asciidoc/Readme.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= samples-aggregator
-
-Overview of samples-aggregator
-\ No newline at end of file
diff --git a/samples/interfaces/asciidoc/Readme.adoc b/samples/interfaces/asciidoc/Readme.adoc

deleted file mode 100644 (file)

index 1ee4091..0000000
--- a/samples/interfaces/asciidoc/Readme.adoc
+++ /dev/null
@@ -1,8 +0,0 @@
-= Openconfig-interfaces sample
-This is a sample Honeycomb plugin implementing mapping for openconfig interfaces yang model
-
-== Data
-Only sample data are used, that are not actually handled
-
-== Notifications
-A sample notification was added to the models to showcase notification capabilities
diff --git a/samples/interfaces/mapping/asciidoc/Readme.adoc b/samples/interfaces/mapping/asciidoc/Readme.adoc

deleted file mode 100644 (file)

index a89aee3..0000000
--- a/samples/interfaces/mapping/asciidoc/Readme.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= interfaces-mapping
-
-Overview of interfaces-mapping
-\ No newline at end of file
diff --git a/samples/interfaces/mapping/pom.xml b/samples/interfaces/mapping/pom.xml

deleted file mode 100644 (file)

index 1bb3a4c..0000000
--- a/samples/interfaces/mapping/pom.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015 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.
--->
-<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.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.samples.interfaces</groupId>
-  <artifactId>interfaces-mapping</artifactId>
-  <name>${project.artifactId}</name>
-  <version>1.16.12-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <honeycomb.infra.version>1.16.12-SNAPSHOT</honeycomb.infra.version>
-    <sonar.skip>true</sonar.skip>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>interfaces-models</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.inject</groupId>
-      <artifactId>guice</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>net.jmob</groupId>
-      <artifactId>guice.conf</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.inject.extensions</groupId>
-      <artifactId>guice-multibindings</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>io.fd.honeycomb</groupId>
-      <artifactId>translate-impl</artifactId>
-      <version>${honeycomb.infra.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.fd.honeycomb</groupId>
-      <artifactId>translate-api</artifactId>
-      <version>${honeycomb.infra.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.fd.honeycomb</groupId>
-      <artifactId>notification-api</artifactId>
-      <version>${honeycomb.infra.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.fd.honeycomb</groupId>
-      <artifactId>cfg-init</artifactId>
-      <version>${honeycomb.infra.version}</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/LowerLayerAccess.java b/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/LowerLayerAccess.java

deleted file mode 100644 (file)

index 4b815bf..0000000
--- a/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/LowerLayerAccess.java
+++ /dev/null
@@ -1,71 +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.samples.interfaces.mapping;
-
-import com.google.common.collect.Lists;
-import com.google.inject.Inject;
-import io.fd.honeycomb.samples.interfaces.mapping.cfgattrs.InterfacesPluginConfiguration;
-import io.fd.honeycomb.translate.write.WriteContext;
-import java.util.ArrayList;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.interfaces.Interface;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This is a sample class representing common resource for readers and writers to access the lower layer
- */
-public final class LowerLayerAccess {
-
-    private static final Logger LOG = LoggerFactory.getLogger(LowerLayerAccess.class);
-
-    @Inject
-    public LowerLayerAccess(@Nonnull final InterfacesPluginConfiguration configuration) {
-        LOG.info("Creating lower layer access with configuration: {}", configuration);
-    }
-
-    public void writeInterface(final InstanceIdentifier<Interface> id, final Interface dataAfter,
-                               final WriteContext writeContext) {
-        LOG.info("Writing interface: {}. to {}", dataAfter, id);
-        // This is where actual write/propagation happens
-        dataAfter.getMtu();
-    }
-
-    public void deleteInterface(final InstanceIdentifier<Interface> id, final Interface dataBefore,
-                                final WriteContext writeContext) {
-        LOG.info("Deleting interface: {}. to {}", dataBefore, id);
-        final String ifcToBeDeleted = id.firstKeyOf(Interface.class).getInterfaceId().getValue();
-        // This is where actual write/propagation happens
-    }
-
-    public long getTotalPacketsForInterface(final String ifcName) {
-        return 500L;
-    }
-
-    public long getDroppedPacketsForIfc(final String ifcName) {
-        return 50L;
-    }
-
-    public ArrayList<String> getAllInterfaceNames() {
-        return Lists.newArrayList("ifc1", "ifc2");
-    }
-
-    public int getMtuForInterface(final String ifcName) {
-        return 66;
-    }
-}
diff --git a/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/SampleInterfaceModule.java b/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/SampleInterfaceModule.java

deleted file mode 100644 (file)

index ea8a727..0000000
--- a/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/SampleInterfaceModule.java
+++ /dev/null
@@ -1,51 +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.samples.interfaces.mapping;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Singleton;
-import com.google.inject.multibindings.Multibinder;
-import io.fd.honeycomb.notification.ManagedNotificationProducer;
-import io.fd.honeycomb.samples.interfaces.mapping.cfgattrs.InterfacesPluginConfiguration;
-import io.fd.honeycomb.samples.interfaces.mapping.config.InterfacesWriterFactory;
-import io.fd.honeycomb.samples.interfaces.mapping.notification.InterfaceUpNotificationProducer;
-import io.fd.honeycomb.samples.interfaces.mapping.oper.InterfacesReaderFactory;
-import io.fd.honeycomb.translate.read.ReaderFactory;
-import io.fd.honeycomb.translate.write.WriterFactory;
-import net.jmob.guice.conf.core.ConfigurationModule;
-
-/**
- * This is some glue code necessary for Honeycomb distribution to pick up the plugin classes
- */
-public final class SampleInterfaceModule extends AbstractModule {
-
-    @Override
-    protected void configure() {
-        // These are plugin specific config attributes
-        install(ConfigurationModule.create());
-        requestInjection(InterfacesPluginConfiguration.class);
-
-        // These are plugin's internal components
-        bind(LowerLayerAccess.class).in(Singleton.class);
-
-        // Below are classes picked up by HC framework
-        Multibinder.newSetBinder(binder(), WriterFactory.class).addBinding().to(InterfacesWriterFactory.class);
-        Multibinder.newSetBinder(binder(), ReaderFactory.class).addBinding().to(InterfacesReaderFactory.class);
-        Multibinder.newSetBinder(binder(), ManagedNotificationProducer.class).addBinding()
-                .to(InterfaceUpNotificationProducer.class);
-    }
-}
diff --git a/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/cfgattrs/InterfacesPluginConfiguration.java b/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/cfgattrs/InterfacesPluginConfiguration.java

deleted file mode 100644 (file)

index 881c18a..0000000
--- a/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/cfgattrs/InterfacesPluginConfiguration.java
+++ /dev/null
@@ -1,28 +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.samples.interfaces.mapping.cfgattrs;
-
-import net.jmob.guice.conf.core.BindConfig;
-import net.jmob.guice.conf.core.InjectConfig;
-import net.jmob.guice.conf.core.Syntax;
-
-@BindConfig(value = "sample-interfaces", syntax = Syntax.JSON)
-public class InterfacesPluginConfiguration {
-
-    @InjectConfig("some-config-attribute")
-    String someConfigAttribute;
-}
diff --git a/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/config/InterfaceWriterCustomizer.java b/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/config/InterfaceWriterCustomizer.java

deleted file mode 100644 (file)

index af185d8..0000000
--- a/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/config/InterfaceWriterCustomizer.java
+++ /dev/null
@@ -1,80 +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.samples.interfaces.mapping.config;
-
-import io.fd.honeycomb.samples.interfaces.mapping.LowerLayerAccess;
-import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.write.WriteContext;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.interfaces.Interface;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.interfaces.InterfaceKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This is a customizer responsible for writing(updating and also deleting) Interface config data
- */
-public class InterfaceWriterCustomizer implements ListWriterCustomizer<Interface, InterfaceKey> {
-
-    private static final Logger LOG = LoggerFactory.getLogger(InterfaceWriterCustomizer.class);
-
-    private final LowerLayerAccess access;
-
-    public InterfaceWriterCustomizer(final LowerLayerAccess access) {
-        this.access = access;
-    }
-
-    @Override
-    public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<Interface> id,
-                                       @Nonnull final Interface dataAfter, @Nonnull final WriteContext writeContext)
-            throws WriteFailedException {
-        try {
-            // Context can be used just like the context in ReadCustomizer see InterfaceReaderCustomizer
-            // + it also provides a window into the entire configuration tree before current transaction and during current transaction
-            // just in case, some additional data is necessary here
-            access.writeInterface(id, dataAfter, writeContext);
-        } catch (Exception e) {
-            throw new WriteFailedException.CreateFailedException(id, dataAfter, e);
-        }
-    }
-
-    @Override
-    public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<Interface> id,
-                                        @Nonnull final Interface dataBefore, @Nonnull final Interface dataAfter,
-                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        // There are cases when lower layer does not support all of the CRUD operations, in which case, the handler
-        // should look like this (This will reject configuration from upper layers, returning error/rpc-error):
-        throw new WriteFailedException.UpdateFailedException(id, dataBefore, dataAfter,
-                new UnsupportedOperationException("Unable to update interface data, unsupported at lower layer"));
-    }
-
-    @Override
-    public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<Interface> id,
-                                        @Nonnull final Interface dataBefore, @Nonnull final WriteContext writeContext)
-            throws WriteFailedException {
-        try {
-            // Context can be used just like the context in ReadCustomizer see InterfaceReaderCustomizer
-            // + it also provides a window into the entire configuration tree before current transaction and during current transaction
-            // just in case, some additional data is necessary here
-            access.deleteInterface(id, dataBefore, writeContext);
-        } catch (Exception e) {
-            throw new WriteFailedException.DeleteFailedException(id, e);
-        }
-    }
-}
diff --git a/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/config/InterfacesWriterFactory.java b/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/config/InterfacesWriterFactory.java

deleted file mode 100644 (file)

index d3b22c3..0000000
--- a/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/config/InterfacesWriterFactory.java
+++ /dev/null
@@ -1,54 +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.samples.interfaces.mapping.config;
-
-import com.google.inject.Inject;
-import io.fd.honeycomb.samples.interfaces.mapping.LowerLayerAccess;
-import io.fd.honeycomb.translate.impl.write.GenericListWriter;
-import io.fd.honeycomb.translate.write.WriterFactory;
-import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.Interfaces;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.interfaces.Interface;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class InterfacesWriterFactory implements WriterFactory {
-
-    @Nonnull
-    private final LowerLayerAccess access;
-
-    @Inject
-    public InterfacesWriterFactory(@Nonnull final LowerLayerAccess access) {
-        this.access = access;
-    }
-
-    @Override
-    public void init(@Nonnull final ModifiableWriterRegistryBuilder registry) {
-        // ReaderFactory is intended for registering Writers into HC framework
-        // Writers handle ONLY config (config "true") data coming from upper layers and propagate them into lower layer/device
-        // they are triggered when RESTCONF PUT/POST on config is invoked or when NETCONF edit-config + commit operation is executed
-
-        // Our model root for operational data is Interfaces
-        final InstanceIdentifier<Interfaces> root = InstanceIdentifier.create(Interfaces.class);
-        // But unlike ReaderFactories, there's no need to create a structural writer, we can "ignore" any nodes
-        // that do not contain actual data (leaves)
-
-        // Next child node is Interface (list)
-        final InstanceIdentifier<Interface> ifcListId = root.child(Interface.class);
-        registry.add(new GenericListWriter<>(ifcListId, new InterfaceWriterCustomizer(access)));
-    }
-}
diff --git a/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/notification/InterfaceUpNotificationProducer.java b/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/notification/InterfaceUpNotificationProducer.java

deleted file mode 100644 (file)

index 76d2c5d..0000000
--- a/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/notification/InterfaceUpNotificationProducer.java
+++ /dev/null
@@ -1,96 +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.samples.interfaces.mapping.notification;
-
-import com.google.inject.Inject;
-import io.fd.honeycomb.notification.ManagedNotificationProducer;
-import io.fd.honeycomb.notification.NotificationCollector;
-import io.fd.honeycomb.samples.interfaces.mapping.LowerLayerAccess;
-import java.util.Collection;
-import java.util.Collections;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.InterfaceId;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.InterfaceUp;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.InterfaceUpBuilder;
-import org.opendaylight.yangtools.yang.binding.Notification;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Notification producer for sample interfaces plugin
- */
-public class InterfaceUpNotificationProducer implements ManagedNotificationProducer {
-
-    private static final Logger LOG = LoggerFactory.getLogger(InterfaceUpNotificationProducer.class);
-
-    @Nonnull
-    private final LowerLayerAccess access;
-
-    private Thread thread;
-
-    @Inject
-    public InterfaceUpNotificationProducer(@Nonnull final LowerLayerAccess access) {
-        this.access = access;
-    }
-
-    @Override
-    public void start(@Nonnull final NotificationCollector collector) {
-        LOG.info("Starting notification stream for interfaces");
-
-        // Simulating notification producer
-        thread = new Thread(() -> {
-            while(true) {
-                if (Thread.currentThread().isInterrupted()) {
-                    return;
-                }
-
-                try {
-                    Thread.sleep(2000);
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    break;
-                }
-
-
-                final InterfaceUp ifc1 = new InterfaceUpBuilder().setInterfaceId(new InterfaceId("ifc1")).build();
-                LOG.info("Emitting notification: {}", ifc1);
-                collector.onNotification(ifc1);
-            }
-        }, "NotificationProducer");
-        thread.setDaemon(true);
-        thread.start();
-    }
-
-    @Override
-    public void stop() {
-        if(thread != null) {
-            thread.interrupt();
-        }
-    }
-
-    @Nonnull
-    @Override
-    public Collection<Class<? extends Notification>> getNotificationTypes() {
-        // Producing only this single type of notification
-        return Collections.singleton(InterfaceUp.class);
-    }
-
-    @Override
-    public void close() throws Exception {
-        stop();
-    }
-}
diff --git a/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/oper/CountersReaderCustomizer.java b/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/oper/CountersReaderCustomizer.java

deleted file mode 100644 (file)

index 71476ba..0000000
--- a/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/oper/CountersReaderCustomizer.java
+++ /dev/null
@@ -1,70 +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.samples.interfaces.mapping.oper;
-
-import io.fd.honeycomb.samples.interfaces.mapping.LowerLayerAccess;
-import io.fd.honeycomb.translate.read.ReadContext;
-import io.fd.honeycomb.translate.read.ReadFailedException;
-import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810._interface.state.Counters;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810._interface.state.CountersBuilder;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.interfaces.state.Interface;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.interfaces.state.InterfaceBuilder;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.interfaces.state.InterfaceKey;
-import org.opendaylight.yangtools.concepts.Builder;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This is a customizer responsible for reading Counters operational data
- */
-public class CountersReaderCustomizer implements ReaderCustomizer<Counters, CountersBuilder> {
-
-    private static final Logger LOG = LoggerFactory.getLogger(CountersReaderCustomizer.class);
-    private final LowerLayerAccess access;
-
-    public CountersReaderCustomizer(final LowerLayerAccess access) {
-        this.access = access;
-    }
-
-    @Nonnull
-    @Override
-    public CountersBuilder getBuilder(@Nonnull final InstanceIdentifier<Counters> id) {
-        return new CountersBuilder();
-    }
-
-    @Override
-    public void readCurrentAttributes(@Nonnull final InstanceIdentifier<Counters> id,
-                                      @Nonnull final CountersBuilder builder, @Nonnull final ReadContext ctx)
-            throws ReadFailedException {
-        // Get the information about which interface to get counters for
-        final InterfaceKey interfaceKey = id.firstKeyOf(Interface.class);
-        LOG.info("Reading counters for interface: {} at {}", interfaceKey.getInterfaceId(), id);
-
-        // Set some random data
-        builder.setDroppedPackets(access.getDroppedPacketsForIfc(interfaceKey.getInterfaceId().getValue()));
-        builder.setTotalPackets(access.getTotalPacketsForInterface(interfaceKey.getInterfaceId().getValue()));
-    }
-
-    @Override
-    public void merge(@Nonnull final Builder<? extends DataObject> parentBuilder, @Nonnull final Counters readValue) {
-        ((InterfaceBuilder) parentBuilder).setCounters(readValue);
-    }
-}
diff --git a/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/oper/InterfaceReaderCustomizer.java b/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/oper/InterfaceReaderCustomizer.java

deleted file mode 100644 (file)

index 850c139..0000000
--- a/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/oper/InterfaceReaderCustomizer.java
+++ /dev/null
@@ -1,120 +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.samples.interfaces.mapping.oper;
-
-import io.fd.honeycomb.samples.interfaces.mapping.LowerLayerAccess;
-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 java.util.List;
-import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.InterfaceId;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.Interfaces;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.InterfacesStateBuilder;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.interfaces.state.Interface;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.interfaces.state.InterfaceBuilder;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.interfaces.state.InterfaceKey;
-import org.opendaylight.yangtools.concepts.Builder;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This is a customizer responsible for reading Interface operational data
- */
-public class InterfaceReaderCustomizer implements
-        InitializingListReaderCustomizer<Interface, InterfaceKey, InterfaceBuilder> {
-
-    private static final Logger LOG = LoggerFactory.getLogger(InterfaceReaderCustomizer.class);
-    private final LowerLayerAccess access;
-
-    public InterfaceReaderCustomizer(final LowerLayerAccess access) {
-        this.access = access;
-    }
-
-    @Nonnull
-    @Override
-    public List<InterfaceKey> getAllIds(@Nonnull final InstanceIdentifier<Interface> id,
-                                        @Nonnull final ReadContext context) throws ReadFailedException {
-        // context can be used to access cache (lifetime during a transaction) to store any information for
-        // subsequent invocations or for other customizers
-        // context.getModificationCache();
-
-        // context can also be used to access context data. Context data are stored in a persistent data store
-        // and usually are additional data required to perform the translation in customizers e.g. if underlying layer
-        // does not recognize interface-ids as string names, but only indices, the mapping between them can should
-        // be stored in the context data store
-        // Note: The context datastore is also YANG drive, so context data must be modeled in YANG prior to using them
-        // context.getMappingContext();
-
-        // return some sample IDs
-        return access.getAllInterfaceNames().stream()
-                .map(InterfaceId::new)
-                .map(InterfaceKey::new)
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    public void merge(@Nonnull final Builder<? extends DataObject> builder, @Nonnull final List<Interface> readData) {
-        // Just set the result of this customizers read into parent builder
-        // Builder has to be cast properly
-        ((InterfacesStateBuilder) builder).setInterface(readData);
-    }
-
-    @Nonnull
-    @Override
-    public InterfaceBuilder getBuilder(@Nonnull final InstanceIdentifier<Interface> id) {
-        // Just providing empty builder
-        return new InterfaceBuilder();
-    }
-
-    @Override
-    public void readCurrentAttributes(@Nonnull final InstanceIdentifier<Interface> id,
-                                      @Nonnull final InterfaceBuilder builder, @Nonnull final ReadContext ctx)
-            throws ReadFailedException {
-        // This is where the actual "read" is happening, read attributes for a specific interface
-        final InterfaceKey k = id.firstKeyOf(Interface.class);
-        final String ifcId = k.getInterfaceId().getValue();
-        LOG.info("Reading data for interface: {} at {}", ifcId, id);
-
-        // Fill in some random values, this is actually the place where communication with lower layer
-        // would occur to get the real values
-        builder.setMtu(access.getMtuForInterface(ifcId));
-        builder.setInterfaceId(k.getInterfaceId());
-        // Counters container is not set here, instead a dedicated customizer is created for it
-        // It could be set here, if this customizer + its reader were marked as subtree reader in the ReaderFactory
-        // However its a good practice to provide a dedicated reader+customizer for every complex node
-    }
-
-    @Override
-    public Initialized<org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.interfaces.Interface> init(
-            @Nonnull final InstanceIdentifier<Interface> id,
-            @Nonnull final Interface readValue,
-            @Nonnull final ReadContext ctx) {
-        return Initialized.create(InstanceIdentifier.create(Interfaces.class)
-                        .child(org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.interfaces.Interface.class,
-                                new org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.interfaces.InterfaceKey(
-                                        id.firstKeyOf(Interface.class).getInterfaceId())),
-                new org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.interfaces.InterfaceBuilder()
-                        .setMtu(readValue.getMtu())
-                        .setInterfaceId(readValue.getInterfaceId())
-                        .build());
-    }
-}
diff --git a/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/oper/InterfacesReaderFactory.java b/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/oper/InterfacesReaderFactory.java

deleted file mode 100644 (file)

index 5e34eea..0000000
--- a/samples/interfaces/mapping/src/main/java/io/fd/honeycomb/samples/interfaces/mapping/oper/InterfacesReaderFactory.java
+++ /dev/null
@@ -1,68 +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.samples.interfaces.mapping.oper;
-
-import com.google.inject.Inject;
-import io.fd.honeycomb.samples.interfaces.mapping.LowerLayerAccess;
-import io.fd.honeycomb.translate.impl.read.GenericListReader;
-import io.fd.honeycomb.translate.impl.read.GenericReader;
-import io.fd.honeycomb.translate.read.ReaderFactory;
-import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.InterfacesState;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.InterfacesStateBuilder;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810._interface.state.Counters;
-import org.opendaylight.yang.gen.v1.io.fd.honeycomb.samples.interfaces.rev160810.interfaces.state.Interface;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class InterfacesReaderFactory implements ReaderFactory {
-
-    @Nonnull
-    private final LowerLayerAccess access;
-
-    @Inject
-    public InterfacesReaderFactory(@Nonnull final LowerLayerAccess access) {
-        this.access = access;
-    }
-
-    @Override
-    public void init(@Nonnull final ModifiableReaderRegistryBuilder registry) {
-        // ReaderFactory is intended for registering Readers into HC framework
-        // Readers provide ONLY operational (config "false") data straight from underlying device/layer
-        // they are triggered when RESTCONF GET on operational is invoked or when NETCONF get operation is executed
-
-        // Our model root for operational data is InterfacesState
-        final InstanceIdentifier<InterfacesState> root = InstanceIdentifier.create(InterfacesState.class);
-        // Since InterfacesState has no direct data children (leaves) only a structural reader is registered
-        // This reader just fills in the composite hierarchy of readers
-        // Honeycomb can't automatically instantiate structural readers and plugins have to help it by invoking as:
-        registry.addStructuralReader(root, InterfacesStateBuilder.class);
-
-        // Next child node is Interface (list)
-        final InstanceIdentifier<Interface> ifcListId = root.child(Interface.class);
-        registry.add(new GenericListReader<>(ifcListId, new InterfaceReaderCustomizer(access)));
-
-        // Next child is a container Counters
-        final InstanceIdentifier<Counters> countersId = ifcListId.child(Counters.class);
-        // By adding the reader with addAfter, we can ensure ordering of execution among the readers
-        // Useful in cases when a certain read has to be invoked before/after another
-        // In this case, we are ensuring that Counters are read after Interface is read
-        // "add" could be used instead, leaving the ordering to "nature"
-        // Same applies for writers
-        registry.addAfter(new GenericReader<>(countersId, new CountersReaderCustomizer(access)), ifcListId);
-    }
-}
diff --git a/samples/interfaces/mapping/src/main/resources/honeycomb-minimal-resources/config/sample-interfaces.json b/samples/interfaces/mapping/src/main/resources/honeycomb-minimal-resources/config/sample-interfaces.json

deleted file mode 100644 (file)

index 69d527a..0000000
--- a/samples/interfaces/mapping/src/main/resources/honeycomb-minimal-resources/config/sample-interfaces.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "some-config-attribute": "some-value"
-}
-\ No newline at end of file
diff --git a/samples/interfaces/models/asciidoc/Readme.adoc b/samples/interfaces/models/asciidoc/Readme.adoc

deleted file mode 100644 (file)

index 03d45af..0000000
--- a/samples/interfaces/models/asciidoc/Readme.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= interfaces-models
-
-Overview of interfaces-models
-\ No newline at end of file
diff --git a/samples/interfaces/models/pom.xml b/samples/interfaces/models/pom.xml

deleted file mode 100644 (file)

index 6b61ad7..0000000
--- a/samples/interfaces/models/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015 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.
--->
-<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.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.samples.interfaces</groupId>
-  <artifactId>interfaces-models</artifactId>
-  <name>${project.artifactId}</name>
-  <version>1.16.12-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <sonar.skip>true</sonar.skip>
-  </properties>
-
-  <dependencies>
-    <!-- Uncomment if iana-if-type model is imported -->
-    <!--<dependency>-->
-      <!--<groupId>org.opendaylight.mdsal.model</groupId>-->
-      <!--<artifactId>iana-if-type-2014-05-08</artifactId>-->
-    <!--</dependency>-->
-
-    <!-- Uncomment if ietf-yang-types-20130715 model is imported -->
-    <!--<dependency>-->
-      <!--<groupId>org.opendaylight.mdsal.model</groupId>-->
-      <!--<artifactId>ietf-yang-types-20130715</artifactId>-->
-    <!--</dependency>-->
-
-    <!-- Uncomment if ietf-interfaces model is imported -->
-    <!--<dependency>-->
-      <!--<groupId>org.opendaylight.mdsal.model</groupId>-->
-      <!--<artifactId>ietf-interfaces</artifactId>-->
-    <!--</dependency>-->
-
-    <!-- Uncomment if ietf-inet-types-2013-07-15 model is imported -->
-    <!--<dependency>-->
-      <!--<groupId>org.opendaylight.mdsal.model</groupId>-->
-      <!--<artifactId>ietf-inet-types-2013-07-15</artifactId>-->
-    <!--</dependency>-->
-
-    <!-- Uncomment if yang-ext model is imported -->
-    <!--<dependency>-->
-      <!--<groupId>org.opendaylight.mdsal.model</groupId>-->
-      <!--<artifactId>yang-ext</artifactId>-->
-    <!--</dependency>-->
-
-    <!-- Additional models can be found under >mdsal-model-artifacts -->
-  </dependencies>
-</project>
diff --git a/samples/interfaces/models/src/main/yang/openconfig-interfaces-notification.yang b/samples/interfaces/models/src/main/yang/openconfig-interfaces-notification.yang

deleted file mode 100644 (file)

index 456fab4..0000000
--- a/samples/interfaces/models/src/main/yang/openconfig-interfaces-notification.yang
+++ /dev/null
@@ -1,60 +0,0 @@
-module sample-interfaces {
-
-  namespace "io:fd:honeycomb:samples:interfaces";
-
-  prefix "hc-s-if";
-
-  description "Sample interface model";
-
-  revision "2016-08-10" {
-    description "Initial revision";
-  }
-
-  typedef interface-id {
-    type string;
-  }
-
-  grouping interface-common {
-    leaf interface-id {
-        type interface-id;
-    }
-
-    leaf mtu {
-        type uint16;
-    }
-  }
-
-  grouping interface-state {
-    container counters {
-        leaf total-packets {
-            type uint32;
-        }
-        leaf dropped-packets {
-            type uint32;
-        }
-    }
-  }
-
-  container interfaces {
-    list interface {
-        key "interface-id";
-        uses interface-common;
-    }
-  }
-
-  container interfaces-state {
-    config false;
-
-    list interface {
-        key "interface-id";
-        uses interface-common;
-        uses interface-state;
-    }
-  }
-
-  notification interface-up {
-    leaf interface-id {
-        type interface-id;
-    }
-  }
-}
-\ No newline at end of file
diff --git a/samples/interfaces/pom.xml b/samples/interfaces/pom.xml

deleted file mode 100644 (file)

index 05bb111..0000000
--- a/samples/interfaces/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015 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.
--->
-<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.common</groupId>
-    <artifactId>honeycomb-parent</artifactId>
-    <version>1.16.12-SNAPSHOT</version>
-    <relativePath>../../common/honeycomb-parent</relativePath>
-  </parent>
-
-  <groupId>io.fd.honeycomb.samples.interfaces</groupId>
-  <artifactId>interfaces-aggregator</artifactId>
-  <version>1.16.12-SNAPSHOT</version>
-  <name>${project.artifactId}</name>
-  <packaging>pom</packaging>
-  <modelVersion>4.0.0</modelVersion>
-
-  <properties>
-    <sonar.skip>true</sonar.skip>
-  </properties>
-
-  <modules>
-    <module>models</module>
-    <module>mapping</module>
-  </modules>
-
-  <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/samples/minimal-distribution/asciidoc/Readme.adoc b/samples/minimal-distribution/asciidoc/Readme.adoc

deleted file mode 100644 (file)

index 1da86ca..0000000
--- a/samples/minimal-distribution/asciidoc/Readme.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= minimal-distribution
-
-Overview of minimal-distribution
-\ No newline at end of file
diff --git a/samples/minimal-distribution/pom.xml b/samples/minimal-distribution/pom.xml

deleted file mode 100644 (file)

index db49666..0000000
--- a/samples/minimal-distribution/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015 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.
--->
-<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.common</groupId>
-    <artifactId>minimal-distribution-parent</artifactId>
-    <version>1.16.12-SNAPSHOT</version>
-    <relativePath>../../common/minimal-distribution-parent</relativePath>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>io.fd.honeycomb.samples.distro</groupId>
-  <artifactId>minimal-distribution</artifactId>
-  <name>${project.artifactId}</name>
-  <version>1.16.12-SNAPSHOT</version>
-
-  <properties>
-    <exec.parameters>-Xms128m -Xmx128m</exec.parameters>
-    <main.class>io.fd.honeycomb.infra.distro.Main</main.class>
-    <interfaces.mapping.version>1.16.12-SNAPSHOT</interfaces.mapping.version>
-    <honeycomb.min.distro.version>1.16.12-SNAPSHOT</honeycomb.min.distro.version>
-    <sonar.skip>true</sonar.skip>
-    <distribution.modules>
-      io.fd.honeycomb.samples.interfaces.mapping.SampleInterfaceModule
-    </distribution.modules>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.gmaven</groupId>
-        <artifactId>groovy-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>io.fd.honeycomb.samples.interfaces</groupId>
-      <artifactId>interfaces-mapping</artifactId>
-      <version>${interfaces.mapping.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.fd.honeycomb</groupId>
-      <artifactId>minimal-distribution</artifactId>
-      <version>${honeycomb.min.distro.version}</version>
-    </dependency>
-
-  </dependencies>
-</project>
diff --git a/samples/pom.xml b/samples/pom.xml

deleted file mode 100644 (file)

index 809e48d..0000000
--- a/samples/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015 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.
--->
-<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.common</groupId>
-    <artifactId>honeycomb-parent</artifactId>
-    <version>1.16.12-SNAPSHOT</version>
-    <relativePath>../common/honeycomb-parent</relativePath>
-  </parent>
-
-  <groupId>io.fd.honeycomb</groupId>
-  <artifactId>samples-aggregator</artifactId>
-  <name>${project.artifactId}</name>
-  <version>1.16.12-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <modelVersion>4.0.0</modelVersion>
-  <description>Aggregator for Honeycomb sample plugins</description>
-
-  <properties>
-    <sonar.skip>true</sonar.skip>
-  </properties>
-
-  <modules>
-    <module>interfaces</module>
-    <module>minimal-distribution</module>
-  </modules>
-  <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml

index b625f79..4b34c0d 100644 (file)
--- a/v3po/api/pom.xml
+++ b/v3po/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.v3po</groupId>
+  <groupId>io.fd.hc2vpp.v3po</groupId>
    <artifactId>v3po-api</artifactId>
    <name>${project.artifactId}</name>
    <version>1.16.12-SNAPSHOT</version>
@@ -50,7 +49,7 @@
        <artifactId>yang-ext</artifactId>
      </dependency>
      <dependency>
-      <groupId>io.fd.honeycomb.vpp</groupId>
+      <groupId>io.fd.hc2vpp.common</groupId>
        <artifactId>naming-context-api</artifactId>
        <version>${project.version}</version>
      </dependency>
diff --git a/v3po/pom.xml b/v3po/pom.xml

index 83df160..28e9ab0 100644 (file)
--- a/v3po/pom.xml
+++ b/v3po/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.v3po</groupId>
+  <groupId>io.fd.hc2vpp.v3po</groupId>
    <artifactId>v3po-aggregator</artifactId>
    <version>1.16.12-SNAPSHOT</version>
    <name>${project.artifactId}</name>
diff --git a/v3po/v3po2vpp/pom.xml b/v3po/v3po2vpp/pom.xml

index 79f1d66..d4c65de 100644 (file)
--- a/v3po/v3po2vpp/pom.xml
+++ b/v3po/v3po2vpp/pom.xml
@@ -17,14 +17,14 @@
  <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>
      </parent>
  
      <modelVersion>4.0.0</modelVersion>
-    <groupId>io.fd.honeycomb.v3po</groupId>
+    <groupId>io.fd.hc2vpp.v3po</groupId>
      <artifactId>v3po2vpp</artifactId>
      <name>${project.artifactId}</name>
      <version>1.16.12-SNAPSHOT</version>
@@ -47,7 +47,7 @@
              <version>${project.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>
@@ -88,7 +88,7 @@
  
          <!-- Testing Dependencies -->
          <dependency>
-            <groupId>io.fd.honeycomb.vpp</groupId>
+            <groupId>io.fd.hc2vpp.common</groupId>
              <artifactId>vpp-translate-test</artifactId>
              <version>${project.version}</version>
              <scope>test</scope>
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/AclWriterFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/AclWriterFactory.java

similarity index 91%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/AclWriterFactory.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/AclWriterFactory.java

index 23fc2e3..dbac5f3 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/AclWriterFactory.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/AclWriterFactory.java
@@ -14,14 +14,14 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po;
+package io.fd.hc2vpp.v3po;
  
-import static io.fd.honeycomb.translate.v3po.InterfacesWriterFactory.IETF_ACL_ID;
-import static io.fd.honeycomb.translate.v3po.SubinterfaceAugmentationWriterFactory.SUBIF_IETF_ACL_ID;
+import static io.fd.hc2vpp.v3po.InterfacesWriterFactory.IETF_ACL_ID;
+import static io.fd.hc2vpp.v3po.SubinterfaceAugmentationWriterFactory.SUBIF_IETF_ACL_ID;
  
  import com.google.common.collect.Sets;
  import io.fd.honeycomb.translate.impl.write.GenericListWriter;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.IetfAclWriter;
+import io.fd.hc2vpp.v3po.interfaces.acl.IetfAclWriter;
  import io.fd.honeycomb.translate.write.WriterFactory;
  import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
  import javax.annotation.Nonnull;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/DisabledInterfacesManager.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/DisabledInterfacesManager.java

similarity index 99%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/DisabledInterfacesManager.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/DisabledInterfacesManager.java

index 9772923..97bab70 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/DisabledInterfacesManager.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/DisabledInterfacesManager.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po;
+package io.fd.hc2vpp.v3po;
  
  import com.google.common.base.Optional;
  import com.google.inject.Inject;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/EgressIetfAClWriterProvider.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/EgressIetfAClWriterProvider.java

similarity index 86%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/EgressIetfAClWriterProvider.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/EgressIetfAClWriterProvider.java

index f14900f..0e4aaa8 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/EgressIetfAClWriterProvider.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/EgressIetfAClWriterProvider.java
@@ -14,12 +14,12 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po;
+package io.fd.hc2vpp.v3po;
  
  import com.google.inject.Inject;
  import com.google.inject.Provider;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.common.AclTableContextManagerImpl;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.egress.EgressIetfAclWriter;
+import io.fd.hc2vpp.v3po.interfaces.acl.egress.EgressIetfAclWriter;
+import io.fd.hc2vpp.v3po.interfaces.acl.common.AclTableContextManagerImpl;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.MappingTable;
  
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/IngressIetfAClWriterProvider.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/IngressIetfAClWriterProvider.java

similarity index 86%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/IngressIetfAClWriterProvider.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/IngressIetfAClWriterProvider.java

index 5d97f41..12349a3 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/IngressIetfAClWriterProvider.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/IngressIetfAClWriterProvider.java
@@ -14,12 +14,12 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po;
+package io.fd.hc2vpp.v3po;
  
  import com.google.inject.Inject;
  import com.google.inject.Provider;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.common.AclTableContextManagerImpl;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.ingress.IngressIetfAclWriter;
+import io.fd.hc2vpp.v3po.interfaces.acl.common.AclTableContextManagerImpl;
+import io.fd.hc2vpp.v3po.interfaces.acl.ingress.IngressIetfAclWriter;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.MappingTable;
  
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/InterfacesStateReaderFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/InterfacesStateReaderFactory.java

similarity index 89%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/InterfacesStateReaderFactory.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/InterfacesStateReaderFactory.java

index 82909e2..f01cd9e 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/InterfacesStateReaderFactory.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/InterfacesStateReaderFactory.java
@@ -14,34 +14,34 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po;
+package io.fd.hc2vpp.v3po;
  
  import com.google.common.collect.Sets;
  import com.google.inject.Inject;
  import com.google.inject.name.Named;
+import io.fd.hc2vpp.v3po.interfacesstate.ip.Ipv4AddressCustomizer;
  import io.fd.honeycomb.translate.impl.read.GenericInitListReader;
  import io.fd.honeycomb.translate.impl.read.GenericInitReader;
  import io.fd.honeycomb.translate.impl.read.GenericListReader;
  import io.fd.honeycomb.translate.impl.read.GenericReader;
  import io.fd.honeycomb.translate.read.ReaderFactory;
  import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder;
-import io.fd.honeycomb.translate.v3po.interfacesstate.EthernetCustomizer;
-import io.fd.honeycomb.translate.v3po.interfacesstate.GreCustomizer;
-import io.fd.honeycomb.translate.v3po.interfacesstate.InterfaceCustomizer;
-import io.fd.honeycomb.translate.v3po.interfacesstate.L2Customizer;
-import io.fd.honeycomb.translate.v3po.interfacesstate.ProxyArpCustomizer;
-import io.fd.honeycomb.translate.v3po.interfacesstate.TapCustomizer;
-import io.fd.honeycomb.translate.v3po.interfacesstate.VhostUserCustomizer;
-import io.fd.honeycomb.translate.v3po.interfacesstate.VxlanCustomizer;
-import io.fd.honeycomb.translate.v3po.interfacesstate.VxlanGpeCustomizer;
-import io.fd.honeycomb.translate.v3po.interfacesstate.acl.ingress.AclCustomizer;
-import io.fd.honeycomb.translate.v3po.interfacesstate.ip.Ipv4AddressCustomizer;
-import io.fd.honeycomb.translate.v3po.interfacesstate.ip.Ipv4Customizer;
-import io.fd.honeycomb.translate.v3po.interfacesstate.ip.Ipv4NeighbourCustomizer;
-import io.fd.honeycomb.translate.v3po.interfacesstate.ip.Ipv6Customizer;
-import io.fd.honeycomb.translate.v3po.interfacesstate.pbb.PbbRewriteStateCustomizer;
-import io.fd.honeycomb.translate.v3po.vppclassifier.VppClassifierContextManager;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.v3po.interfacesstate.EthernetCustomizer;
+import io.fd.hc2vpp.v3po.interfacesstate.GreCustomizer;
+import io.fd.hc2vpp.v3po.interfacesstate.InterfaceCustomizer;
+import io.fd.hc2vpp.v3po.interfacesstate.L2Customizer;
+import io.fd.hc2vpp.v3po.interfacesstate.ProxyArpCustomizer;
+import io.fd.hc2vpp.v3po.interfacesstate.TapCustomizer;
+import io.fd.hc2vpp.v3po.interfacesstate.VhostUserCustomizer;
+import io.fd.hc2vpp.v3po.interfacesstate.VxlanCustomizer;
+import io.fd.hc2vpp.v3po.interfacesstate.VxlanGpeCustomizer;
+import io.fd.hc2vpp.v3po.interfacesstate.acl.ingress.AclCustomizer;
+import io.fd.hc2vpp.v3po.interfacesstate.ip.Ipv4Customizer;
+import io.fd.hc2vpp.v3po.interfacesstate.ip.Ipv4NeighbourCustomizer;
+import io.fd.hc2vpp.v3po.interfacesstate.ip.Ipv6Customizer;
+import io.fd.hc2vpp.v3po.interfacesstate.pbb.PbbRewriteStateCustomizer;
+import io.fd.hc2vpp.v3po.vppclassifier.VppClassifierContextManager;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesStateBuilder;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/InterfacesWriterFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/InterfacesWriterFactory.java

similarity index 87%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/InterfacesWriterFactory.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/InterfacesWriterFactory.java

index 7bf5a43..eb68b6f 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/InterfacesWriterFactory.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/InterfacesWriterFactory.java
@@ -14,38 +14,37 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po;
+package io.fd.hc2vpp.v3po;
  
-import static io.fd.honeycomb.translate.v3po.VppClassifierHoneycombWriterFactory.CLASSIFY_SESSION_ID;
-import static io.fd.honeycomb.translate.v3po.VppClassifierHoneycombWriterFactory.CLASSIFY_TABLE_ID;
+import static io.fd.hc2vpp.v3po.VppClassifierHoneycombWriterFactory.CLASSIFY_SESSION_ID;
+import static io.fd.hc2vpp.v3po.VppClassifierHoneycombWriterFactory.CLASSIFY_TABLE_ID;
  
  import com.google.common.collect.Sets;
  import com.google.inject.Inject;
  import com.google.inject.name.Named;
+import io.fd.hc2vpp.v3po.interfaces.EthernetCustomizer;
+import io.fd.hc2vpp.v3po.interfaces.GreCustomizer;
+import io.fd.hc2vpp.v3po.interfaces.L2Customizer;
+import io.fd.hc2vpp.v3po.interfaces.LoopbackCustomizer;
+import io.fd.hc2vpp.v3po.interfaces.TapCustomizer;
+import io.fd.hc2vpp.v3po.interfaces.VxlanCustomizer;
+import io.fd.hc2vpp.v3po.interfaces.VxlanGpeCustomizer;
+import io.fd.hc2vpp.v3po.interfaces.acl.egress.EgressIetfAclWriter;
+import io.fd.hc2vpp.v3po.interfaces.acl.ingress.AclCustomizer;
+import io.fd.hc2vpp.v3po.interfaces.ip.Ipv4NeighbourCustomizer;
+import io.fd.hc2vpp.v3po.vppclassifier.VppClassifierContextManager;
  import io.fd.honeycomb.translate.impl.write.GenericListWriter;
  import io.fd.honeycomb.translate.impl.write.GenericWriter;
-import io.fd.honeycomb.translate.v3po.interfaces.EthernetCustomizer;
-import io.fd.honeycomb.translate.v3po.interfaces.GreCustomizer;
-import io.fd.honeycomb.translate.v3po.interfaces.InterfaceCustomizer;
-import io.fd.honeycomb.translate.v3po.interfaces.L2Customizer;
-import io.fd.honeycomb.translate.v3po.interfaces.LoopbackCustomizer;
-import io.fd.honeycomb.translate.v3po.interfaces.ProxyArpCustomizer;
-import io.fd.honeycomb.translate.v3po.interfaces.RoutingCustomizer;
-import io.fd.honeycomb.translate.v3po.interfaces.TapCustomizer;
-import io.fd.honeycomb.translate.v3po.interfaces.VhostUserCustomizer;
-import io.fd.honeycomb.translate.v3po.interfaces.VxlanCustomizer;
-import io.fd.honeycomb.translate.v3po.interfaces.VxlanGpeCustomizer;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.egress.EgressIetfAclWriter;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.ingress.AclCustomizer;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.ingress.IetfAclCustomizer;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.ingress.IngressIetfAclWriter;
-import io.fd.honeycomb.translate.v3po.interfaces.ip.Ipv4AddressCustomizer;
-import io.fd.honeycomb.translate.v3po.interfaces.ip.Ipv4Customizer;
-import io.fd.honeycomb.translate.v3po.interfaces.ip.Ipv4NeighbourCustomizer;
-import io.fd.honeycomb.translate.v3po.interfaces.ip.Ipv6Customizer;
-import io.fd.honeycomb.translate.v3po.interfaces.pbb.PbbRewriteCustomizer;
-import io.fd.honeycomb.translate.v3po.vppclassifier.VppClassifierContextManager;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.v3po.interfaces.InterfaceCustomizer;
+import io.fd.hc2vpp.v3po.interfaces.ProxyArpCustomizer;
+import io.fd.hc2vpp.v3po.interfaces.RoutingCustomizer;
+import io.fd.hc2vpp.v3po.interfaces.VhostUserCustomizer;
+import io.fd.hc2vpp.v3po.interfaces.acl.ingress.IngressIetfAclWriter;
+import io.fd.hc2vpp.v3po.interfaces.ip.Ipv4AddressCustomizer;
+import io.fd.hc2vpp.v3po.interfaces.ip.Ipv4Customizer;
+import io.fd.hc2vpp.v3po.interfaces.ip.Ipv6Customizer;
+import io.fd.hc2vpp.v3po.interfaces.pbb.PbbRewriteCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriterFactory;
  import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
@@ -220,7 +219,7 @@ public final class InterfacesWriterFactory implements WriterFactory {
                  org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.ietf.acl.base.attributes.access.lists.Acl.class);
          registry.subtreeAdd(
                  Sets.newHashSet(accessListsIdIngress, aclIdIngress),
-                new GenericWriter<>(INGRESS_IETF_ACL_ID, new IetfAclCustomizer(ingressAclWriter, ifcNamingContext)));
+                new GenericWriter<>(INGRESS_IETF_ACL_ID, new io.fd.hc2vpp.v3po.interfaces.acl.ingress.IetfAclCustomizer(ingressAclWriter, ifcNamingContext)));
  
          // Ingress IETF-ACL, also handles AccessLists and Acl:
          final InstanceIdentifier<AccessLists> accessListsIdEgress = InstanceIdentifier.create(
@@ -231,7 +230,7 @@ public final class InterfacesWriterFactory implements WriterFactory {
          registry.subtreeAdd(
                  Sets.newHashSet(accessListsIdEgress, aclIdEgress),
                  new GenericWriter<>(EGRESS_IETF_ACL_ID,
-                        new io.fd.honeycomb.translate.v3po.interfaces.acl.egress.IetfAclCustomizer(egressAclWriter,
+                        new io.fd.hc2vpp.v3po.interfaces.acl.egress.IetfAclCustomizer(egressAclWriter,
                                  ifcNamingContext)));
      }
  
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/SubinterfaceAugmentationWriterFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/SubinterfaceAugmentationWriterFactory.java

similarity index 90%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/SubinterfaceAugmentationWriterFactory.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/SubinterfaceAugmentationWriterFactory.java

index 1ef8b38..c8a7d28 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/SubinterfaceAugmentationWriterFactory.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/SubinterfaceAugmentationWriterFactory.java
@@ -14,24 +14,24 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po;
+package io.fd.hc2vpp.v3po;
  
-import static io.fd.honeycomb.translate.v3po.VppClassifierHoneycombWriterFactory.CLASSIFY_SESSION_ID;
-import static io.fd.honeycomb.translate.v3po.VppClassifierHoneycombWriterFactory.CLASSIFY_TABLE_ID;
+import static io.fd.hc2vpp.v3po.VppClassifierHoneycombWriterFactory.CLASSIFY_SESSION_ID;
+import static io.fd.hc2vpp.v3po.VppClassifierHoneycombWriterFactory.CLASSIFY_TABLE_ID;
  
  import com.google.common.collect.Sets;
+import io.fd.hc2vpp.v3po.interfaces.acl.egress.EgressIetfAclWriter;
+import io.fd.hc2vpp.v3po.interfaces.acl.ingress.SubInterfaceAclCustomizer;
+import io.fd.hc2vpp.v3po.interfaces.acl.ingress.SubInterfaceIetfAclCustomizer;
+import io.fd.hc2vpp.v3po.vppclassifier.VppClassifierContextManager;
  import io.fd.honeycomb.translate.impl.write.GenericListWriter;
  import io.fd.honeycomb.translate.impl.write.GenericWriter;
-import io.fd.honeycomb.translate.v3po.interfaces.RewriteCustomizer;
-import io.fd.honeycomb.translate.v3po.interfaces.SubInterfaceCustomizer;
-import io.fd.honeycomb.translate.v3po.interfaces.SubInterfaceL2Customizer;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.egress.EgressIetfAclWriter;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.ingress.IngressIetfAclWriter;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.ingress.SubInterfaceAclCustomizer;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.ingress.SubInterfaceIetfAclCustomizer;
-import io.fd.honeycomb.translate.v3po.interfaces.ip.SubInterfaceIpv4AddressCustomizer;
-import io.fd.honeycomb.translate.v3po.vppclassifier.VppClassifierContextManager;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.v3po.interfaces.RewriteCustomizer;
+import io.fd.hc2vpp.v3po.interfaces.SubInterfaceCustomizer;
+import io.fd.hc2vpp.v3po.interfaces.SubInterfaceL2Customizer;
+import io.fd.hc2vpp.v3po.interfaces.acl.ingress.IngressIetfAclWriter;
+import io.fd.hc2vpp.v3po.interfaces.ip.SubInterfaceIpv4AddressCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriterFactory;
  import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
@@ -152,7 +152,7 @@ public final class SubinterfaceAugmentationWriterFactory implements WriterFactor
              org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.ietf.acl.base.attributes.access.lists.Acl.class);
          registry.subtreeAdd(
              Sets.newHashSet(accessListsIdEgress, aclIdEgress),
-            new GenericWriter<>(SUBIF_EGRESS_IETF_ACL_ID, new io.fd.honeycomb.translate.v3po.interfaces.acl.egress.SubInterfaceIetfAclCustomizer(
+            new GenericWriter<>(SUBIF_EGRESS_IETF_ACL_ID, new io.fd.hc2vpp.v3po.interfaces.acl.egress.SubInterfaceIetfAclCustomizer(
                  egressAclWriter, ifcContext)));
      }
  }
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/SubinterfaceStateAugmentationReaderFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/SubinterfaceStateAugmentationReaderFactory.java

similarity index 92%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/SubinterfaceStateAugmentationReaderFactory.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/SubinterfaceStateAugmentationReaderFactory.java

index ee943bf..ec4c506 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/SubinterfaceStateAugmentationReaderFactory.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/SubinterfaceStateAugmentationReaderFactory.java
@@ -14,21 +14,21 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po;
+package io.fd.hc2vpp.v3po;
  
  import com.google.common.collect.Sets;
+import io.fd.hc2vpp.v3po.interfacesstate.RewriteCustomizer;
+import io.fd.hc2vpp.v3po.interfacesstate.SubInterfaceCustomizer;
+import io.fd.hc2vpp.v3po.interfacesstate.SubInterfaceL2Customizer;
+import io.fd.hc2vpp.v3po.interfacesstate.acl.ingress.SubInterfaceAclCustomizer;
+import io.fd.hc2vpp.v3po.interfacesstate.ip.SubInterfaceIpv4AddressCustomizer;
+import io.fd.hc2vpp.v3po.vppclassifier.VppClassifierContextManager;
  import io.fd.honeycomb.translate.impl.read.GenericInitListReader;
  import io.fd.honeycomb.translate.impl.read.GenericInitReader;
  import io.fd.honeycomb.translate.impl.read.GenericReader;
  import io.fd.honeycomb.translate.read.ReaderFactory;
  import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder;
-import io.fd.honeycomb.translate.v3po.interfacesstate.RewriteCustomizer;
-import io.fd.honeycomb.translate.v3po.interfacesstate.SubInterfaceCustomizer;
-import io.fd.honeycomb.translate.v3po.interfacesstate.SubInterfaceL2Customizer;
-import io.fd.honeycomb.translate.v3po.interfacesstate.acl.ingress.SubInterfaceAclCustomizer;
-import io.fd.honeycomb.translate.v3po.interfacesstate.ip.SubInterfaceIpv4AddressCustomizer;
-import io.fd.honeycomb.translate.v3po.vppclassifier.VppClassifierContextManager;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
  import org.opendaylight.yang.gen.v1.urn.ieee.params.xml.ns.yang.dot1q.types.rev150626.dot1q.tag.or.any.Dot1qTag;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.acl.base.attributes.Ip4Acl;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/V3poModule.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/V3poModule.java

similarity index 87%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/V3poModule.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/V3poModule.java

index d1bf234..ad9d048 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/V3poModule.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/V3poModule.java
@@ -14,20 +14,20 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po;
+package io.fd.hc2vpp.v3po;
  
  import com.google.inject.AbstractModule;
  import com.google.inject.multibindings.Multibinder;
  import com.google.inject.name.Names;
+import io.fd.hc2vpp.v3po.interfaces.acl.egress.EgressIetfAclWriter;
+import io.fd.hc2vpp.v3po.notification.InterfaceChangeNotificationProducer;
+import io.fd.hc2vpp.v3po.vppclassifier.VppClassifierContextManager;
+import io.fd.hc2vpp.v3po.vppclassifier.VppClassifierContextManagerImpl;
  import io.fd.honeycomb.notification.ManagedNotificationProducer;
  import io.fd.honeycomb.translate.read.ReaderFactory;
-import io.fd.honeycomb.translate.v3po.cfgattrs.V3poConfiguration;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.egress.EgressIetfAclWriter;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.ingress.IngressIetfAclWriter;
-import io.fd.honeycomb.translate.v3po.notification.InterfaceChangeNotificationProducer;
-import io.fd.honeycomb.translate.v3po.vppclassifier.VppClassifierContextManager;
-import io.fd.honeycomb.translate.v3po.vppclassifier.VppClassifierContextManagerImpl;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.v3po.cfgattrs.V3poConfiguration;
+import io.fd.hc2vpp.v3po.interfaces.acl.ingress.IngressIetfAclWriter;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriterFactory;
  import java.util.concurrent.Executors;
  import java.util.concurrent.ScheduledExecutorService;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/VppClassifierHoneycombWriterFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/VppClassifierHoneycombWriterFactory.java

similarity index 88%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/VppClassifierHoneycombWriterFactory.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/VppClassifierHoneycombWriterFactory.java

index 66cd132..1443c55 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/VppClassifierHoneycombWriterFactory.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/VppClassifierHoneycombWriterFactory.java
@@ -14,16 +14,14 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po;
-
-import static io.fd.honeycomb.translate.v3po.InterfacesWriterFactory.ACL_ID;
+package io.fd.hc2vpp.v3po;
  
  import com.google.inject.Inject;
  import com.google.inject.name.Named;
+import io.fd.hc2vpp.v3po.vppclassifier.ClassifySessionWriter;
+import io.fd.hc2vpp.v3po.vppclassifier.ClassifyTableWriter;
+import io.fd.hc2vpp.v3po.vppclassifier.VppClassifierContextManager;
  import io.fd.honeycomb.translate.impl.write.GenericListWriter;
-import io.fd.honeycomb.translate.v3po.vppclassifier.ClassifySessionWriter;
-import io.fd.honeycomb.translate.v3po.vppclassifier.ClassifyTableWriter;
-import io.fd.honeycomb.translate.v3po.vppclassifier.VppClassifierContextManager;
  import io.fd.honeycomb.translate.write.WriterFactory;
  import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
  import javax.annotation.Nonnull;
@@ -61,6 +59,6 @@ public final class VppClassifierHoneycombWriterFactory implements WriterFactory
          //  ClassifyTableSession
          registry.addBefore(
                  new GenericListWriter<>(CLASSIFY_SESSION_ID, new ClassifySessionWriter(jvpp, classifyTableContext)),
-                ACL_ID);
+                InterfacesWriterFactory.ACL_ID);
      }
  }
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/VppClassifierReaderFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/VppClassifierReaderFactory.java

similarity index 91%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/VppClassifierReaderFactory.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/VppClassifierReaderFactory.java

index b7a67c8..d612314 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/VppClassifierReaderFactory.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/VppClassifierReaderFactory.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po;
+package io.fd.hc2vpp.v3po;
  
  import com.google.inject.Inject;
  import com.google.inject.name.Named;
@@ -22,9 +22,9 @@ import io.fd.honeycomb.translate.impl.read.GenericInitListReader;
  import io.fd.honeycomb.translate.impl.read.GenericListReader;
  import io.fd.honeycomb.translate.read.ReaderFactory;
  import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder;
-import io.fd.honeycomb.translate.v3po.vppclassifier.ClassifySessionReader;
-import io.fd.honeycomb.translate.v3po.vppclassifier.ClassifyTableReader;
-import io.fd.honeycomb.translate.v3po.vppclassifier.VppClassifierContextManager;
+import io.fd.hc2vpp.v3po.vppclassifier.ClassifySessionReader;
+import io.fd.hc2vpp.v3po.vppclassifier.ClassifyTableReader;
+import io.fd.hc2vpp.v3po.vppclassifier.VppClassifierContextManager;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
  import javax.annotation.Nonnull;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.rev161214.VppClassifierState;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/VppHoneycombWriterFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/VppHoneycombWriterFactory.java

similarity index 91%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/VppHoneycombWriterFactory.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/VppHoneycombWriterFactory.java

index 7a59eed..0f836d6 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/VppHoneycombWriterFactory.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/VppHoneycombWriterFactory.java
@@ -14,18 +14,18 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po;
+package io.fd.hc2vpp.v3po;
  
-import static io.fd.honeycomb.translate.v3po.InterfacesWriterFactory.L2_ID;
+import static io.fd.hc2vpp.v3po.InterfacesWriterFactory.L2_ID;
  
  import com.google.common.collect.Sets;
  import com.google.inject.Inject;
  import com.google.inject.name.Named;
+import io.fd.hc2vpp.v3po.vpp.ArpTerminationTableEntryCustomizer;
+import io.fd.hc2vpp.v3po.vpp.BridgeDomainCustomizer;
+import io.fd.hc2vpp.v3po.vpp.L2FibEntryCustomizer;
  import io.fd.honeycomb.translate.impl.write.GenericListWriter;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.translate.v3po.vpp.ArpTerminationTableEntryCustomizer;
-import io.fd.honeycomb.translate.v3po.vpp.BridgeDomainCustomizer;
-import io.fd.honeycomb.translate.v3po.vpp.L2FibEntryCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriterFactory;
  import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.Vpp;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/VppStateHoneycombReaderFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/VppStateHoneycombReaderFactory.java

similarity index 91%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/VppStateHoneycombReaderFactory.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/VppStateHoneycombReaderFactory.java

index 67c435b..03da2c7 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/VppStateHoneycombReaderFactory.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/VppStateHoneycombReaderFactory.java
@@ -14,21 +14,21 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po;
+package io.fd.hc2vpp.v3po;
  
  import com.google.inject.Inject;
  import com.google.inject.name.Named;
+import io.fd.hc2vpp.v3po.vppstate.BridgeDomainCustomizer;
+import io.fd.hc2vpp.v3po.vppstate.L2FibEntryCustomizer;
+import io.fd.hc2vpp.v3po.vppstate.VersionCustomizer;
  import io.fd.honeycomb.translate.impl.read.GenericInitListReader;
  import io.fd.honeycomb.translate.impl.read.GenericReader;
  import io.fd.honeycomb.translate.read.ReaderFactory;
  import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder;
  import io.fd.honeycomb.translate.util.read.KeepaliveReaderWrapper;
-import io.fd.honeycomb.translate.v3po.vppstate.BridgeDomainCustomizer;
-import io.fd.honeycomb.translate.v3po.vppstate.L2FibEntryCustomizer;
-import io.fd.honeycomb.translate.v3po.vppstate.VersionCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.translate.vpp.util.ReadTimeoutException;
-import io.fd.honeycomb.translate.vpp.util.VppStatusListener;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.ReadTimeoutException;
+import io.fd.hc2vpp.common.translate.util.VppStatusListener;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
  import java.util.concurrent.ScheduledExecutorService;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.VppState;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/cfgattrs/V3poConfiguration.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/cfgattrs/V3poConfiguration.java

similarity index 94%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/cfgattrs/V3poConfiguration.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/cfgattrs/V3poConfiguration.java

index 9cf5b4d..6676956 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/cfgattrs/V3poConfiguration.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/cfgattrs/V3poConfiguration.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.cfgattrs;
+package io.fd.hc2vpp.v3po.cfgattrs;
  
  import net.jmob.guice.conf.core.BindConfig;
  import net.jmob.guice.conf.core.Syntax;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/EthernetCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/EthernetCustomizer.java

similarity index 95%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/EthernetCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/EthernetCustomizer.java

index 856366f..ec83df8 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/EthernetCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/EthernetCustomizer.java
@@ -14,10 +14,10 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import javax.annotation.Nonnull;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/GreCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/GreCustomizer.java

similarity index 97%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/GreCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/GreCustomizer.java

index 146d97c..b91d263 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/GreCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/GreCustomizer.java
@@ -14,14 +14,14 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import static com.google.common.base.Preconditions.checkArgument;
  
  import com.google.common.net.InetAddresses;
-import io.fd.honeycomb.translate.vpp.util.AbstractInterfaceTypeCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.AbstractInterfaceTypeCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.dto.GreAddDelTunnel;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/InterconnectionWriteUtils.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterconnectionWriteUtils.java

similarity index 98%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/InterconnectionWriteUtils.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterconnectionWriteUtils.java

index 7d2d28c..0702717 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/InterconnectionWriteUtils.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterconnectionWriteUtils.java
@@ -14,13 +14,13 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static java.util.Objects.requireNonNull;
  
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceSetL2Bridge;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/InterfaceCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceCustomizer.java

similarity index 96%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/InterfaceCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceCustomizer.java

index 17b48f6..336a661 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/InterfaceCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceCustomizer.java
@@ -14,12 +14,12 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlags;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/L2Customizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/L2Customizer.java

similarity index 96%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/L2Customizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/L2Customizer.java

index cf9da35..cb47725 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/L2Customizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/L2Customizer.java
@@ -14,11 +14,11 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import javax.annotation.Nonnull;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/LoopbackCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/LoopbackCustomizer.java

similarity index 94%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/LoopbackCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/LoopbackCustomizer.java

index 47a7175..a1b3184 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/LoopbackCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/LoopbackCustomizer.java
@@ -14,12 +14,12 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
-import io.fd.honeycomb.translate.vpp.util.AbstractInterfaceTypeCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.MacTranslator;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.AbstractInterfaceTypeCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.MacTranslator;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.dto.CreateLoopback;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ProxyArpCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ProxyArpCustomizer.java

similarity index 96%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ProxyArpCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ProxyArpCustomizer.java

index 43a34cd..66f2e3e 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ProxyArpCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ProxyArpCustomizer.java
@@ -14,12 +14,12 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import com.google.common.net.InetAddresses;
  import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.dto.ProxyArpAddDel;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/RewriteCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/RewriteCustomizer.java

similarity index 93%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/RewriteCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/RewriteCustomizer.java

index 204f5e1..4ad6321 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/RewriteCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/RewriteCustomizer.java
@@ -14,16 +14,16 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import com.google.common.base.Preconditions;
  import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.translate.vpp.util.SubInterfaceUtils;
-import io.fd.honeycomb.translate.vpp.util.TagRewriteOperation;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.v3po.util.SubInterfaceUtils;
+import io.fd.hc2vpp.common.translate.util.TagRewriteOperation;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.dto.L2InterfaceVlanTagRewrite;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/RoutingCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/RoutingCustomizer.java

similarity index 94%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/RoutingCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/RoutingCustomizer.java

index 05ecf36..574fceb 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/RoutingCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/RoutingCustomizer.java
@@ -14,15 +14,15 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import static com.google.common.base.Preconditions.checkArgument;
  
  import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceSetTable;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/SubInterfaceCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceCustomizer.java

similarity index 95%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/SubInterfaceCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceCustomizer.java

index 3645677..c39cfa6 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/SubInterfaceCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceCustomizer.java
@@ -14,18 +14,18 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import static com.google.common.base.Preconditions.checkState;
-import static io.fd.honeycomb.translate.vpp.util.SubInterfaceUtils.getNumberOfTags;
-import static io.fd.honeycomb.translate.vpp.util.SubInterfaceUtils.getSubInterfaceName;
+import static io.fd.hc2vpp.v3po.util.SubInterfaceUtils.getNumberOfTags;
+import static io.fd.hc2vpp.v3po.util.SubInterfaceUtils.getSubInterfaceName;
  
  import com.google.common.base.Preconditions;
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.dto.CreateSubif;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/SubInterfaceL2Customizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceL2Customizer.java

similarity index 95%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/SubInterfaceL2Customizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceL2Customizer.java

index a485d07..4a3e443 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/SubInterfaceL2Customizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceL2Customizer.java
@@ -14,12 +14,12 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.translate.vpp.util.SubInterfaceUtils;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.v3po.util.SubInterfaceUtils;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import javax.annotation.Nonnull;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/TapCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/TapCustomizer.java

similarity index 96%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/TapCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/TapCustomizer.java

index ef3fd32..220fb95 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/TapCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/TapCustomizer.java
@@ -14,12 +14,12 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
-import io.fd.honeycomb.translate.vpp.util.AbstractInterfaceTypeCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.MacTranslator;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.AbstractInterfaceTypeCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.MacTranslator;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.dto.TapConnect;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/VhostUserCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VhostUserCustomizer.java

similarity index 96%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/VhostUserCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VhostUserCustomizer.java

index 4f834c2..dc8fade 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/VhostUserCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VhostUserCustomizer.java
@@ -14,13 +14,13 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import com.google.common.base.Preconditions;
-import io.fd.honeycomb.translate.vpp.util.AbstractInterfaceTypeCustomizer;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.AbstractInterfaceTypeCustomizer;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.dto.CreateVhostUserIf;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/VxlanCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizer.java

similarity index 97%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/VxlanCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizer.java

index 4248a1f..ec21934 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/VxlanCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizer.java
@@ -14,15 +14,15 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import static com.google.common.base.Preconditions.checkArgument;
  
  import com.google.common.net.InetAddresses;
-import io.fd.honeycomb.translate.v3po.DisabledInterfacesManager;
-import io.fd.honeycomb.translate.vpp.util.AbstractInterfaceTypeCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.v3po.DisabledInterfacesManager;
+import io.fd.hc2vpp.common.translate.util.AbstractInterfaceTypeCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.dto.VxlanAddDelTunnel;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/VxlanGpeCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanGpeCustomizer.java

similarity index 97%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/VxlanGpeCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanGpeCustomizer.java

index 3e1891e..59ec958 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/VxlanGpeCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanGpeCustomizer.java
@@ -14,15 +14,15 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import static com.google.common.base.Preconditions.checkArgument;
  
  import com.google.common.net.InetAddresses;
-import io.fd.honeycomb.translate.v3po.DisabledInterfacesManager;
-import io.fd.honeycomb.translate.vpp.util.AbstractInterfaceTypeCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.v3po.DisabledInterfacesManager;
+import io.fd.hc2vpp.common.translate.util.AbstractInterfaceTypeCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.dto.VxlanGpeAddDelTunnel;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/IetfAclWriter.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/IetfAclWriter.java

similarity index 98%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/IetfAclWriter.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/IetfAclWriter.java

index e46f53e..d97bdee 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/IetfAclWriter.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/IetfAclWriter.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl;
+package io.fd.hc2vpp.v3po.interfaces.acl;
  
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
  import io.fd.honeycomb.translate.write.WriteContext;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AbstractIetfAclWriter.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AbstractIetfAclWriter.java

similarity index 98%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AbstractIetfAclWriter.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AbstractIetfAclWriter.java

index 347397a..29e92ae 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AbstractIetfAclWriter.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AbstractIetfAclWriter.java
@@ -14,13 +14,13 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
+package io.fd.hc2vpp.v3po.interfaces.acl.common;
  
  import static com.google.common.base.Preconditions.checkArgument;
  
  import com.google.common.base.Optional;
  import com.google.common.base.Preconditions;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
@@ -81,7 +81,7 @@ public abstract class AbstractIetfAclWriter implements IetfAclWriter, JvppReplyC
          // ietf-acl updates are handled first, so we use writeContext.readAfter
          final Optional<org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.Acl>
              aclOptional =
-            writeContext.readAfter(io.fd.honeycomb.translate.v3po.interfaces.acl.IetfAclWriter.ACL_ID.child(
+            writeContext.readAfter(io.fd.hc2vpp.v3po.interfaces.acl.IetfAclWriter.ACL_ID.child(
                  org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.Acl.class,
                  new AclKey(aclName, aclType)));
          checkArgument(aclOptional.isPresent(), "Acl lists not configured");
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceEthWriter.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceEthWriter.java

similarity index 98%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceEthWriter.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceEthWriter.java

index 14124dc..67351e0 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceEthWriter.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceEthWriter.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
+package io.fd.hc2vpp.v3po.interfaces.acl.common;
  
  import com.google.common.annotations.VisibleForTesting;
  import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIp4Writer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceIp4Writer.java

similarity index 98%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIp4Writer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceIp4Writer.java

index 7d75e39..78ed33a 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIp4Writer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceIp4Writer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
+package io.fd.hc2vpp.v3po.interfaces.acl.common;
  
  import static com.google.common.base.Preconditions.checkArgument;
  
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIp6Writer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceIp6Writer.java

similarity index 98%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIp6Writer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceIp6Writer.java

index cad8002..d7cbb00 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIp6Writer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceIp6Writer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
+package io.fd.hc2vpp.v3po.interfaces.acl.common;
  
  import static com.google.common.base.Preconditions.checkArgument;
  
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIpAndEthWriter.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceIpAndEthWriter.java

similarity index 99%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIpAndEthWriter.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceIpAndEthWriter.java

index ca12cbe..164493c 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIpAndEthWriter.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceIpAndEthWriter.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
+package io.fd.hc2vpp.v3po.interfaces.acl.common;
  
  import static com.google.common.base.Preconditions.checkArgument;
  
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceWriter.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceWriter.java

similarity index 97%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceWriter.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceWriter.java

index ae540f9..75a10e4 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceWriter.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceWriter.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
+package io.fd.hc2vpp.v3po.interfaces.acl.common;
  
  import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
  import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AclTableContextManager.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AclTableContextManager.java

similarity index 96%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AclTableContextManager.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AclTableContextManager.java

index bddc16a..0728944 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AclTableContextManager.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AclTableContextManager.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
+package io.fd.hc2vpp.v3po.interfaces.acl.common;
  
  import com.google.common.base.Optional;
  import io.fd.honeycomb.translate.MappingContext;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AclTableContextManagerImpl.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AclTableContextManagerImpl.java

similarity index 98%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AclTableContextManagerImpl.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AclTableContextManagerImpl.java

index 60fb0d2..659244f 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AclTableContextManagerImpl.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AclTableContextManagerImpl.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
+package io.fd.hc2vpp.v3po.interfaces.acl.common;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AclTranslator.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AclTranslator.java

similarity index 98%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AclTranslator.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AclTranslator.java

index 2d898f1..e429112 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AclTranslator.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AclTranslator.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
+package io.fd.hc2vpp.v3po.interfaces.acl.common;
  
  import static com.google.common.base.Preconditions.checkArgument;
  
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/IetfAclWriter.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/IetfAclWriter.java

similarity index 97%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/IetfAclWriter.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/IetfAclWriter.java

index 2e8750c..df0b65c 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/IetfAclWriter.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/IetfAclWriter.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
+package io.fd.hc2vpp.v3po.interfaces.acl.common;
  
  import io.fd.honeycomb.translate.MappingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/Ip4AclTranslator.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/Ip4AclTranslator.java

similarity index 98%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/Ip4AclTranslator.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/Ip4AclTranslator.java

index 304d6c1..c1bad07 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/Ip4AclTranslator.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/Ip4AclTranslator.java
@@ -14,10 +14,10 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
+package io.fd.hc2vpp.v3po.interfaces.acl.common;
  
  import com.google.common.primitives.Ints;
-import io.fd.honeycomb.translate.vpp.util.Ipv4Translator;
+import io.fd.hc2vpp.common.translate.util.Ipv4Translator;
  import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
  import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/Ip6AclTranslator.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/Ip6AclTranslator.java

similarity index 99%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/Ip6AclTranslator.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/Ip6AclTranslator.java

index c0da756..ec9bebe 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/Ip6AclTranslator.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/Ip6AclTranslator.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
+package io.fd.hc2vpp.v3po.interfaces.acl.common;
  
  import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
  import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/L2AclTranslator.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/L2AclTranslator.java

similarity index 96%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/L2AclTranslator.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/L2AclTranslator.java

index c74db7e..5a6807b 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/L2AclTranslator.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/L2AclTranslator.java
@@ -14,9 +14,9 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
+package io.fd.hc2vpp.v3po.interfaces.acl.common;
  
-import io.fd.honeycomb.translate.vpp.util.MacTranslator;
+import io.fd.hc2vpp.common.translate.util.MacTranslator;
  import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
  import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
  import java.util.List;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/PortPair.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/PortPair.java

similarity index 98%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/PortPair.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/PortPair.java

index 6d5d506..1630f58 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/PortPair.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/PortPair.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
+package io.fd.hc2vpp.v3po.interfaces.acl.common;
  
  import java.util.ArrayList;
  import java.util.List;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/EgressIetfAclWriter.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/EgressIetfAclWriter.java

similarity index 96%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/EgressIetfAclWriter.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/EgressIetfAclWriter.java

index bfd58cf..adb19e3 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/EgressIetfAclWriter.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/EgressIetfAclWriter.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.egress;
+package io.fd.hc2vpp.v3po.interfaces.acl.egress;
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static com.google.common.base.Preconditions.checkNotNull;
@@ -22,8 +22,8 @@ import static com.google.common.base.Preconditions.checkState;
  
  import com.google.common.base.Optional;
  import io.fd.honeycomb.translate.MappingContext;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.common.AbstractIetfAclWriter;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.common.AclTableContextManager;
+import io.fd.hc2vpp.v3po.interfaces.acl.common.AbstractIetfAclWriter;
+import io.fd.hc2vpp.v3po.interfaces.acl.common.AclTableContextManager;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.dto.ClassifySetInterfaceL2Tables;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/IetfAclCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/IetfAclCustomizer.java

similarity index 95%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/IetfAclCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/IetfAclCustomizer.java

index c0e4c3d..3cef7a6 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/IetfAclCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/IetfAclCustomizer.java
@@ -14,14 +14,14 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.egress;
+package io.fd.hc2vpp.v3po.interfaces.acl.egress;
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static com.google.common.base.Preconditions.checkNotNull;
  
  import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.common.IetfAclWriter;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.v3po.interfaces.acl.common.IetfAclWriter;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import javax.annotation.Nonnull;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/SubInterfaceIetfAclCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/SubInterfaceIetfAclCustomizer.java

similarity index 94%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/SubInterfaceIetfAclCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/SubInterfaceIetfAclCustomizer.java

index bf7c0eb..3ea4043 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/SubInterfaceIetfAclCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/SubInterfaceIetfAclCustomizer.java
@@ -14,18 +14,18 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.egress;
+package io.fd.hc2vpp.v3po.interfaces.acl.egress;
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static com.google.common.base.Preconditions.checkNotNull;
  import static com.google.common.base.Preconditions.checkState;
-import static io.fd.honeycomb.translate.vpp.util.SubInterfaceUtils.getNumberOfTags;
+import static io.fd.hc2vpp.v3po.util.SubInterfaceUtils.getNumberOfTags;
  
  import com.google.common.base.Optional;
  import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.common.IetfAclWriter;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.translate.vpp.util.SubInterfaceUtils;
+import io.fd.hc2vpp.v3po.interfaces.acl.common.IetfAclWriter;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.v3po.util.SubInterfaceUtils;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import javax.annotation.Nonnull;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/AclCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/AclCustomizer.java

similarity index 93%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/AclCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/AclCustomizer.java

index 550c2cc..05233ce 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/AclCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/AclCustomizer.java
@@ -14,14 +14,14 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.ingress;
+package io.fd.hc2vpp.v3po.interfaces.acl.ingress;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
+import io.fd.hc2vpp.v3po.vppclassifier.VppClassifierContextManager;
  import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.v3po.vppclassifier.VppClassifierContextManager;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/AclWriter.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/AclWriter.java

similarity index 93%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/AclWriter.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/AclWriter.java

index d299ec8..da74f0a 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/AclWriter.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/AclWriter.java
@@ -14,14 +14,14 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.ingress;
+package io.fd.hc2vpp.v3po.interfaces.acl.ingress;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
+import io.fd.hc2vpp.v3po.vppclassifier.VppClassifierContextManager;
  import io.fd.honeycomb.translate.MappingContext;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.v3po.vppclassifier.VppClassifierContextManager;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import java.util.concurrent.CompletionStage;
  import javax.annotation.Nonnegative;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/IetfAclCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/IetfAclCustomizer.java

similarity index 97%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/IetfAclCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/IetfAclCustomizer.java

index ec051e0..e4003fc 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/IetfAclCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/IetfAclCustomizer.java
@@ -14,13 +14,13 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.ingress;
+package io.fd.hc2vpp.v3po.interfaces.acl.ingress;
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static com.google.common.base.Preconditions.checkNotNull;
  
  import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import javax.annotation.Nonnull;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/IngressIetfAclWriter.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/IngressIetfAclWriter.java

similarity index 96%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/IngressIetfAclWriter.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/IngressIetfAclWriter.java

index b7da14e..022d218 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/IngressIetfAclWriter.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/IngressIetfAclWriter.java
@@ -14,16 +14,16 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.ingress;
+package io.fd.hc2vpp.v3po.interfaces.acl.ingress;
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static com.google.common.base.Preconditions.checkNotNull;
  import static com.google.common.base.Preconditions.checkState;
  
  import com.google.common.base.Optional;
+import io.fd.hc2vpp.v3po.interfaces.acl.common.AbstractIetfAclWriter;
+import io.fd.hc2vpp.v3po.interfaces.acl.common.AclTableContextManager;
  import io.fd.honeycomb.translate.MappingContext;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.common.AbstractIetfAclWriter;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.common.AclTableContextManager;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.dto.InputAclSetInterface;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/SubInterfaceAclCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/SubInterfaceAclCustomizer.java

similarity index 93%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/SubInterfaceAclCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/SubInterfaceAclCustomizer.java

index bda0964..b0be5d7 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/SubInterfaceAclCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/SubInterfaceAclCustomizer.java
@@ -14,15 +14,15 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.ingress;
+package io.fd.hc2vpp.v3po.interfaces.acl.ingress;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
  import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.v3po.vppclassifier.VppClassifierContextManager;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.translate.vpp.util.SubInterfaceUtils;
+import io.fd.hc2vpp.v3po.vppclassifier.VppClassifierContextManager;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.v3po.util.SubInterfaceUtils;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/SubInterfaceIetfAclCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/SubInterfaceIetfAclCustomizer.java

similarity index 95%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/SubInterfaceIetfAclCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/SubInterfaceIetfAclCustomizer.java

index a9fcc83..4f24906 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/SubInterfaceIetfAclCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/SubInterfaceIetfAclCustomizer.java
@@ -14,17 +14,17 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.ingress;
+package io.fd.hc2vpp.v3po.interfaces.acl.ingress;
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static com.google.common.base.Preconditions.checkNotNull;
  import static com.google.common.base.Preconditions.checkState;
-import static io.fd.honeycomb.translate.vpp.util.SubInterfaceUtils.getNumberOfTags;
+import static io.fd.hc2vpp.v3po.util.SubInterfaceUtils.getNumberOfTags;
  
  import com.google.common.base.Optional;
  import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.translate.vpp.util.SubInterfaceUtils;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.v3po.util.SubInterfaceUtils;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import javax.annotation.Nonnull;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv4AddressCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/Ipv4AddressCustomizer.java

similarity index 95%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv4AddressCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/Ipv4AddressCustomizer.java

index 2cec906..6a6bb6c 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv4AddressCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/Ipv4AddressCustomizer.java
@@ -14,17 +14,17 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.ip;
+package io.fd.hc2vpp.v3po.interfaces.ip;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
  import com.google.common.base.Optional;
+import io.fd.hc2vpp.v3po.interfaces.ip.subnet.validation.SubnetValidationException;
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
-import io.fd.honeycomb.translate.v3po.interfaces.ip.subnet.validation.SubnetValidationException;
-import io.fd.honeycomb.translate.v3po.interfaces.ip.subnet.validation.SubnetValidator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.v3po.interfaces.ip.subnet.validation.SubnetValidator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv4Customizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/Ipv4Customizer.java

similarity index 95%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv4Customizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/Ipv4Customizer.java

index 929e82e..ff86331 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv4Customizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/Ipv4Customizer.java
@@ -14,10 +14,10 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.ip;
+package io.fd.hc2vpp.v3po.interfaces.ip;
  
  import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
  import io.fd.honeycomb.translate.write.WriteContext;
  import javax.annotation.Nonnull;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.Ipv4;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv4NeighbourCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/Ipv4NeighbourCustomizer.java

similarity index 94%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv4NeighbourCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/Ipv4NeighbourCustomizer.java

index be4ef28..1a1c2d2 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv4NeighbourCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/Ipv4NeighbourCustomizer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.ip;
+package io.fd.hc2vpp.v3po.interfaces.ip;
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static com.google.common.base.Preconditions.checkNotNull;
@@ -22,11 +22,11 @@ import static com.google.common.base.Preconditions.checkState;
  
  import io.fd.honeycomb.translate.MappingContext;
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.AddressTranslator;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.AddressTranslator;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.dto.IpNeighborAddDel;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv4Writer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/Ipv4Writer.java

similarity index 95%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv4Writer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/Ipv4Writer.java

index 788deab..36e1800 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv4Writer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/Ipv4Writer.java
@@ -14,14 +14,14 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.ip;
+package io.fd.hc2vpp.v3po.interfaces.ip;
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static com.google.common.base.Preconditions.checkNotNull;
  
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.Ipv4Translator;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.Ipv4Translator;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceAddDelAddress;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceAddDelAddressReply;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv6Customizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/Ipv6Customizer.java

similarity index 95%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv6Customizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/Ipv6Customizer.java

index 094957a..85f190d 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv6Customizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/Ipv6Customizer.java
@@ -14,10 +14,10 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.ip;
+package io.fd.hc2vpp.v3po.interfaces.ip;
  
  import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
  import io.fd.honeycomb.translate.write.WriteContext;
  import javax.annotation.Nonnull;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.Ipv6;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/SubInterfaceIpv4AddressCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/SubInterfaceIpv4AddressCustomizer.java

similarity index 96%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/SubInterfaceIpv4AddressCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/SubInterfaceIpv4AddressCustomizer.java

index 52c5411..214ff36 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/SubInterfaceIpv4AddressCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/SubInterfaceIpv4AddressCustomizer.java
@@ -14,14 +14,14 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.ip;
+package io.fd.hc2vpp.v3po.interfaces.ip;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.translate.vpp.util.SubInterfaceUtils;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.v3po.util.SubInterfaceUtils;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/subnet/validation/SubnetValidationException.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/subnet/validation/SubnetValidationException.java

similarity index 96%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/subnet/validation/SubnetValidationException.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/subnet/validation/SubnetValidationException.java

index ae82910..0019230 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/subnet/validation/SubnetValidationException.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/subnet/validation/SubnetValidationException.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.ip.subnet.validation;
+package io.fd.hc2vpp.v3po.interfaces.ip.subnet.validation;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/subnet/validation/SubnetValidator.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/subnet/validation/SubnetValidator.java

similarity index 96%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/subnet/validation/SubnetValidator.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/subnet/validation/SubnetValidator.java

index a314eaf..c5b011e 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/subnet/validation/SubnetValidator.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/subnet/validation/SubnetValidator.java
@@ -14,14 +14,14 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.ip.subnet.validation;
+package io.fd.hc2vpp.v3po.interfaces.ip.subnet.validation;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
  import com.google.common.base.Function;
  import com.google.common.collect.Multimap;
  import com.google.common.collect.Multimaps;
-import io.fd.honeycomb.translate.v3po.interfaces.ip.Ipv4Writer;
+import io.fd.hc2vpp.v3po.interfaces.ip.Ipv4Writer;
  import java.util.List;
  import javax.annotation.Nonnull;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.ipv4.Address;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/pbb/PbbRewriteCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/pbb/PbbRewriteCustomizer.java

similarity index 95%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/pbb/PbbRewriteCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/pbb/PbbRewriteCustomizer.java

index 8b6ccb1..3e8d823 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/pbb/PbbRewriteCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/pbb/PbbRewriteCustomizer.java
@@ -14,15 +14,15 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.pbb;
+package io.fd.hc2vpp.v3po.interfaces.pbb;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
  import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.MacTranslator;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.MacTranslator;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.VppBaseCallException;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/EthernetCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/EthernetCustomizer.java

similarity index 96%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/EthernetCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/EthernetCustomizer.java

index b2533a2..33b71b1 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/EthernetCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/EthernetCustomizer.java
@@ -14,15 +14,15 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  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.InitializingReaderCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
  import javax.annotation.Nonnull;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/GreCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/GreCustomizer.java

similarity index 97%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/GreCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/GreCustomizer.java

index 2fb94c1..b31ab74 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/GreCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/GreCustomizer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  import static com.google.common.base.Preconditions.checkState;
  
@@ -23,8 +23,8 @@ import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.Initialized;
  import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.core.dto.GreTunnelDetails;
  import io.fd.vpp.jvpp.core.dto.GreTunnelDetailsReplyDump;
  import io.fd.vpp.jvpp.core.dto.GreTunnelDump;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/InterconnectionReadUtils.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterconnectionReadUtils.java

similarity index 98%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/InterconnectionReadUtils.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterconnectionReadUtils.java

index be4eca6..3893d37 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/InterconnectionReadUtils.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterconnectionReadUtils.java
@@ -14,14 +14,14 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  import static com.google.common.base.Preconditions.checkState;
  import static java.util.Objects.requireNonNull;
  
  import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.core.dto.BridgeDomainDetails;
  import io.fd.vpp.jvpp.core.dto.BridgeDomainDetailsReplyDump;
  import io.fd.vpp.jvpp.core.dto.BridgeDomainDump;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/InterfaceCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizer.java

similarity index 97%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/InterfaceCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizer.java

index 4308f34..70bc0c6 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/InterfaceCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizer.java
@@ -14,18 +14,18 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
+import io.fd.hc2vpp.v3po.DisabledInterfacesManager;
  import io.fd.honeycomb.translate.MappingContext;
  import io.fd.honeycomb.translate.ModificationCache;
  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.honeycomb.translate.v3po.DisabledInterfacesManager;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceDetailsReplyDump;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceDump;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/InterfaceDataTranslator.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslator.java

similarity index 98%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/InterfaceDataTranslator.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslator.java

index 2864c6e..a0d292a 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/InterfaceDataTranslator.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslator.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static java.util.Objects.requireNonNull;
@@ -22,8 +22,8 @@ import static java.util.Objects.requireNonNull;
  import io.fd.honeycomb.translate.ModificationCache;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.util.RWUtils;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceDetailsReplyDump;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceDump;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/L2Customizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/L2Customizer.java

similarity index 97%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/L2Customizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/L2Customizer.java

index 2a29fdd..ed88370 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/L2Customizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/L2Customizer.java
@@ -14,15 +14,15 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  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.InitializingReaderCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  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.interfaces.state.Interface;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ProxyArpCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ProxyArpCustomizer.java

similarity index 95%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ProxyArpCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ProxyArpCustomizer.java

index e3d6ed0..028e8e0 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ProxyArpCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ProxyArpCustomizer.java
@@ -14,13 +14,13 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import javax.annotation.Nonnull;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.InterfaceKey;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/RewriteCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizer.java

similarity index 95%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/RewriteCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizer.java

index da6bf7a..6906ebc 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/RewriteCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  import static com.google.common.base.Preconditions.checkState;
  
@@ -22,10 +22,10 @@ import com.google.common.base.Preconditions;
  import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.translate.vpp.util.SubInterfaceUtils;
-import io.fd.honeycomb.translate.vpp.util.TagRewriteOperation;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.v3po.util.SubInterfaceUtils;
+import io.fd.hc2vpp.common.translate.util.TagRewriteOperation;
  import java.util.ArrayList;
  import java.util.List;
  import javax.annotation.Nonnull;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/SubInterfaceCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java

similarity index 97%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/SubInterfaceCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java

index a2efa8c..9c13b38 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/SubInterfaceCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  import static com.google.common.base.Preconditions.checkState;
  
@@ -24,10 +24,10 @@ 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.honeycomb.translate.util.RWUtils;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.translate.vpp.util.SubInterfaceUtils;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.v3po.util.SubInterfaceUtils;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceDetailsReplyDump;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceDump;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/SubInterfaceL2Customizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceL2Customizer.java

similarity index 94%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/SubInterfaceL2Customizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceL2Customizer.java

index c686d18..1b98b41 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/SubInterfaceL2Customizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceL2Customizer.java
@@ -14,17 +14,17 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
-import static io.fd.honeycomb.translate.vpp.util.SubInterfaceUtils.getSubInterfaceName;
+import static io.fd.hc2vpp.v3po.util.SubInterfaceUtils.getSubInterfaceName;
  
  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.InitializingReaderCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  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.interfaces.state.Interface;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/TapCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/TapCustomizer.java

similarity index 96%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/TapCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/TapCustomizer.java

index 2c1bdcd..683450d 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/TapCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/TapCustomizer.java
@@ -14,16 +14,16 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  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.InitializingReaderCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceTapDetails;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceTapDetailsReplyDump;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/VhostUserCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizer.java

similarity index 97%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/VhostUserCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizer.java

index a6d17cf..6a918e8 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/VhostUserCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizer.java
@@ -14,16 +14,16 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  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.InitializingReaderCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceVhostUserDetails;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceVhostUserDetailsReplyDump;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceVhostUserDump;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/VxlanCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanCustomizer.java

similarity index 97%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/VxlanCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanCustomizer.java

index 1a12204..d3174e6 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/VxlanCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanCustomizer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  import static com.google.common.base.Preconditions.checkState;
  
@@ -23,9 +23,9 @@ import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.Initialized;
  import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.core.dto.VxlanTunnelDetails;
  import io.fd.vpp.jvpp.core.dto.VxlanTunnelDetailsReplyDump;
  import io.fd.vpp.jvpp.core.dto.VxlanTunnelDump;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/VxlanGpeCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanGpeCustomizer.java

similarity index 97%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/VxlanGpeCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanGpeCustomizer.java

index 278e239..b10fef3 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/VxlanGpeCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanGpeCustomizer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  import static com.google.common.base.Preconditions.checkState;
  
@@ -23,9 +23,9 @@ import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.Initialized;
  import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.core.dto.VxlanGpeTunnelDetails;
  import io.fd.vpp.jvpp.core.dto.VxlanGpeTunnelDetailsReplyDump;
  import io.fd.vpp.jvpp.core.dto.VxlanGpeTunnelDump;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/acl/ingress/AclCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/acl/ingress/AclCustomizer.java

similarity index 93%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/acl/ingress/AclCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/acl/ingress/AclCustomizer.java

index 6212f72..713868d 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/acl/ingress/AclCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/acl/ingress/AclCustomizer.java
@@ -14,21 +14,21 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate.acl.ingress;
+package io.fd.hc2vpp.v3po.interfacesstate.acl.ingress;
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static com.google.common.base.Preconditions.checkNotNull;
  
+import io.fd.hc2vpp.v3po.interfacesstate.InterfaceCustomizer;
+import io.fd.hc2vpp.v3po.vppclassifier.VppClassifierContextManager;
  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.InitializingReaderCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
-import io.fd.honeycomb.translate.v3po.interfacesstate.InterfaceCustomizer;
-import io.fd.honeycomb.translate.v3po.vppclassifier.VppClassifierContextManager;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterface;
  import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterfaceReply;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/acl/ingress/AclReader.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/acl/ingress/AclReader.java

similarity index 94%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/acl/ingress/AclReader.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/acl/ingress/AclReader.java

index a905674..8f1b428 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/acl/ingress/AclReader.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/acl/ingress/AclReader.java
@@ -14,10 +14,10 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate.acl.ingress;
+package io.fd.hc2vpp.v3po.interfacesstate.acl.ingress;
  
+import io.fd.hc2vpp.v3po.vppclassifier.VppClassifierContextManager;
  import io.fd.honeycomb.translate.MappingContext;
-import io.fd.honeycomb.translate.v3po.vppclassifier.VppClassifierContextManager;
  import javax.annotation.Nonnull;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.acl.base.attributes.Ip4Acl;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.acl.base.attributes.Ip4AclBuilder;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/acl/ingress/SubInterfaceAclCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/acl/ingress/SubInterfaceAclCustomizer.java

similarity index 92%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/acl/ingress/SubInterfaceAclCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/acl/ingress/SubInterfaceAclCustomizer.java

index ad63035..4190619 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/acl/ingress/SubInterfaceAclCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/acl/ingress/SubInterfaceAclCustomizer.java
@@ -14,22 +14,22 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate.acl.ingress;
+package io.fd.hc2vpp.v3po.interfacesstate.acl.ingress;
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static com.google.common.base.Preconditions.checkNotNull;
-import static io.fd.honeycomb.translate.vpp.util.SubInterfaceUtils.getSubInterfaceName;
+import static io.fd.hc2vpp.v3po.util.SubInterfaceUtils.getSubInterfaceName;
  
+import io.fd.hc2vpp.v3po.vppclassifier.VppClassifierContextManager;
  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.InitializingReaderCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
-import io.fd.honeycomb.translate.v3po.interfacesstate.SubInterfaceCustomizer;
-import io.fd.honeycomb.translate.v3po.vppclassifier.VppClassifierContextManager;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.v3po.interfacesstate.SubInterfaceCustomizer;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterface;
  import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterfaceReply;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4AddressCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/Ipv4AddressCustomizer.java

similarity index 96%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4AddressCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/Ipv4AddressCustomizer.java

index fb09e3a..4a577ae 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4AddressCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/Ipv4AddressCustomizer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate.ip;
+package io.fd.hc2vpp.v3po.interfacesstate.ip;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
@@ -28,10 +28,10 @@ import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
  import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
  import io.fd.honeycomb.translate.util.read.cache.IdentifierCacheKeyFactory;
-import io.fd.honeycomb.translate.v3po.interfacesstate.InterfaceCustomizer;
-import io.fd.honeycomb.translate.v3po.interfacesstate.ip.dump.params.AddressDumpParams;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.v3po.interfacesstate.InterfaceCustomizer;
+import io.fd.hc2vpp.v3po.interfacesstate.ip.dump.params.AddressDumpParams;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.core.dto.IpAddressDetails;
  import io.fd.vpp.jvpp.core.dto.IpAddressDetailsReplyDump;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4Customizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/Ipv4Customizer.java

similarity index 95%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4Customizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/Ipv4Customizer.java

index 4c4803f..316f8ec 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4Customizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/Ipv4Customizer.java
@@ -14,12 +14,12 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate.ip;
+package io.fd.hc2vpp.v3po.interfacesstate.ip;
  
  import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
  import javax.annotation.Nonnull;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.Interface2Builder;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv4;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4NeighbourCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/Ipv4NeighbourCustomizer.java

similarity index 96%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4NeighbourCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/Ipv4NeighbourCustomizer.java

index afc2259..a32f8f2 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4NeighbourCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/Ipv4NeighbourCustomizer.java
@@ -14,12 +14,12 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate.ip;
+package io.fd.hc2vpp.v3po.interfacesstate.ip;
  
  import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
  import java.util.Collections;
  import java.util.List;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4Reader.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/Ipv4Reader.java

similarity index 92%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4Reader.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/Ipv4Reader.java

index a5d13bb..729ca09 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4Reader.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/Ipv4Reader.java
@@ -14,16 +14,16 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate.ip;
+package io.fd.hc2vpp.v3po.interfacesstate.ip;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
  import com.google.common.base.Optional;
  import io.fd.honeycomb.translate.util.RWUtils;
  import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor;
-import io.fd.honeycomb.translate.v3po.interfacesstate.ip.dump.params.AddressDumpParams;
-import io.fd.honeycomb.translate.vpp.util.Ipv4Translator;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.v3po.interfacesstate.ip.dump.params.AddressDumpParams;
+import io.fd.hc2vpp.common.translate.util.Ipv4Translator;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.vpp.jvpp.core.dto.IpAddressDump;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
  import java.util.Collections;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv6Customizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/Ipv6Customizer.java

similarity index 94%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv6Customizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/Ipv6Customizer.java

index a2e7bcc..97f223a 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv6Customizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/Ipv6Customizer.java
@@ -14,13 +14,13 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate.ip;
+package io.fd.hc2vpp.v3po.interfacesstate.ip;
  
  import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import javax.annotation.Nonnull;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.Interface2Builder;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv6;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/SubInterfaceIpv4AddressCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/SubInterfaceIpv4AddressCustomizer.java

similarity index 94%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/SubInterfaceIpv4AddressCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/SubInterfaceIpv4AddressCustomizer.java

index e18de55..eee4979 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/SubInterfaceIpv4AddressCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/SubInterfaceIpv4AddressCustomizer.java
@@ -14,12 +14,14 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate.ip;
+package io.fd.hc2vpp.v3po.interfacesstate.ip;
  
  import static com.google.common.base.Preconditions.checkNotNull;
  
  import com.google.common.base.Optional;
  import com.google.common.collect.ImmutableSet;
+import io.fd.hc2vpp.v3po.interfacesstate.SubInterfaceCustomizer;
+import io.fd.hc2vpp.v3po.interfacesstate.ip.dump.params.AddressDumpParams;
  import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.Initialized;
@@ -27,11 +29,9 @@ import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer;
  import io.fd.honeycomb.translate.util.RWUtils;
  import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
  import io.fd.honeycomb.translate.util.read.cache.IdentifierCacheKeyFactory;
-import io.fd.honeycomb.translate.v3po.interfacesstate.SubInterfaceCustomizer;
-import io.fd.honeycomb.translate.v3po.interfacesstate.ip.dump.params.AddressDumpParams;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.translate.vpp.util.SubInterfaceUtils;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.v3po.util.SubInterfaceUtils;
  import io.fd.vpp.jvpp.core.dto.IpAddressDetails;
  import io.fd.vpp.jvpp.core.dto.IpAddressDetailsReplyDump;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/dump/params/AddressDumpParams.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/dump/params/AddressDumpParams.java

similarity index 94%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/dump/params/AddressDumpParams.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/dump/params/AddressDumpParams.java

index c5ada2d..cb80893 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/dump/params/AddressDumpParams.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/dump/params/AddressDumpParams.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate.ip.dump.params;
+package io.fd.hc2vpp.v3po.interfacesstate.ip.dump.params;
  
  public class AddressDumpParams {
  
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/pbb/PbbRewriteStateCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/pbb/PbbRewriteStateCustomizer.java

similarity index 95%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/pbb/PbbRewriteStateCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/pbb/PbbRewriteStateCustomizer.java

index 69b8c95..4d560a5 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/pbb/PbbRewriteStateCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/pbb/PbbRewriteStateCustomizer.java
@@ -14,12 +14,12 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate.pbb;
+package io.fd.hc2vpp.v3po.interfacesstate.pbb;
  
  import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
  import javax.annotation.Nonnull;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.pbb.rev161214.PbbRewriteStateInterfaceAugmentationBuilder;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/notification/InterfaceChangeNotificationProducer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducer.java

similarity index 97%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/notification/InterfaceChangeNotificationProducer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducer.java

index 115727a..f7a159d 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/notification/InterfaceChangeNotificationProducer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.notification;
+package io.fd.hc2vpp.v3po.notification;
  
  import com.google.common.base.Optional;
  import com.google.common.collect.Lists;
@@ -23,8 +23,8 @@ import com.google.inject.name.Named;
  import io.fd.honeycomb.notification.ManagedNotificationProducer;
  import io.fd.honeycomb.notification.NotificationCollector;
  import io.fd.honeycomb.translate.MappingContext;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import java.util.ArrayList;
  import java.util.Collection;
  import java.util.concurrent.CompletionStage;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/vpp/util/SubInterfaceUtils.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/util/SubInterfaceUtils.java

similarity index 97%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/vpp/util/SubInterfaceUtils.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/util/SubInterfaceUtils.java

index d27dd1e..cb4e11a 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/vpp/util/SubInterfaceUtils.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/util/SubInterfaceUtils.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.v3po.util;
  
  import java.util.List;
  import javax.annotation.Nonnegative;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vpp/ArpTerminationTableEntryCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vpp/ArpTerminationTableEntryCustomizer.java

similarity index 94%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vpp/ArpTerminationTableEntryCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vpp/ArpTerminationTableEntryCustomizer.java

index bd94666..e7c1dea 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vpp/ArpTerminationTableEntryCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vpp/ArpTerminationTableEntryCustomizer.java
@@ -14,15 +14,15 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vpp;
+package io.fd.hc2vpp.v3po.vpp;
  
  import com.google.common.base.Preconditions;
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.AddressTranslator;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.AddressTranslator;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.dto.BdIpMacAddDel;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vpp/BridgeDomainCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vpp/BridgeDomainCustomizer.java

similarity index 95%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vpp/BridgeDomainCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vpp/BridgeDomainCustomizer.java

index a95c18e..b4b8626 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vpp/BridgeDomainCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vpp/BridgeDomainCustomizer.java
@@ -14,17 +14,17 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vpp;
+package io.fd.hc2vpp.v3po.vpp;
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static com.google.common.base.Preconditions.checkNotNull;
  
  import com.google.common.base.Preconditions;
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.dto.BridgeDomainAddDel;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vpp/L2FibEntryCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vpp/L2FibEntryCustomizer.java

similarity index 94%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vpp/L2FibEntryCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vpp/L2FibEntryCustomizer.java

index f37d5dd..6328555 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vpp/L2FibEntryCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vpp/L2FibEntryCustomizer.java
@@ -14,16 +14,16 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vpp;
+package io.fd.hc2vpp.v3po.vpp;
  
  import com.google.common.base.Preconditions;
  import com.google.common.primitives.Longs;
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.MacTranslator;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.MacTranslator;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.core.dto.L2FibAddDel;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifySessionReader.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifySessionReader.java

similarity index 97%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifySessionReader.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifySessionReader.java

index 9f4cd7e..daaa88c 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifySessionReader.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifySessionReader.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vppclassifier;
+package io.fd.hc2vpp.v3po.vppclassifier;
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static com.google.common.base.Preconditions.checkNotNull;
@@ -26,9 +26,9 @@ import io.fd.honeycomb.translate.MappingContext;
  import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer;
-import io.fd.honeycomb.translate.v3po.interfacesstate.InterfaceDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.v3po.interfacesstate.InterfaceDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.vpp.jvpp.core.dto.ClassifySessionDetails;
  import io.fd.vpp.jvpp.core.dto.ClassifySessionDetailsReplyDump;
  import io.fd.vpp.jvpp.core.dto.ClassifySessionDump;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifySessionWriter.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifySessionWriter.java

similarity index 98%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifySessionWriter.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifySessionWriter.java

index 996e76e..4e1a512 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifySessionWriter.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifySessionWriter.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vppclassifier;
+package io.fd.hc2vpp.v3po.vppclassifier;
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static com.google.common.base.Preconditions.checkNotNull;
@@ -23,8 +23,8 @@ import static com.google.common.base.Preconditions.checkState;
  import com.google.common.base.Optional;
  import io.fd.honeycomb.translate.MappingContext;
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import java.util.concurrent.CompletionStage;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifyTableReader.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifyTableReader.java

similarity index 96%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifyTableReader.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifyTableReader.java

index 7451686..fba5fb6 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifyTableReader.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifyTableReader.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vppclassifier;
+package io.fd.hc2vpp.v3po.vppclassifier;
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static com.google.common.base.Preconditions.checkNotNull;
@@ -25,10 +25,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.honeycomb.translate.v3po.interfacesstate.InterfaceDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.MacTranslator;
+import io.fd.hc2vpp.v3po.interfacesstate.InterfaceDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.MacTranslator;
  import io.fd.vpp.jvpp.core.dto.ClassifyTableIds;
  import io.fd.vpp.jvpp.core.dto.ClassifyTableIdsReply;
  import io.fd.vpp.jvpp.core.dto.ClassifyTableInfo;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifyTableWriter.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifyTableWriter.java

similarity index 97%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifyTableWriter.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifyTableWriter.java

index 33dc641..62b6a21 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifyTableWriter.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifyTableWriter.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vppclassifier;
+package io.fd.hc2vpp.v3po.vppclassifier;
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static com.google.common.base.Preconditions.checkNotNull;
@@ -22,8 +22,8 @@ import static com.google.common.base.Preconditions.checkState;
  
  import io.fd.honeycomb.translate.MappingContext;
  import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.honeycomb.translate.write.WriteContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import java.util.concurrent.CompletionStage;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/VppClassifierContextManager.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/VppClassifierContextManager.java

similarity index 98%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/VppClassifierContextManager.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/VppClassifierContextManager.java

index 69dfb64..c06ef27 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/VppClassifierContextManager.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/VppClassifierContextManager.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vppclassifier;
+package io.fd.hc2vpp.v3po.vppclassifier;
  
  import com.google.common.base.Optional;
  import io.fd.honeycomb.translate.MappingContext;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/VppClassifierContextManagerImpl.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/VppClassifierContextManagerImpl.java

similarity index 99%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/VppClassifierContextManagerImpl.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/VppClassifierContextManagerImpl.java

index 13931ae..2255c78 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/VppClassifierContextManagerImpl.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/VppClassifierContextManagerImpl.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vppclassifier;
+package io.fd.hc2vpp.v3po.vppclassifier;
  
  import static com.google.common.base.Preconditions.checkArgument;
  import static com.google.common.base.Preconditions.checkState;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/VppNodeReader.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/VppNodeReader.java

similarity index 97%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/VppNodeReader.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/VppNodeReader.java

index 23ce094..c25a457 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/VppNodeReader.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/VppNodeReader.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vppclassifier;
+package io.fd.hc2vpp.v3po.vppclassifier;
  
  import com.google.common.base.Optional;
  import io.fd.honeycomb.translate.MappingContext;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/VppNodeWriter.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/VppNodeWriter.java

similarity index 95%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/VppNodeWriter.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/VppNodeWriter.java

index 308c249..dd0b2d5 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/VppNodeWriter.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppclassifier/VppNodeWriter.java
@@ -14,14 +14,14 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vppclassifier;
+package io.fd.hc2vpp.v3po.vppclassifier;
  
  import static com.google.common.base.Preconditions.checkArgument;
  
  import io.fd.honeycomb.translate.MappingContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.honeycomb.translate.write.WriteFailedException;
  import io.fd.vpp.jvpp.VppBaseCallException;
  import io.fd.vpp.jvpp.core.dto.GetNextIndex;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppstate/BridgeDomainCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppstate/BridgeDomainCustomizer.java

similarity index 97%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppstate/BridgeDomainCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppstate/BridgeDomainCustomizer.java

index 9f122d1..e6f3bbb 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppstate/BridgeDomainCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppstate/BridgeDomainCustomizer.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vppstate;
+package io.fd.hc2vpp.v3po.vppstate;
  
  import com.google.common.base.Preconditions;
  import com.google.common.collect.Iterables;
@@ -22,9 +22,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.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.core.dto.BridgeDomainDetails;
  import io.fd.vpp.jvpp.core.dto.BridgeDomainDetailsReplyDump;
  import io.fd.vpp.jvpp.core.dto.BridgeDomainDump;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppstate/L2FibEntryCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppstate/L2FibEntryCustomizer.java

similarity index 96%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppstate/L2FibEntryCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppstate/L2FibEntryCustomizer.java

index a9326d9..2605293 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppstate/L2FibEntryCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppstate/L2FibEntryCustomizer.java
@@ -14,19 +14,19 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vppstate;
+package io.fd.hc2vpp.v3po.vppstate;
  
  import com.google.common.base.Preconditions;
  import com.google.common.primitives.Longs;
+import io.fd.hc2vpp.v3po.interfacesstate.InterfaceDataTranslator;
  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.honeycomb.translate.util.RWUtils;
-import io.fd.honeycomb.translate.v3po.interfacesstate.InterfaceDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.vpp.jvpp.core.dto.L2FibTableDump;
  import io.fd.vpp.jvpp.core.dto.L2FibTableEntry;
  import io.fd.vpp.jvpp.core.dto.L2FibTableEntryReplyDump;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppstate/VersionCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppstate/VersionCustomizer.java

similarity index 93%

rename from v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppstate/VersionCustomizer.java

rename to v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppstate/VersionCustomizer.java

index dfa0f96..3f69c98 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppstate/VersionCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vppstate/VersionCustomizer.java
@@ -14,15 +14,15 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vppstate;
+package io.fd.hc2vpp.v3po.vppstate;
  
  import com.google.common.primitives.UnsignedInts;
  import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
  import io.fd.vpp.jvpp.core.dto.ShowVersion;
  import io.fd.vpp.jvpp.core.dto.ShowVersionReply;
  import io.fd.vpp.jvpp.core.future.FutureJVppCore;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/DisabledInterfacesManagerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/DisabledInterfacesManagerTest.java

similarity index 99%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/DisabledInterfacesManagerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/DisabledInterfacesManagerTest.java

index 52a7a5c..94c95bc 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/DisabledInterfacesManagerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/DisabledInterfacesManagerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po;
+package io.fd.hc2vpp.v3po;
  
  
  
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/V3poModuleTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/V3poModuleTest.java

similarity index 98%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/V3poModuleTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/V3poModuleTest.java

index 19aa2c9..3366af6 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/V3poModuleTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/V3poModuleTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po;
+package io.fd.hc2vpp.v3po;
  
  import static org.hamcrest.CoreMatchers.is;
  import static org.hamcrest.CoreMatchers.not;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/AclCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/AclCustomizerTest.java

similarity index 95%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/AclCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/AclCustomizerTest.java

index 53ff779..7f55ae6 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/AclCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/AclCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import static junit.framework.TestCase.assertTrue;
  import static org.junit.Assert.fail;
@@ -22,11 +22,11 @@ import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.doReturn;
  import static org.mockito.Mockito.verify;
  
-import io.fd.honeycomb.translate.v3po.interfaces.acl.ingress.AclCustomizer;
-import io.fd.honeycomb.translate.v3po.vppclassifier.VppClassifierContextManager;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.v3po.interfaces.acl.ingress.AclCustomizer;
+import io.fd.hc2vpp.v3po.vppclassifier.VppClassifierContextManager;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import io.fd.vpp.jvpp.VppBaseCallException;
  import io.fd.vpp.jvpp.core.dto.InputAclSetInterface;
  import io.fd.vpp.jvpp.core.dto.InputAclSetInterfaceReply;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/GreCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/GreCustomizerTest.java

similarity index 98%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/GreCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/GreCustomizerTest.java

index ee0d8fc..da75fa9 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/GreCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/GreCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import static org.junit.Assert.assertArrayEquals;
  import static org.junit.Assert.assertEquals;
@@ -27,9 +27,9 @@ import static org.mockito.Mockito.times;
  import static org.mockito.Mockito.verify;
  
  import com.google.common.net.InetAddresses;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import org.junit.Test;
  import org.mockito.ArgumentCaptor;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/InterfaceCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/InterfaceCustomizerTest.java

similarity index 95%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/InterfaceCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/InterfaceCustomizerTest.java

index 56abe58..c72d43a 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/InterfaceCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/InterfaceCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import static org.junit.Assert.assertTrue;
  import static org.junit.Assert.fail;
@@ -24,10 +24,10 @@ import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.verifyZeroInteractions;
  import static org.mockito.Mockito.when;
  
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+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.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import org.junit.Test;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/InterfaceTypeTestUtils.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/InterfaceTypeTestUtils.java

similarity index 96%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/InterfaceTypeTestUtils.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/InterfaceTypeTestUtils.java

index 9ff5b1b..5bce6ae 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/InterfaceTypeTestUtils.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/InterfaceTypeTestUtils.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import static org.mockito.Mockito.doReturn;
  
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/L2CustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/L2CustomizerTest.java

similarity index 96%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/L2CustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/L2CustomizerTest.java

index ec33295..d54bd33 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/L2CustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/L2CustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import static org.junit.Assert.assertTrue;
  import static org.junit.Assert.fail;
@@ -22,10 +22,10 @@ import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+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.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import org.junit.Test;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/LoopbackCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/LoopbackCustomizerTest.java

similarity index 96%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/LoopbackCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/LoopbackCustomizerTest.java

index 60af7a1..67c9034 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/LoopbackCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/LoopbackCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import static org.mockito.Matchers.any;
  import static org.mockito.Matchers.eq;
@@ -23,8 +23,8 @@ import static org.mockito.Mockito.doReturn;
  import static org.mockito.Mockito.times;
  import static org.mockito.Mockito.verify;
  
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import io.fd.vpp.jvpp.core.dto.CreateLoopback;
  import io.fd.vpp.jvpp.core.dto.CreateLoopbackReply;
  import io.fd.vpp.jvpp.core.dto.DeleteLoopback;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/ProxyArpCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ProxyArpCustomizerTest.java

similarity index 96%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/ProxyArpCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ProxyArpCustomizerTest.java

index 922d072..232d62e 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/ProxyArpCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ProxyArpCustomizerTest.java
@@ -14,15 +14,15 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  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.interfaces.rev140508.Interfaces;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/RewriteCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/RewriteCustomizerTest.java

similarity index 97%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/RewriteCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/RewriteCustomizerTest.java

index 035a0f2..fa99142 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/RewriteCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/RewriteCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import static junit.framework.TestCase.assertTrue;
  import static org.junit.Assert.fail;
@@ -22,10 +22,10 @@ import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.doReturn;
  import static org.mockito.Mockito.verify;
  
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.translate.vpp.util.TagRewriteOperation;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.TagRewriteOperation;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import io.fd.vpp.jvpp.VppBaseCallException;
  import io.fd.vpp.jvpp.VppInvocationException;
  import io.fd.vpp.jvpp.core.dto.L2InterfaceVlanTagRewrite;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/RoutingCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/RoutingCustomizerTest.java

similarity index 96%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/RoutingCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/RoutingCustomizerTest.java

index a6a0b48..a61cd14 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/RoutingCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/RoutingCustomizerTest.java
@@ -14,15 +14,15 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceSetTable;
  import io.fd.vpp.jvpp.core.dto.SwInterfaceSetTableReply;
  import org.junit.Test;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/SubInterfaceCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceCustomizerTest.java

similarity index 98%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/SubInterfaceCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceCustomizerTest.java

index bcf3cad..fd71a80 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/SubInterfaceCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertTrue;
@@ -25,9 +25,9 @@ import static org.mockito.Mockito.doReturn;
  import static org.mockito.Mockito.times;
  import static org.mockito.Mockito.verify;
  
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import java.util.Arrays;
  import java.util.List;
  import org.junit.Test;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/SubInterfaceL2CustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceL2CustomizerTest.java

similarity index 95%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/SubInterfaceL2CustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceL2CustomizerTest.java

index 3538a5c..29b1b0d 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/SubInterfaceL2CustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceL2CustomizerTest.java
@@ -14,16 +14,16 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+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.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import org.junit.Test;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/TapCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/TapCustomizerTest.java

similarity index 97%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/TapCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/TapCustomizerTest.java

index 6e9fbe6..f55859a 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/TapCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/TapCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import static org.mockito.Matchers.any;
  import static org.mockito.Matchers.eq;
@@ -23,8 +23,8 @@ import static org.mockito.Mockito.doReturn;
  import static org.mockito.Mockito.times;
  import static org.mockito.Mockito.verify;
  
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import org.junit.Test;
  import org.mockito.invocation.InvocationOnMock;
  import org.mockito.stubbing.Answer;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/VhostUserCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VhostUserCustomizerTest.java

similarity index 97%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/VhostUserCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VhostUserCustomizerTest.java

index 344b2eb..4f8b7a6 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/VhostUserCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VhostUserCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import static org.junit.Assert.assertArrayEquals;
  import static org.junit.Assert.assertEquals;
@@ -29,10 +29,10 @@ import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.verifyZeroInteractions;
  import static org.mockito.Mockito.when;
  
-import io.fd.honeycomb.translate.vpp.util.Ipv4Translator;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.Ipv4Translator;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import org.junit.Test;
  import org.mockito.ArgumentCaptor;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/VxlanCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizerTest.java

similarity index 97%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/VxlanCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizerTest.java

index d2a4f4c..f5b6873 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/VxlanCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import static org.junit.Assert.assertArrayEquals;
  import static org.junit.Assert.assertEquals;
@@ -28,10 +28,10 @@ import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
  import com.google.common.net.InetAddresses;
-import io.fd.honeycomb.translate.v3po.DisabledInterfacesManager;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.v3po.DisabledInterfacesManager;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import org.junit.Test;
  import org.mockito.ArgumentCaptor;
  import org.mockito.Mock;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/VxlanGpeCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VxlanGpeCustomizerTest.java

similarity index 97%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/VxlanGpeCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VxlanGpeCustomizerTest.java

index 0792a0e..7337c16 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/VxlanGpeCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VxlanGpeCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces;
+package io.fd.hc2vpp.v3po.interfaces;
  
  import static org.junit.Assert.assertArrayEquals;
  import static org.junit.Assert.assertEquals;
@@ -28,10 +28,10 @@ import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
  import com.google.common.net.InetAddresses;
-import io.fd.honeycomb.translate.v3po.DisabledInterfacesManager;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.v3po.DisabledInterfacesManager;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import org.junit.Test;
  import org.mockito.ArgumentCaptor;
  import org.mockito.Mock;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/AclWriterTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/AclWriterTest.java

similarity index 97%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/AclWriterTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/AclWriterTest.java

index d2ace4a..7641bd9 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/AclWriterTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/AclWriterTest.java
@@ -14,14 +14,14 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl;
+package io.fd.hc2vpp.v3po.interfaces.acl;
  
  import static org.mockito.Mockito.doReturn;
  import static org.mockito.Mockito.when;
  
  import com.google.common.base.Optional;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import java.util.Collections;
  import java.util.List;
  import org.junit.Test;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceEthWriterTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceEthWriterTest.java

similarity index 98%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceEthWriterTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceEthWriterTest.java

index 3a50b76..ec13216 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceEthWriterTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceEthWriterTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
+package io.fd.hc2vpp.v3po.interfaces.acl.common;
  
  import static org.junit.Assert.assertArrayEquals;
  import static org.junit.Assert.assertEquals;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIp4WriterTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceIp4WriterTest.java

similarity index 98%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIp4WriterTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceIp4WriterTest.java

index f3a9d0f..cb3b246 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIp4WriterTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceIp4WriterTest.java
@@ -14,9 +14,9 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
+package io.fd.hc2vpp.v3po.interfaces.acl.common;
  
-import static io.fd.honeycomb.translate.v3po.interfaces.acl.common.AclTranslator.VLAN_TAG_LEN;
+import static io.fd.hc2vpp.v3po.interfaces.acl.common.AclTranslator.VLAN_TAG_LEN;
  import static org.junit.Assert.assertEquals;
  import static org.mockito.MockitoAnnotations.initMocks;
  
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIp6WriterTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceIp6WriterTest.java

similarity index 96%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIp6WriterTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceIp6WriterTest.java

index 382d884..30dff95 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIp6WriterTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceIp6WriterTest.java
@@ -14,9 +14,8 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
+package io.fd.hc2vpp.v3po.interfaces.acl.common;
  
-import static io.fd.honeycomb.translate.v3po.interfaces.acl.common.AclTranslator.VLAN_TAG_LEN;
  import static org.junit.Assert.assertEquals;
  import static org.mockito.MockitoAnnotations.initMocks;
  
@@ -95,7 +94,7 @@ public class AceIp6WriterTest {
              expectedMask[12] = (byte) 0xff;
              expectedMask[13] = (byte) 0xff;
          }
-        AceIpWriterTestUtils.assertArrayEqualsWithOffset(expectedMask, vlanTags == 2 ? 80 : 64, request.mask, vlanTags * VLAN_TAG_LEN);
+        AceIpWriterTestUtils.assertArrayEqualsWithOffset(expectedMask, vlanTags == 2 ? 80 : 64, request.mask, vlanTags * AclTranslator.VLAN_TAG_LEN);
      }
  
      private static void verifySessionRequest(final ClassifyAddDelSession request, final int tableIndex,
@@ -127,7 +126,7 @@ public class AceIp6WriterTest {
              expectedMatch[12] = (byte) 0x86;
              expectedMatch[13] = (byte) 0xdd;
          }
-        AceIpWriterTestUtils.assertArrayEqualsWithOffset(expectedMatch, vlanTags == 2 ? 80 : 64, request.match, vlanTags * VLAN_TAG_LEN);
+        AceIpWriterTestUtils.assertArrayEqualsWithOffset(expectedMatch, vlanTags == 2 ? 80 : 64, request.match, vlanTags * AclTranslator.VLAN_TAG_LEN);
  
      }
  
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIpAndEthWriterTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceIpAndEthWriterTest.java

similarity index 98%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIpAndEthWriterTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceIpAndEthWriterTest.java

index d224a06..34c7334 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIpAndEthWriterTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceIpAndEthWriterTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
+package io.fd.hc2vpp.v3po.interfaces.acl.common;
  
  import static org.junit.Assert.assertArrayEquals;
  import static org.junit.Assert.assertEquals;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIpWriterTestUtils.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceIpWriterTestUtils.java

similarity index 95%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIpWriterTestUtils.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceIpWriterTestUtils.java

index 59e22a8..087d91d 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIpWriterTestUtils.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AceIpWriterTestUtils.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
+package io.fd.hc2vpp.v3po.interfaces.acl.common;
  
  import static org.junit.Assert.assertArrayEquals;
  
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AclTableContextManagerImplTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AclTableContextManagerImplTest.java

similarity index 97%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AclTableContextManagerImplTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AclTableContextManagerImplTest.java

index 490e26b..3f106cc 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AclTableContextManagerImplTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AclTableContextManagerImplTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
+package io.fd.hc2vpp.v3po.interfaces.acl.common;
  
  import static org.mockito.Mockito.verify;
  import static org.mockito.MockitoAnnotations.initMocks;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/PortPairTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/common/PortPairTest.java

similarity index 98%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/PortPairTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/common/PortPairTest.java

index 2127fb0..f5c319f 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/PortPairTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/common/PortPairTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
+package io.fd.hc2vpp.v3po.interfaces.acl.common;
  
  import static org.hamcrest.MatcherAssert.assertThat;
  import static org.hamcrest.Matchers.contains;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/EgressIetfAclWriterTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/EgressIetfAclWriterTest.java

similarity index 97%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/EgressIetfAclWriterTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/EgressIetfAclWriterTest.java

index e1aa0b8..0b75b5b 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/EgressIetfAclWriterTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/EgressIetfAclWriterTest.java
@@ -14,15 +14,15 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.egress;
+package io.fd.hc2vpp.v3po.interfaces.acl.egress;
  
  import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
  import com.google.common.base.Optional;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.common.AclTableContextManager;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.v3po.interfaces.acl.common.AclTableContextManager;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSessionReply;
  import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
  import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTableReply;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/IetfAclCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/IetfAclCustomizerTest.java

similarity index 95%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/IetfAclCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/IetfAclCustomizerTest.java

index 2be2212..07e6518 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/IetfAclCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/IetfAclCustomizerTest.java
@@ -14,15 +14,15 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.egress;
+package io.fd.hc2vpp.v3po.interfaces.acl.egress;
  
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.verifyZeroInteractions;
  
-import io.fd.honeycomb.translate.v3po.interfaces.acl.common.IetfAclWriter;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.v3po.interfaces.acl.common.IetfAclWriter;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import java.util.Collections;
  import org.junit.Test;
  import org.mockito.Mock;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/SubInterfaceIetfAclCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/SubInterfaceIetfAclCustomizerTest.java

similarity index 96%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/SubInterfaceIetfAclCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/SubInterfaceIetfAclCustomizerTest.java

index abefa24..24c57a1 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/SubInterfaceIetfAclCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/SubInterfaceIetfAclCustomizerTest.java
@@ -14,17 +14,17 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.egress;
+package io.fd.hc2vpp.v3po.interfaces.acl.egress;
  
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.verifyZeroInteractions;
  import static org.mockito.Mockito.when;
  
  import com.google.common.base.Optional;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.common.IetfAclWriter;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.v3po.interfaces.acl.common.IetfAclWriter;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import java.util.Collections;
  import org.junit.Test;
  import org.mockito.Mock;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/IetfAclCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/IetfAclCustomizerTest.java

similarity index 97%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/IetfAclCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/IetfAclCustomizerTest.java

index 8a4e921..9b7267d 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/IetfAclCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/IetfAclCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.ingress;
+package io.fd.hc2vpp.v3po.interfaces.acl.ingress;
  
  import static org.mockito.Matchers.any;
  import static org.mockito.Matchers.argThat;
@@ -22,10 +22,10 @@ import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
  import com.google.common.base.Optional;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.common.AclTableContextManager;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.v3po.interfaces.acl.common.AclTableContextManager;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
  import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSessionReply;
  import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/SubInterfaceAclCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/SubInterfaceAclCustomizerTest.java

similarity index 96%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/SubInterfaceAclCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/SubInterfaceAclCustomizerTest.java

index d4cfd61..8b08888 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/SubInterfaceAclCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/SubInterfaceAclCustomizerTest.java
@@ -14,16 +14,16 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.ingress;
+package io.fd.hc2vpp.v3po.interfaces.acl.ingress;
  
  import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
-import io.fd.honeycomb.translate.v3po.vppclassifier.VppClassifierContextManager;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.v3po.vppclassifier.VppClassifierContextManager;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import io.fd.vpp.jvpp.core.dto.InputAclSetInterface;
  import io.fd.vpp.jvpp.core.dto.InputAclSetInterfaceReply;
  import org.junit.Test;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/SubInterfaceIetfAclCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/SubInterfaceIetfAclCustomizerTest.java

similarity index 95%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/SubInterfaceIetfAclCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/SubInterfaceIetfAclCustomizerTest.java

index 75f2b8e..e3c1d86 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/SubInterfaceIetfAclCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/SubInterfaceIetfAclCustomizerTest.java
@@ -14,17 +14,18 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.acl.ingress;
+package io.fd.hc2vpp.v3po.interfaces.acl.ingress;
  
  import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
  import com.google.common.base.Optional;
-import io.fd.honeycomb.translate.v3po.interfaces.acl.common.AclTableContextManager;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.v3po.interfaces.acl.IetfAclWriter;
+import io.fd.hc2vpp.v3po.interfaces.acl.common.AclTableContextManager;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterface;
  import io.fd.vpp.jvpp.core.dto.InputAclSetInterface;
  import io.fd.vpp.jvpp.core.dto.InputAclSetInterfaceReply;
@@ -136,7 +137,7 @@ public class SubInterfaceIetfAclCustomizerTest extends WriterCustomizerTest {
              new SubInterfaceBuilder().build()
          ));
  
-        when(writeContext.readAfter(io.fd.honeycomb.translate.v3po.interfaces.acl.IetfAclWriter.ACL_ID.child(
+        when(writeContext.readAfter(IetfAclWriter.ACL_ID.child(
              org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.Acl.class,
              new AclKey(ACL_NAME, ACL_TYPE)))).thenReturn(Optional.of(
              new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.AclBuilder()
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv4AddressCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/Ipv4AddressCustomizerTest.java

similarity index 97%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv4AddressCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/Ipv4AddressCustomizerTest.java

index 00b424d..6659e79 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv4AddressCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/Ipv4AddressCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.ip;
+package io.fd.hc2vpp.v3po.interfaces.ip;
  
  import static org.junit.Assert.assertTrue;
  import static org.junit.Assert.fail;
@@ -29,11 +29,11 @@ import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
  import com.google.common.base.Optional;
-import io.fd.honeycomb.translate.v3po.interfaces.ip.subnet.validation.SubnetValidationException;
-import io.fd.honeycomb.translate.v3po.interfaces.ip.subnet.validation.SubnetValidator;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.v3po.interfaces.ip.subnet.validation.SubnetValidationException;
+import io.fd.hc2vpp.v3po.interfaces.ip.subnet.validation.SubnetValidator;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import java.util.Arrays;
  import java.util.Collections;
  import java.util.List;
@@ -159,7 +159,7 @@ public class Ipv4AddressCustomizerTest extends WriterCustomizerTest {
          final List<Address> addressList = Arrays.asList(data);
  
          //throws when validation invoked
-        doThrow(SubnetValidationException.forConflictingData((short) 24, Arrays.asList(data))).when(subnetValidator)
+        Mockito.doThrow(SubnetValidationException.forConflictingData((short) 24, Arrays.asList(data))).when(subnetValidator)
                  .checkNotAddingToSameSubnet(addressList);
  
          //fake data return from WriteContext
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv4NeighbourCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/Ipv4NeighbourCustomizerTest.java

similarity index 96%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv4NeighbourCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/Ipv4NeighbourCustomizerTest.java

index c856d9b..390561d 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv4NeighbourCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/Ipv4NeighbourCustomizerTest.java
@@ -14,17 +14,17 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.ip;
+package io.fd.hc2vpp.v3po.interfaces.ip;
  
  import static junit.framework.TestCase.assertTrue;
  import static org.junit.Assert.fail;
  import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
-import io.fd.honeycomb.translate.vpp.util.Ipv4Translator;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.Ipv4Translator;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import org.junit.Test;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/ip/SubInterfaceIpv4AddressCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/SubInterfaceIpv4AddressCustomizerTest.java

similarity index 96%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/ip/SubInterfaceIpv4AddressCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/SubInterfaceIpv4AddressCustomizerTest.java

index 269fc52..be0869f 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/ip/SubInterfaceIpv4AddressCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/SubInterfaceIpv4AddressCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.ip;
+package io.fd.hc2vpp.v3po.interfaces.ip;
  
  import static org.junit.Assert.assertTrue;
  import static org.junit.Assert.fail;
@@ -22,10 +22,10 @@ import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+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.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import org.junit.Test;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/ip/subnet/validation/SubnetValidatorTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/subnet/validation/SubnetValidatorTest.java

similarity index 98%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/ip/subnet/validation/SubnetValidatorTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/subnet/validation/SubnetValidatorTest.java

index 7c3088f..0c1e878 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/ip/subnet/validation/SubnetValidatorTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/subnet/validation/SubnetValidatorTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.ip.subnet.validation;
+package io.fd.hc2vpp.v3po.interfaces.ip.subnet.validation;
  
  
  import com.google.common.collect.Lists;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/pbb/PbbRewriteCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/pbb/PbbRewriteCustomizerTest.java

similarity index 98%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/pbb/PbbRewriteCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/pbb/PbbRewriteCustomizerTest.java

index e1a7918..fa68e61 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/pbb/PbbRewriteCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/pbb/PbbRewriteCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfaces.pbb;
+package io.fd.hc2vpp.v3po.interfaces.pbb;
  
  import static org.junit.Assert.assertArrayEquals;
  import static org.junit.Assert.assertEquals;
@@ -26,9 +26,9 @@ import static org.mockito.Mockito.times;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import io.fd.vpp.jvpp.VppCallbackException;
  import io.fd.vpp.jvpp.core.dto.L2InterfacePbbTagRewrite;
  import io.fd.vpp.jvpp.core.dto.L2InterfacePbbTagRewriteReply;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/EthernetCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/EthernetCustomizerTest.java

similarity index 94%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/EthernetCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/EthernetCustomizerTest.java

index a04b022..338d633 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/EthernetCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/EthernetCustomizerTest.java
@@ -14,16 +14,16 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  import static org.mockito.Mockito.mock;
  import static org.mockito.Mockito.verify;
  
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ReaderCustomizerTest;
-import io.fd.honeycomb.vpp.test.util.InterfaceDumpHelper;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest;
+import io.fd.hc2vpp.common.test.util.InterfaceDumpHelper;
  import org.junit.Test;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/GreCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/GreCustomizerTest.java

similarity index 97%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/GreCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/GreCustomizerTest.java

index fa53686..1aadb5b 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/GreCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/GreCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertNotNull;
@@ -26,8 +26,8 @@ import static org.mockito.Mockito.verifyZeroInteractions;
  
  import com.google.common.collect.Lists;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ReaderCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest;
  import java.net.InetAddress;
  import java.net.UnknownHostException;
  import java.util.HashMap;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/InterfaceCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizerTest.java

similarity index 95%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/InterfaceCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizerTest.java

index 581da29..2958051 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/InterfaceCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.fail;
@@ -25,13 +25,12 @@ import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.verifyZeroInteractions;
  
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.v3po.DisabledInterfacesManager;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ListReaderCustomizerTest;
-import io.fd.honeycomb.vpp.test.util.InterfaceDumpHelper;
+import io.fd.hc2vpp.v3po.DisabledInterfacesManager;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
+import io.fd.hc2vpp.common.test.util.InterfaceDumpHelper;
  import java.util.Arrays;
  import java.util.List;
-import org.junit.Assert;
  import org.junit.Test;
  import org.mockito.Mock;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
@@ -87,7 +86,7 @@ public class InterfaceCustomizerTest extends ListReaderCustomizerTest<Interface,
  
      private void assertIfacesAreEqual(final Interface iface, final SwInterfaceDetails details) {
          assertEquals(iface.getName(), new String(details.interfaceName));
-        Assert.assertEquals(yangIfIndexToVpp(iface.getIfIndex().intValue()), details.swIfIndex);
+        assertEquals(yangIfIndexToVpp(iface.getIfIndex().intValue()), details.swIfIndex);
          assertEquals(iface.getPhysAddress().getValue(), vppPhysAddrToYang(details.l2Address));
      }
  
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/InterfaceDataTranslatorTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslatorTest.java

similarity index 97%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/InterfaceDataTranslatorTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslatorTest.java

index 56e4082..7c7f648 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/InterfaceDataTranslatorTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslatorTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  import static org.junit.Assert.assertEquals;
  
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/L2CustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/L2CustomizerTest.java

similarity index 97%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/L2CustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/L2CustomizerTest.java

index 6bc839a..531e18d 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/L2CustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/L2CustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.mock;
@@ -22,8 +22,8 @@ import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ReaderCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest;
  import java.util.Collections;
  import java.util.HashMap;
  import java.util.List;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/RewriteCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizerTest.java

similarity index 95%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/RewriteCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizerTest.java

index 7ca1bd6..1b79f51 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/RewriteCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  import static org.junit.Assert.assertEquals;
  import static org.mockito.Mockito.mock;
@@ -22,9 +22,9 @@ import static org.mockito.Mockito.verify;
  
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.vpp.test.read.ReaderCustomizerTest;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.translate.vpp.util.TagRewriteOperation;
+import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.TagRewriteOperation;
  import java.util.HashMap;
  import java.util.List;
  import java.util.Map;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/SubInterfaceCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizerTest.java

similarity index 96%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/SubInterfaceCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizerTest.java

index 30c551c..802d040 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/SubInterfaceCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertTrue;
@@ -23,9 +23,9 @@ import static org.mockito.Mockito.verify;
  
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ListReaderCustomizerTest;
-import io.fd.honeycomb.vpp.test.util.InterfaceDumpHelper;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
+import io.fd.hc2vpp.common.test.util.InterfaceDumpHelper;
  import java.util.HashMap;
  import java.util.List;
  import java.util.Map;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/SubInterfaceL2CustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceL2CustomizerTest.java

similarity index 95%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/SubInterfaceL2CustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceL2CustomizerTest.java

index 83e8410..fc7d8e8 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/SubInterfaceL2CustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceL2CustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.mock;
@@ -22,8 +22,8 @@ import static org.mockito.Mockito.when;
  
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ReaderCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest;
  import org.junit.Test;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/TapCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/TapCustomizerTest.java

similarity index 94%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/TapCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/TapCustomizerTest.java

index 3535085..c9de710 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/TapCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/TapCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.mock;
@@ -23,9 +23,9 @@ import static org.mockito.Mockito.when;
  
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ReaderCustomizerTest;
-import io.fd.honeycomb.vpp.test.util.InterfaceDumpHelper;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest;
+import io.fd.hc2vpp.common.test.util.InterfaceDumpHelper;
  import org.junit.Test;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/VhostUserCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizerTest.java

similarity index 95%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/VhostUserCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizerTest.java

index 90e3ed0..57655db 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/VhostUserCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.mock;
@@ -23,9 +23,9 @@ import static org.mockito.Mockito.when;
  
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ReaderCustomizerTest;
-import io.fd.honeycomb.vpp.test.util.InterfaceDumpHelper;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest;
+import io.fd.hc2vpp.common.test.util.InterfaceDumpHelper;
  import java.math.BigInteger;
  import org.junit.Test;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/VxlanCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanCustomizerTest.java

similarity index 97%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/VxlanCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanCustomizerTest.java

index 84beebc..d59d136 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/VxlanCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertNotNull;
@@ -26,8 +26,8 @@ import static org.mockito.Mockito.verifyZeroInteractions;
  
  import com.google.common.collect.Lists;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ReaderCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest;
  import java.net.InetAddress;
  import java.net.UnknownHostException;
  import java.util.HashMap;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/VxlanGpeCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanGpeCustomizerTest.java

similarity index 97%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/VxlanGpeCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanGpeCustomizerTest.java

index e506ab3..e0abd51 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/VxlanGpeCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanGpeCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate;
+package io.fd.hc2vpp.v3po.interfacesstate;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertNotNull;
@@ -26,8 +26,8 @@ import static org.mockito.Mockito.verifyZeroInteractions;
  
  import com.google.common.collect.Lists;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ReaderCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest;
  import java.net.InetAddress;
  import java.net.UnknownHostException;
  import java.util.HashMap;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/acl/ingress/AclCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/acl/ingress/AclCustomizerTest.java

similarity index 94%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/acl/ingress/AclCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/acl/ingress/AclCustomizerTest.java

index b6dd445..6948302 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/acl/ingress/AclCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/acl/ingress/AclCustomizerTest.java
@@ -14,18 +14,18 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate.acl.ingress;
+package io.fd.hc2vpp.v3po.interfacesstate.acl.ingress;
  
  import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.mock;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
+import io.fd.hc2vpp.v3po.vppclassifier.VppClassifierContextManager;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.v3po.vppclassifier.VppClassifierContextManager;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ReaderCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest;
  import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterfaceReply;
  import org.junit.Test;
  import org.mockito.Mock;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/acl/ingress/SubInterfaceAclCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/acl/ingress/SubInterfaceAclCustomizerTest.java

similarity index 95%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/acl/ingress/SubInterfaceAclCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/acl/ingress/SubInterfaceAclCustomizerTest.java

index 7406f94..9dbb20f 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/acl/ingress/SubInterfaceAclCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/acl/ingress/SubInterfaceAclCustomizerTest.java
@@ -14,18 +14,18 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate.acl.ingress;
+package io.fd.hc2vpp.v3po.interfacesstate.acl.ingress;
  
  import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.mock;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
+import io.fd.hc2vpp.v3po.vppclassifier.VppClassifierContextManager;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.v3po.vppclassifier.VppClassifierContextManager;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ReaderCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest;
  import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterfaceReply;
  import org.junit.Test;
  import org.mockito.Mock;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4AddressCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/Ipv4AddressCustomizerTest.java

similarity index 98%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4AddressCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/Ipv4AddressCustomizerTest.java

index efe6c6a..a2eda91 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4AddressCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/Ipv4AddressCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate.ip;
+package io.fd.hc2vpp.v3po.interfacesstate.ip;
  
  
  import static org.hamcrest.Matchers.empty;
@@ -31,9 +31,9 @@ import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
  import io.fd.honeycomb.translate.util.read.cache.CacheKeyFactory;
  import io.fd.honeycomb.translate.util.read.cache.IdentifierCacheKeyFactory;
-import io.fd.honeycomb.translate.vpp.util.Ipv4Translator;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ListReaderCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.Ipv4Translator;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
  import io.fd.vpp.jvpp.core.dto.IpAddressDetails;
  import io.fd.vpp.jvpp.core.dto.IpAddressDetailsReplyDump;
  import io.fd.vpp.jvpp.core.dto.IpAddressDump;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4CustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/Ipv4CustomizerTest.java

similarity index 93%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4CustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/Ipv4CustomizerTest.java

index f536a37..1bfb627 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4CustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/Ipv4CustomizerTest.java
@@ -14,12 +14,12 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate.ip;
+package io.fd.hc2vpp.v3po.interfacesstate.ip;
  
  import static org.mockito.Mockito.verifyZeroInteractions;
  
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.vpp.test.read.ReaderCustomizerTest;
+import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest;
  import org.junit.Test;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.Interface2Builder;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv4;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/SubInterfaceIpv4AddressCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/SubInterfaceIpv4AddressCustomizerTest.java

similarity index 98%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/SubInterfaceIpv4AddressCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/SubInterfaceIpv4AddressCustomizerTest.java

index 9a9346a..cecc702 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/SubInterfaceIpv4AddressCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/SubInterfaceIpv4AddressCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate.ip;
+package io.fd.hc2vpp.v3po.interfacesstate.ip;
  
  import static org.hamcrest.MatcherAssert.assertThat;
  import static org.hamcrest.Matchers.containsInAnyOrder;
@@ -33,9 +33,9 @@ import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer;
  import io.fd.honeycomb.translate.util.read.cache.CacheKeyFactory;
  import io.fd.honeycomb.translate.util.read.cache.IdentifierCacheKeyFactory;
-import io.fd.honeycomb.translate.vpp.util.Ipv4Translator;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ListReaderCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.Ipv4Translator;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
  import io.fd.vpp.jvpp.core.dto.IpAddressDetails;
  import io.fd.vpp.jvpp.core.dto.IpAddressDetailsReplyDump;
  import java.util.Arrays;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/pbb/PbbRewriteStateCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/pbb/PbbRewriteStateCustomizerTest.java

similarity index 92%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/pbb/PbbRewriteStateCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/pbb/PbbRewriteStateCustomizerTest.java

index 156e9a0..2fd959a 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfacesstate/pbb/PbbRewriteStateCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/pbb/PbbRewriteStateCustomizerTest.java
@@ -14,10 +14,10 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.interfacesstate.pbb;
+package io.fd.hc2vpp.v3po.interfacesstate.pbb;
  
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.vpp.test.read.ReaderCustomizerTest;
+import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.pbb.rev161214.PbbRewriteStateInterfaceAugmentationBuilder;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.pbb.rev161214.interfaces.state._interface.PbbRewriteState;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.pbb.rev161214.interfaces.state._interface.PbbRewriteStateBuilder;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/notification/InterfaceChangeNotificationProducerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducerTest.java

similarity index 95%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/notification/InterfaceChangeNotificationProducerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducerTest.java

index 40ae357..38c6588 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/notification/InterfaceChangeNotificationProducerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.notification;
+package io.fd.hc2vpp.v3po.notification;
  
  import static org.junit.Assert.assertEquals;
  import static org.mockito.Matchers.any;
@@ -24,9 +24,9 @@ import static org.mockito.Mockito.verify;
  
  import io.fd.honeycomb.notification.NotificationCollector;
  import io.fd.honeycomb.translate.MappingContext;
-import io.fd.honeycomb.vpp.test.util.NamingContextHelper;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.util.FutureProducer;
+import io.fd.hc2vpp.common.test.util.NamingContextHelper;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.util.FutureProducer;
  import org.junit.Before;
  import org.junit.Test;
  import org.mockito.ArgumentCaptor;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/vpp/util/SubinterfaceUtilsTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/util/SubinterfaceUtilsTest.java

similarity index 95%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/vpp/util/SubinterfaceUtilsTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/util/SubinterfaceUtilsTest.java

index da2a042..fc08fbc 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/vpp/util/SubinterfaceUtilsTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/util/SubinterfaceUtilsTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.vpp.util;
+package io.fd.hc2vpp.v3po.util;
  
  import static org.junit.Assert.assertEquals;
  
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vpp/ArpTerminationTableEntryCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vpp/ArpTerminationTableEntryCustomizerTest.java

similarity index 98%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vpp/ArpTerminationTableEntryCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vpp/ArpTerminationTableEntryCustomizerTest.java

index 95000c0..3377809 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vpp/ArpTerminationTableEntryCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vpp/ArpTerminationTableEntryCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vpp;
+package io.fd.hc2vpp.v3po.vpp;
  
  import static org.junit.Assert.assertArrayEquals;
  import static org.junit.Assert.assertEquals;
@@ -25,9 +25,9 @@ import static org.mockito.Mockito.doReturn;
  import static org.mockito.Mockito.mock;
  import static org.mockito.Mockito.verify;
  
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import io.fd.vpp.jvpp.VppBaseCallException;
  import io.fd.vpp.jvpp.VppInvocationException;
  import io.fd.vpp.jvpp.core.dto.BdIpMacAddDel;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vpp/BridgeDomainCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vpp/BridgeDomainCustomizerTest.java

similarity index 97%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vpp/BridgeDomainCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vpp/BridgeDomainCustomizerTest.java

index 9143080..cab5d5c 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vpp/BridgeDomainCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vpp/BridgeDomainCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vpp;
+package io.fd.hc2vpp.v3po.vpp;
  
  import static org.junit.Assert.fail;
  import static org.mockito.Matchers.any;
@@ -23,10 +23,10 @@ import static org.mockito.Mockito.never;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
-import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+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.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import io.fd.vpp.jvpp.VppInvocationException;
  import io.fd.vpp.jvpp.core.dto.BridgeDomainAddDel;
  import io.fd.vpp.jvpp.core.dto.BridgeDomainAddDelReply;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vpp/L2FibEntryCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vpp/L2FibEntryCustomizerTest.java

similarity index 98%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vpp/L2FibEntryCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vpp/L2FibEntryCustomizerTest.java

index 88e75a7..6bb5bc6 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vpp/L2FibEntryCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vpp/L2FibEntryCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vpp;
+package io.fd.hc2vpp.v3po.vpp;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertTrue;
@@ -24,9 +24,9 @@ import static org.mockito.Mockito.doReturn;
  import static org.mockito.Mockito.mock;
  import static org.mockito.Mockito.verify;
  
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import io.fd.vpp.jvpp.VppBaseCallException;
  import io.fd.vpp.jvpp.VppInvocationException;
  import io.fd.vpp.jvpp.core.dto.L2FibAddDel;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifySessionReaderTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifySessionReaderTest.java

similarity index 98%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifySessionReaderTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifySessionReaderTest.java

index 3b93389..f8645da 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifySessionReaderTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifySessionReaderTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vppclassifier;
+package io.fd.hc2vpp.v3po.vppclassifier;
  
  import static org.junit.Assert.assertEquals;
  import static org.mockito.Matchers.any;
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.when;
  import io.fd.honeycomb.translate.ModificationCache;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.vpp.test.read.ListReaderCustomizerTest;
+import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
  import java.util.Arrays;
  import java.util.Collections;
  import java.util.List;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifySessionWriterTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifySessionWriterTest.java

similarity index 98%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifySessionWriterTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifySessionWriterTest.java

index 5aeab58..654900c 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifySessionWriterTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifySessionWriterTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vppclassifier;
+package io.fd.hc2vpp.v3po.vppclassifier;
  
  import static org.junit.Assert.assertTrue;
  import static org.junit.Assert.fail;
@@ -26,7 +26,7 @@ import static org.mockito.Mockito.when;
  
  import com.google.common.base.Optional;
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import io.fd.vpp.jvpp.VppBaseCallException;
  import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
  import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSessionReply;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifyTableReaderTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifyTableReaderTest.java

similarity index 98%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifyTableReaderTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifyTableReaderTest.java

index c6085cc..7020074 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifyTableReaderTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifyTableReaderTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vppclassifier;
+package io.fd.hc2vpp.v3po.vppclassifier;
  
  import static org.junit.Assert.assertEquals;
  import static org.mockito.Matchers.any;
@@ -28,7 +28,7 @@ import static org.mockito.Mockito.when;
  import com.google.common.base.Optional;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.vpp.test.read.ListReaderCustomizerTest;
+import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
  import java.util.List;
  import org.junit.Test;
  import org.mockito.Mock;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifyTableWriterTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifyTableWriterTest.java

similarity index 98%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifyTableWriterTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifyTableWriterTest.java

index 0869986..a4da546 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/ClassifyTableWriterTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppclassifier/ClassifyTableWriterTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vppclassifier;
+package io.fd.hc2vpp.v3po.vppclassifier;
  
  import static org.junit.Assert.assertTrue;
  import static org.junit.Assert.fail;
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
  import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
  import io.fd.vpp.jvpp.VppBaseCallException;
  import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
  import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTableReply;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/VppClassifierContextManagerImplTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppclassifier/VppClassifierContextManagerImplTest.java

similarity index 97%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/VppClassifierContextManagerImplTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppclassifier/VppClassifierContextManagerImplTest.java

index 667d06b..c334fe8 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppclassifier/VppClassifierContextManagerImplTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppclassifier/VppClassifierContextManagerImplTest.java
@@ -14,9 +14,9 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vppclassifier;
+package io.fd.hc2vpp.v3po.vppclassifier;
  
-import static io.fd.honeycomb.translate.v3po.vppclassifier.VppClassifierContextManagerImpl.VPP_CLASSIFIER_CONTEXT_IID;
+import static io.fd.hc2vpp.v3po.vppclassifier.VppClassifierContextManagerImpl.VPP_CLASSIFIER_CONTEXT_IID;
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertFalse;
  import static org.mockito.Mockito.verify;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/BridgeDomainCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppstate/BridgeDomainCustomizerTest.java

similarity index 91%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/BridgeDomainCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppstate/BridgeDomainCustomizerTest.java

index 2f31add..0fbdb98 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/BridgeDomainCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppstate/BridgeDomainCustomizerTest.java
@@ -14,11 +14,11 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vppstate;
+package io.fd.hc2vpp.v3po.vppstate;
  
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ListReaderCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.vpp.state.BridgeDomainsBuilder;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.vpp.state.bridge.domains.BridgeDomain;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.vpp.state.bridge.domains.BridgeDomainBuilder;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/L2FibEntryCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppstate/L2FibEntryCustomizerTest.java

similarity index 97%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/L2FibEntryCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppstate/L2FibEntryCustomizerTest.java

index a76baea..94a654c 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/L2FibEntryCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppstate/L2FibEntryCustomizerTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vppstate;
+package io.fd.hc2vpp.v3po.vppstate;
  
  import static org.junit.Assert.assertEquals;
  import static org.mockito.Matchers.any;
@@ -23,8 +23,8 @@ import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ListReaderCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
  import java.util.Collections;
  import java.util.List;
  import java.util.concurrent.ExecutionException;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/VersionCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppstate/VersionCustomizerTest.java

similarity index 95%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/VersionCustomizerTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppstate/VersionCustomizerTest.java

index ab35bb3..2f12cbd 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/VersionCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppstate/VersionCustomizerTest.java
@@ -14,14 +14,14 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vppstate;
+package io.fd.hc2vpp.v3po.vppstate;
  
  import static org.mockito.Matchers.any;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
  import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.vpp.test.read.ReaderCustomizerTest;
+import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest;
  import io.fd.vpp.jvpp.core.dto.ShowVersion;
  import io.fd.vpp.jvpp.core.dto.ShowVersionReply;
  import io.fd.vpp.jvpp.dto.ControlPing;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/VppStateTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppstate/VppStateTest.java

similarity index 98%

rename from v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/VppStateTest.java

rename to v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppstate/VppStateTest.java

index cdc352a..7134a59 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vppstate/VppStateTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/vppstate/VppStateTest.java
@@ -14,7 +14,7 @@
   * limitations under the License.
   */
  
-package io.fd.honeycomb.translate.v3po.vppstate;
+package io.fd.hc2vpp.v3po.vppstate;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertFalse;
@@ -36,9 +36,9 @@ import io.fd.honeycomb.translate.read.ReadContext;
  import io.fd.honeycomb.translate.read.ReadFailedException;
  import io.fd.honeycomb.translate.read.registry.ReaderRegistry;
  import io.fd.honeycomb.translate.impl.read.registry.CompositeReaderRegistryBuilder;
-import io.fd.honeycomb.vpp.test.util.NamingContextHelper;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.util.FutureProducer;
+import io.fd.hc2vpp.common.test.util.NamingContextHelper;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.common.test.util.FutureProducer;
  import io.fd.vpp.jvpp.dto.ControlPing;
  import io.fd.vpp.jvpp.dto.ControlPingReply;
  import java.util.Arrays;
diff --git a/vpp-common/naming-context-api/pom.xml b/vpp-common/naming-context-api/pom.xml

index f197daa..ec38c64 100644 (file)
--- 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 68a2bc7..90e651b 100644 (file)
--- 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

similarity index 98%

rename from vpp-common/naming-context-impl/src/main/java/io/fd/honeycomb/vpp/context/ContextsReaderFactory.java

rename to vpp-common/naming-context-impl/src/main/java/io/fd/hc2vpp/common/context/ContextsReaderFactory.java

index 0745475..8360369 100644 (file)
--- 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 e7180ae..7c4e977 100644 (file)
--- 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 2cb031e..bf34268 100644 (file)
--- 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

similarity index 92%

rename from vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/ContextsReaderFactoryProvider.java

rename to vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/ContextsReaderFactoryProvider.java

index d33b8b7..9b581eb 100644 (file)
--- 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

similarity index 97%

rename from vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/JVppCoreProvider.java

rename to vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppCoreProvider.java

index bbd30fb..f180bc4 100644 (file)
--- 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

similarity index 96%

rename from vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/JVppRegistryProvider.java

rename to vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppRegistryProvider.java

index fa1d474..ccd31ef 100644 (file)
--- 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

similarity index 94%

rename from vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/VppCommonModule.java

rename to vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/VppCommonModule.java

index 9bdba1b..c7a1cc9 100644 (file)
--- 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

similarity index 95%

rename from vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/VppConfigAttributes.java

rename to vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/VppConfigAttributes.java

index af06e05..7ac53e6 100644 (file)
--- 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

similarity index 97%

rename from vpp-common/vpp-common-integration/src/test/java/io/fd/honeycomb/vpp/common/integration/VppCommonModuleTest.java

rename to vpp-common/vpp-common-integration/src/test/java/io/fd/hc2vpp/common/integration/VppCommonModuleTest.java

index 476e159..b63601d 100644 (file)
--- 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 83be57b..7636a04 100644 (file)
--- 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 4dff618..e3fb45b 100644 (file)
--- 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

similarity index 96%

rename from vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/JvppDumpExecutorTest.java

rename to vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/JvppDumpExecutorTest.java

index 500c313..1259e89 100644 (file)
--- 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

similarity index 98%

rename from vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/ListReaderCustomizerTest.java

rename to vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/ListReaderCustomizerTest.java

index 8917c02..3c11b2d 100644 (file)
--- 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

similarity index 96%

rename from vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/ReaderCustomizerTest.java

rename to vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/ReaderCustomizerTest.java

index d4cb385..d403dce 100644 (file)
--- 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

similarity index 98%

rename from vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/util/FutureProducer.java

rename to vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/FutureProducer.java

index a75b3c0..2bedb95 100644 (file)
--- 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

similarity index 97%

rename from vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/util/InterfaceDumpHelper.java

rename to vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/InterfaceDumpHelper.java

index c88ad3f..81d29c8 100644 (file)
--- 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

similarity index 97%

rename from vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/util/NamingContextHelper.java

rename to vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/NamingContextHelper.java

index 9fc9cd4..719339c 100644 (file)
--- 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

similarity index 92%

rename from vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/write/WriterCustomizerTest.java

rename to vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/write/WriterCustomizerTest.java

index 900418c..7067a0c 100644 (file)
--- 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 85994fe..c217bdb 100644 (file)
--- 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

similarity index 99%

rename from vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/AbstractInterfaceTypeCustomizer.java

rename to vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AbstractInterfaceTypeCustomizer.java

index faf9be5..2a9af46 100644 (file)
--- 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

similarity index 98%

rename from vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/AddressTranslator.java

rename to vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AddressTranslator.java

index bfcb41e..b9665df 100644 (file)
--- 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

similarity index 98%

rename from vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/ByteDataTranslator.java

rename to vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/ByteDataTranslator.java

index b7df219..a965426 100644 (file)
--- 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

similarity index 96%

rename from vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/FutureJVppCustomizer.java

rename to vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/FutureJVppCustomizer.java

index 2a43ab5..6d527c7 100644 (file)
--- 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

similarity index 98%

rename from vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/Ipv4AddressRange.java

rename to vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/Ipv4AddressRange.java

index 7528c54..032b905 100644 (file)
--- 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

similarity index 99%

rename from vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/Ipv4Translator.java

rename to vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/Ipv4Translator.java

index b5f93df..2556396 100644 (file)
--- 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

similarity index 99%

rename from vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/Ipv6Translator.java

rename to vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/Ipv6Translator.java

index 6197b38..0d645c3 100644 (file)
--- 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

similarity index 99%

rename from vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/JvppReplyConsumer.java

rename to vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/JvppReplyConsumer.java

index 9e85c5d..db656e7 100644 (file)
--- 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

similarity index 98%

rename from vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/MacTranslator.java

rename to vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/MacTranslator.java

index 14cc289..b31dc30 100644 (file)
--- 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

similarity index 99%

rename from vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/NamingContext.java

rename to vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/NamingContext.java

index 467ac51..393df08 100644 (file)
--- 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

similarity index 95%

rename from vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/ReadTimeoutException.java

rename to vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/ReadTimeoutException.java

index cacca39..e9c4517 100644 (file)
--- 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

similarity index 98%

rename from vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/TagRewriteOperation.java

rename to vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/TagRewriteOperation.java

index 0bfd285..32b2b16 100644 (file)
--- 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

similarity index 97%

rename from vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/VppStatusListener.java

rename to vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/VppStatusListener.java

index 1ea1966..5377f57 100644 (file)
--- 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

similarity index 95%

rename from vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/WriteTimeoutException.java

rename to vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/WriteTimeoutException.java

index 7d5bac3..d762201 100644 (file)
--- 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

similarity index 97%

rename from vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/AddressTranslatorTest.java

rename to vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/AddressTranslatorTest.java

index 71a41dd..97fb274 100644 (file)
--- 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

similarity index 93%

rename from vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/ByteDataTranslatorTest.java

rename to vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/ByteDataTranslatorTest.java

index 3462b4c..8494568 100644 (file)
--- 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

similarity index 94%

rename from vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/Ipv4AddressRangeTest.java

rename to vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/Ipv4AddressRangeTest.java

index aef81fc..ebaa65f 100644 (file)
--- 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

similarity index 94%

rename from vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/Ipv4TranslatorTest.java

rename to vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/Ipv4TranslatorTest.java

index 39fc620..722e2c6 100644 (file)
--- 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

similarity index 95%

rename from vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/Ipv6TranslatorTest.java

rename to vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/Ipv6TranslatorTest.java

index 6a5d136..073754a 100644 (file)
--- 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

similarity index 92%

rename from vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/JvppReplyConsumerTest.java

rename to vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/JvppReplyConsumerTest.java

index 9b1cecf..daf68d2 100644 (file)
--- 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

similarity index 96%

rename from vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/MacTranslatorTest.java

rename to vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/MacTranslatorTest.java

index 2b5df66..f716b0f 100644 (file)
--- 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

similarity index 92%

rename from vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/vpp/util/VppStatusListenerTest.java

rename to vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/VppStatusListenerTest.java

index 93ee8ef..39edd60 100644 (file)
--- 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 (file)

index 81a47e8..0000000
--- 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
diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml

index 83fee56..56e821a 100644 (file)
--- a/vpp-integration/minimal-distribution/pom.xml
+++ b/vpp-integration/minimal-distribution/pom.xml
@@ -19,11 +19,10 @@
      <groupId>io.fd.honeycomb.common</groupId>
      <artifactId>minimal-distribution-parent</artifactId>
      <version>1.16.12-SNAPSHOT</version>
-    <relativePath>../../common/minimal-distribution-parent</relativePath>
    </parent>
  
    <modelVersion>4.0.0</modelVersion>
-  <groupId>io.fd.honeycomb.vpp.integration</groupId>
+  <groupId>io.fd.hc2vpp.integration</groupId>
    <artifactId>vpp-integration-distribution</artifactId>
    <name>${project.artifactId}</name>
    <version>1.16.12-SNAPSHOT</version>
@@ -38,13 +37,13 @@
      <ioam.version>1.16.12-SNAPSHOT</ioam.version>
  
      <distribution.modules>
-      io.fd.honeycomb.vpp.common.integration.VppCommonModule,
-      io.fd.honeycomb.lisp.LispModule,
-      io.fd.honeycomb.translate.v3po.V3poModule,
-      io.fd.honeycomb.nat.NatModule,
-      // io.fd.honeycomb.vppnsh.impl.VppNshModule,
+      io.fd.hc2vpp.common.integration.VppCommonModule,
+      io.fd.hc2vpp.lisp.LispModule,
+      io.fd.hc2vpp.v3po.V3poModule,
+      io.fd.hc2vpp.nat.NatModule,
+      // io.fd.hc2vpp.vppnsh.impl.VppNshModule,
        <!-- Nsh module by default disabled, because it needs vpp-nsh plugin, which is not part of vpp codebase.-->
-      //io.fd.honeycomb.vppioam.impl.VppIoamModule
+      // io.fd.hc2vpp.vppioam.impl.VppIoamModule
        <!-- iOAM module by default disabled, because it needs ioam plugin (not part of vpp codebase.)-->
      </distribution.modules>
    </properties>
@@ -74,32 +73,32 @@
  
    <dependencies>
      <dependency>
-      <groupId>io.fd.honeycomb.vpp</groupId>
+      <groupId>io.fd.hc2vpp.common</groupId>
        <artifactId>vpp-common-integration</artifactId>
        <version>${vpp.common.integration.version}</version>
      </dependency>
      <dependency>
-      <groupId>io.fd.honeycomb.v3po</groupId>
+      <groupId>io.fd.hc2vpp.v3po</groupId>
        <artifactId>v3po2vpp</artifactId>
        <version>${v3po.version}</version>
      </dependency>
      <dependency>
-      <groupId>io.fd.honeycomb.lisp</groupId>
+      <groupId>io.fd.hc2vpp.lisp</groupId>
        <artifactId>lisp2vpp</artifactId>
        <version>${lisp.version}</version>
      </dependency>
      <dependency>
-      <groupId>io.fd.honeycomb.vppnsh</groupId>
+      <groupId>io.fd.hc2vpp.nsh</groupId>
        <artifactId>vppnsh-impl</artifactId>
        <version>${vppnsh.version}</version>
      </dependency>
      <dependency>
-      <groupId>io.fd.honeycomb.nat</groupId>
+      <groupId>io.fd.hc2vpp.nat</groupId>
        <artifactId>nat2vpp</artifactId>
        <version>${nat.version}</version>
      </dependency>
      <dependency>
-      <groupId>io.fd.honeycomb.vppioam</groupId>
+      <groupId>io.fd.hc2vpp.ioam</groupId>
        <artifactId>vppioam-impl</artifactId>
        <version>${ioam.version}</version>
      </dependency>
diff --git a/vpp-integration/pom.xml b/vpp-integration/pom.xml

index 3cd5c09..a36064e 100644 (file)
--- a/vpp-integration/pom.xml
+++ b/vpp-integration/pom.xml
@@ -13,44 +13,44 @@
   See the License for the specific language governing permissions and
   limitations under the License.
  -->
-<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">
+<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.common</groupId>
-    <artifactId>honeycomb-parent</artifactId>
-    <version>1.16.12-SNAPSHOT</version>
-    <relativePath>../common/honeycomb-parent</relativePath>
-  </parent>
+    <parent>
+        <groupId>io.fd.honeycomb.common</groupId>
+        <artifactId>honeycomb-parent</artifactId>
+        <version>1.16.12-SNAPSHOT</version>
+    </parent>
  
-  <groupId>io.fd.honeycomb.vpp.integration</groupId>
-  <artifactId>vpp-integration</artifactId>
-  <name>${project.artifactId}</name>
-  <version>1.16.12-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <modelVersion>4.0.0</modelVersion>
-  <description>Aggregator for Honeycomb's VPP distribution. Aggregating all VPP plugins.</description>
+    <groupId>io.fd.hc2vpp.integration</groupId>
+    <artifactId>vpp-integration</artifactId>
+    <name>${project.artifactId}</name>
+    <version>1.16.12-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <description>Aggregator for Honeycomb's VPP distribution. Aggregating all VPP plugins.</description>
  
-  <modules>
-    <module>minimal-distribution</module>
-  </modules>
+    <modules>
+        <module>minimal-distribution</module>
+    </modules>
  
-  <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
  </project>
author	Maros Marsalek <mmarsale@cisco.com>
	Thu, 10 Nov 2016 12:31:25 +0000 (13:31 +0100)
committer	Marek Gradzki <mgradzki@cisco.com>
	Sat, 19 Nov 2016 20:29:39 +0000 (21:29 +0100)