diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2016-10-05 07:20:18 +0200 |
|---|---|---|
| committer | Marek Gradzki <mgradzki@cisco.com> | 2016-10-05 07:22:38 +0200 |
| commit | eec7196453949fa331b71a822959dbc2b0773621 (patch) | |
| tree | 5e59eaa1f38d3804a1b33e9d467f4954995abda6 | |
| parent | 2b9ee30164b6b2b42659661eeee863ecad9cf303 (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-- | pom.xml | 2 | ||||
| -rw-r--r-- | vpp-integration/minimal-distribution/pom.xml | 10 | ||||
| -rw-r--r-- | vpp-integration/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/integration/distro/Main.java | 3 |
3 files changed, 8 insertions, 7 deletions
@@ -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 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); } |