Revert "Disable NSH plugin due to CI issues"

This reverts commit 2dcc14e9c3c7779200e86fc7eb2fce4a0ef59e47.
NSH_SFC master is no longer broken.

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

diff --git a/pom.xml b/pom.xml
index 7bdca34..83b834d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
   <modules>
     <module>common</module>
     <module>infra</module>
-    <!--<module>nsh</module> -->
+    <module>nsh</module>
     <module>vpp-common</module>
     <module>vpp-integration</module>
     <module>v3po</module>

diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml
index a107278..7e1aa02 100644 (file)
--- a/vpp-integration/minimal-distribution/pom.xml
+++ b/vpp-integration/minimal-distribution/pom.xml
@@ -75,10 +75,10 @@
       <artifactId>lisp2vpp</artifactId>
       <version>${lisp.version}</version>
     </dependency>
-    <!--<dependency>-->
-      <!--<groupId>io.fd.honeycomb.vppnsh</groupId>-->
-      <!--<artifactId>vppnsh-impl</artifactId>-->
-      <!--<version>${vppnsh.version}</version>-->
-    <!--</dependency>-->
+    <dependency>
+      <groupId>io.fd.honeycomb.vppnsh</groupId>
+      <artifactId>vppnsh-impl</artifactId>
+      <version>${vppnsh.version}</version>
+    </dependency>
   </dependencies>
 </project>

diff --git a/vpp-integration/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/integration/distro/Main.java b/vpp-integration/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/integration/distro/Main.java
index f4fbdb1..04377c3 100644 (file)
--- a/vpp-integration/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/integration/distro/Main.java
+++ b/vpp-integration/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/integration/distro/Main.java
@@ -21,6 +21,7 @@ import com.google.inject.Module;
 import io.fd.honeycomb.lisp.LispModule;
 import io.fd.honeycomb.translate.v3po.V3poModule;
 import io.fd.honeycomb.vpp.distro.VppCommonModule;
+import io.fd.honeycomb.vppnsh.impl.VppNshModule;
 import java.util.List;
 
 public class Main {
@@ -32,7 +33,7 @@ public class Main {
         sampleModules.add(new VppCommonModule());
         sampleModules.add(new V3poModule());
         sampleModules.add(new LispModule());
-//        sampleModules.add(new VppNshModule());
+        sampleModules.add(new VppNshModule());
 
         io.fd.honeycomb.infra.distro.Main.init(sampleModules);
     }