HC2VPP-336: disable NSH plugin

nsh_sfc 18.07-SNAPSHOT artifacts are missing in the

https://nexus.fd.io/content/repositories/fd.io.snapshot/io/fd/nsh_sfc/nsh-sfc/

repo, which causes hc2vpp build failures.
As a workaround nsh plugin was disabled.

Change-Id: If65f783f85f9b491f7caea63a51c70e4b4ad39c6
Signed-off-by: Marek Gradzki <[email protected]>

diff --git a/it/api-test/pom.xml b/it/api-test/pom.xml
index 28263ec..b40c5af 100644 (file)
--- a/it/api-test/pom.xml
+++ b/it/api-test/pom.xml
@@ -86,12 +86,6 @@
         </dependency>
 
         <!-- Open source plugins -->
-        <dependency>
-            <groupId>io.fd.hc2vpp.nsh</groupId>
-            <artifactId>vppnsh-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>io.fd.hc2vpp.ioam</groupId>
             <artifactId>vppioam-api</artifactId>

diff --git a/pom.xml b/pom.xml
index e5f7b7f..851beb5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,8 @@
     <module>vpp-common</module>
     <module>v3po</module>
     <module>ioam</module>
-    <module>nsh</module>
+    <!-- TODO(HC2VPP-336): reenable after NSH build issues are resolved -->
+    <!--<module>nsh</module>-->
     <module>routing</module>
     <module>nat</module>
     <module>lisp</module>

diff --git a/vpp-integration/api-docs/docs/pom.xml b/vpp-integration/api-docs/docs/pom.xml
index 6545ed6..03ebbc5 100644 (file)
--- a/vpp-integration/api-docs/docs/pom.xml
+++ b/vpp-integration/api-docs/docs/pom.xml
@@ -46,7 +46,6 @@
             io.fd.hc2vpp.dhcp.DhcpModule,
             io.fd.hc2vpp.policer.PolicerModule,
             io.fd.hc2vpp.mpls.MplsModule,
-            io.fd.hc2vpp.docs.core.mock.binding.MockNshModule,
             io.fd.hc2vpp.docs.core.mock.binding.MockIoamModule,
             io.fd.hc2vpp.bgp.inet.BgpInetModule,
             io.fd.hc2vpp.bgp.prefix.sid.BgpPrefixSidModule

diff --git a/vpp-integration/api-docs/scripts/pom.xml b/vpp-integration/api-docs/scripts/pom.xml
index cdc05e8..c24fcac 100644 (file)
--- a/vpp-integration/api-docs/scripts/pom.xml
+++ b/vpp-integration/api-docs/scripts/pom.xml
@@ -85,11 +85,6 @@
             <artifactId>vppioam-impl</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>io.fd.hc2vpp.nsh</groupId>
-            <artifactId>vppnsh-impl</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.fd.hc2vpp.v3po</groupId>
             <artifactId>v3po2vpp</artifactId>

diff --git a/vpp-integration/api-docs/scripts/src/main/groovy/io/fd/hc2vpp/docs/scripts/ApiDocsIndexGenerator.groovy b/vpp-integration/api-docs/scripts/src/main/groovy/io/fd/hc2vpp/docs/scripts/ApiDocsIndexGenerator.groovy
index 65ee2ed..0cd5289 100644 (file)
--- a/vpp-integration/api-docs/scripts/src/main/groovy/io/fd/hc2vpp/docs/scripts/ApiDocsIndexGenerator.groovy
+++ b/vpp-integration/api-docs/scripts/src/main/groovy/io/fd/hc2vpp/docs/scripts/ApiDocsIndexGenerator.groovy
@@ -26,7 +26,6 @@ import io.fd.vpp.jvpp.core.future.FutureJVppCore
 import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexport
 import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampot
 import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace
-import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh
 import io.fd.vpp.jvpp.nat.future.FutureJVppNat
 
 import java.nio.charset.StandardCharsets
@@ -45,7 +44,7 @@ class ApiDocsIndexGenerator {
     private static def NL = System.lineSeparator()
     // TODO - check if list of plugin classes can be generated based on list of modules enabled for doc generation
     private static
-    def PLUGIN_CLASSES = [FutureJVppCore.class, FutureJVppAcl.class, FutureJVppNat.class, FutureJVppNsh.class,
+    def PLUGIN_CLASSES = [FutureJVppCore.class, FutureJVppAcl.class, FutureJVppNat.class,
                           FutureJVppIoamexport.class, FutureJVppIoampot.class, FutureJVppIoamtrace.class]
     private static def TABLE_PART_MARK = "|"
 

diff --git a/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockNshModule.java b/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockNshModule.java
deleted file mode 100644 (file)
index dace214..0000000
--- a/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockNshModule.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2017 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.hc2vpp.docs.core.mock.binding;
-
-import static io.fd.hc2vpp.docs.core.mock.binding.MockBindingModule.noOpProxy;
-
-import com.google.inject.Provider;
-import io.fd.hc2vpp.vppnsh.impl.VppNshModule;
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.nsh.future.FutureJVppNshFacade;
-import java.io.IOException;
-
-/**
- * Use to bypass jvpp registration
- */
-public class MockNshModule extends VppNshModule {
-
-    public MockNshModule() {
-        super(MockJVppNshProvider.class);
-    }
-
-    private static class MockJVppNshProvider implements Provider<FutureJVppNshFacade> {
-
-        @Override
-        public FutureJVppNshFacade get() {
-            try {
-                return new FutureJVppNshFacade(noOpProxy(JVppRegistry.class), noOpProxy(JVpp.class));
-            } catch (IOException e) {
-                throw new IllegalStateException(e);
-            }
-        }
-    }
-}

diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml
index 8399ff2..791ad95 100644 (file)
--- a/vpp-integration/minimal-distribution/pom.xml
+++ b/vpp-integration/minimal-distribution/pom.xml
@@ -65,8 +65,6 @@
       io.fd.hc2vpp.dhcp.DhcpModule,
       io.fd.hc2vpp.policer.PolicerModule,
       io.fd.hc2vpp.mpls.MplsModule,
-      <!-- Nsh module by default disabled, because it needs vpp-nsh plugin, which is not part of vpp codebase.-->
-      // io.fd.hc2vpp.vppnsh.impl.VppNshModule,
       <!-- iOAM module by default disabled, because it needs ioam plugin (not part of vpp codebase.)-->
       // io.fd.hc2vpp.vppioam.impl.VppIoamModule,
       <!-- Bgp modules disabled by default, because it BGP northbound interface is not enabled by default -->
@@ -129,11 +127,6 @@
       <artifactId>lisp2vpp</artifactId>
       <version>${lisp.version}</version>
     </dependency>
-    <dependency>
-      <groupId>io.fd.hc2vpp.nsh</groupId>
-      <artifactId>vppnsh-impl</artifactId>
-      <version>${vppnsh.version}</version>
-    </dependency>
     <dependency>
       <groupId>io.fd.hc2vpp.nat</groupId>
       <artifactId>nat2vpp</artifactId>