summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2016-10-05 07:20:18 +0200
committerMarek Gradzki <mgradzki@cisco.com>2016-10-05 07:22:38 +0200
commita0cd0ad039b3f5ef5faa537eb5e383df81536b89 (patch)
tree762e6044bbf2120a54fa999695f10477a8d9c97d
parentcf68fb7a26a92960c91aac3009cc855b0c012b3b (diff)
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>
-rw-r--r--vpp-integration/minimal-distribution/pom.xml10
-rw-r--r--vpp-integration/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/integration/distro/Main.java3
2 files changed, 7 insertions, 6 deletions
diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml
index a10727849..7e1aa0241 100644
--- 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 f4fbdb15c..04377c382 100644
--- 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);
}