diff options
| author |   Hongjun Ni <hongjun.ni@intel.com> | 2016-09-02 22:18:43 +0800 |
|---|---|---|
| committer | Hongjun Ni <hongjun.ni@intel.com> | 2016-09-14 02:35:12 +0000 |
| commit | 0b419f853ec86e4c89ed44db99bc438e9eb3a9e7 (patch) | |
| tree | e174d8c539c4eccb77139799b138d6e78678ec04 /vpp-integration | |
| parent | 7f67d7e2a230c96aaf4bd5b842ecf0a346386fa6 (diff) | |
HONEYCOMB-46: Add NSH_SFC Feature in Honeycomb
Cherry pick to master
PatchSet 9: Remove unused imports
PatchSet 8: Fix interface DI broken
PatchSet 7: Move VppNshModule to distribution
PatchSet 2: Augment with encap-if-name for nsh-map
Change-Id: Ia12afb72edfe804f26b84021b997d55db3129933
Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
Diffstat (limited to 'vpp-integration')
| -rw-r--r-- | vpp-integration/minimal-distribution/pom.xml | 6 | ||||
| -rw-r--r-- | vpp-integration/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/integration/distro/Main.java | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml index 390db81d0..732ae4ad8 100644 --- a/vpp-integration/minimal-distribution/pom.xml +++ b/vpp-integration/minimal-distribution/pom.xml @@ -32,6 +32,7 @@ <v3po.version>1.16.12-SNAPSHOT</v3po.version> <lisp.version>1.16.12-SNAPSHOT</lisp.version> <vpp.common.min.distro.version>1.16.12-SNAPSHOT</vpp.common.min.distro.version> + <vppnsh.version>1.16.12-SNAPSHOT</vppnsh.version> </properties> <build> @@ -73,5 +74,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> </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 7c1d07d80..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,6 +33,7 @@ public class Main { sampleModules.add(new VppCommonModule()); sampleModules.add(new V3poModule()); sampleModules.add(new LispModule()); + sampleModules.add(new VppNshModule()); io.fd.honeycomb.infra.distro.Main.init(sampleModules); } |