From bedf02b7e70a58ecbff98f261df816de3cf1e0a3 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Thu, 31 May 2018 08:14:24 +0200 Subject: 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 --- vpp-integration/api-docs/docs/pom.xml | 1 - vpp-integration/api-docs/scripts/pom.xml | 5 --- .../docs/scripts/ApiDocsIndexGenerator.groovy | 3 +- .../docs/core/mock/binding/MockNshModule.java | 48 ---------------------- vpp-integration/minimal-distribution/pom.xml | 7 ---- 5 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockNshModule.java (limited to 'vpp-integration') diff --git a/vpp-integration/api-docs/docs/pom.xml b/vpp-integration/api-docs/docs/pom.xml index 6545ed671..03ebbc5c3 100644 --- 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 cdc05e876..c24fcac6a 100644 --- a/vpp-integration/api-docs/scripts/pom.xml +++ b/vpp-integration/api-docs/scripts/pom.xml @@ -85,11 +85,6 @@ vppioam-impl ${project.version} - - io.fd.hc2vpp.nsh - vppnsh-impl - ${project.version} - io.fd.hc2vpp.v3po v3po2vpp 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 65ee2ed1e..0cd528992 100644 --- 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 index dace214e8..000000000 --- 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 { - - @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 8399ff27e..791ad9515 100644 --- 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, - - // io.fd.hc2vpp.vppnsh.impl.VppNshModule, // io.fd.hc2vpp.vppioam.impl.VppIoamModule, @@ -129,11 +127,6 @@ lisp2vpp ${lisp.version} - - io.fd.hc2vpp.nsh - vppnsh-impl - ${vppnsh.version} - io.fd.hc2vpp.nat nat2vpp -- cgit 1.2.3-korg