summaryrefslogtreecommitdiffstats
path: root/vpp-integration
diff options
context:
space:
mode:
authorJan Srnicek <jsrnicek@cisco.com>2016-10-13 13:56:47 +0200
committerMaros Marsalek <mmarsale@cisco.com>2016-10-13 13:28:56 +0000
commitb709841f3b01ace438185ea28c7aca19123291be (patch)
treea72107c1bd5a2248e4b767c56e83988afd6ee2ae /vpp-integration
parent1123d72ba855820ab6e67378c7f771999c22beb1 (diff)
HONEYCOMB-207 : Configurable modules list for distributions
Export list of modules for built distribution on compile time according to distribution.modules property to ***module-config.txt Load aggregated set of modules on start from all descriptors in /modules folder Change-Id: Icdeb23536aee3a243a221d3f2ec5f340d387764e Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
Diffstat (limited to 'vpp-integration')
-rw-r--r--vpp-integration/minimal-distribution/pom.xml16
-rw-r--r--vpp-integration/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/integration/distro/Main.java40
2 files changed, 12 insertions, 44 deletions
diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml
index 7e1aa0241..36d1e0f1a 100644
--- a/vpp-integration/minimal-distribution/pom.xml
+++ b/vpp-integration/minimal-distribution/pom.xml
@@ -29,11 +29,19 @@
<version>1.16.12-SNAPSHOT</version>
<properties>
- <main.class>io.fd.honeycomb.vpp.integration.distro.Main</main.class>
+ <main.class>io.fd.honeycomb.infra.distro.Main</main.class>
<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>
+ <vpp.common.integration.version>1.16.12-SNAPSHOT</vpp.common.integration.version>
<vppnsh.version>1.16.12-SNAPSHOT</vppnsh.version>
+
+ <distribution.modules>
+ io.fd.honeycomb.vpp.common.integration.VppCommonModule,
+ io.fd.honeycomb.lisp.LispModule,
+ io.fd.honeycomb.translate.v3po.V3poModule,
+ // io.fd.honeycomb.vppnsh.impl.VppNshModule
+ <!-- Nsh module by default disabled, because it needs vpp-nsh plugin, which is not part of vpp codebase.-->
+ </distribution.modules>
</properties>
<build>
@@ -62,8 +70,8 @@
<dependencies>
<dependency>
<groupId>io.fd.honeycomb.vpp</groupId>
- <artifactId>minimal-distribution</artifactId>
- <version>${vpp.common.min.distro.version}</version>
+ <artifactId>vpp-common-integration</artifactId>
+ <version>${vpp.common.integration.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb.v3po</groupId>
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
deleted file mode 100644
index 04377c382..000000000
--- a/vpp-integration/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/integration/distro/Main.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2016 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.honeycomb.vpp.integration.distro;
-
-import com.google.common.collect.Lists;
-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 {
-
- public static void main(String[] args) {
- final List<Module> sampleModules = Lists.newArrayList(io.fd.honeycomb.infra.distro.Main.BASE_MODULES);
-
- // All the plugins should be listed here
- sampleModules.add(new VppCommonModule());
- sampleModules.add(new V3poModule());
- sampleModules.add(new LispModule());
- sampleModules.add(new VppNshModule());
-
- io.fd.honeycomb.infra.distro.Main.init(sampleModules);
- }
-}