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>

9 files changed, 0 insertions, 336 deletions

diff --git a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/ContextsReaderFactoryProvider.java b/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/ContextsReaderFactoryProvider.java
deleted file mode 100644
index 35dd78e4e..000000000
--- a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/ContextsReaderFactoryProvider.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.distro;
-
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
-import io.fd.honeycomb.infra.distro.ProviderTrait;
-import io.fd.honeycomb.infra.distro.data.context.ContextPipelineModule;
-import io.fd.honeycomb.translate.read.ReaderFactory;
-import io.fd.honeycomb.vpp.context.ContextsReaderFactory;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-
-/**
- * Mirror of org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.context.impl.rev141210.ContextReaderModule
- */
-public final class ContextsReaderFactoryProvider extends ProviderTrait<ReaderFactory> {
-
-    @Inject
-    @Named(ContextPipelineModule.HONEYCOMB_CONTEXT)
-    private DataBroker contextDataBroker;
-
-    @Override
-    protected ContextsReaderFactory create() {
-        return new ContextsReaderFactory(contextDataBroker);
-    }
-}
diff --git a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppCoreProvider.java b/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppCoreProvider.java
deleted file mode 100644
index b8334df55..000000000
--- a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppCoreProvider.java
+++ /dev/null
@@ -1,61 +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.distro;
-
-import com.google.inject.Inject;
-import io.fd.honeycomb.infra.distro.ProviderTrait;
-import java.io.IOException;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.future.FutureJVppCore;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Provides future API for jvpp-core plugin. Must be a singleton due to shutdown hook usage. Registers shutdown hook to
- * free plugin's resources on shutdown.
- */
-public final class JVppCoreProvider extends ProviderTrait<FutureJVppCore> {
-
-    private static final Logger LOG = LoggerFactory.getLogger(JVppCoreProvider.class);
-
-    @Inject
-    private JVppRegistry registry;
-
-    @Override
-    protected FutureJVppCoreFacade create() {
-        try {
-            final JVppCoreImpl jVpp = new JVppCoreImpl();
-            // Free jvpp-core plugin's resources on shutdown
-            Runtime.getRuntime().addShutdownHook(new Thread() {
-
-                @Override
-                public void run() {
-                    LOG.info("Unloading jvpp-core plugin");
-                    jVpp.close();
-                    LOG.info("Successfully unloaded jvpp-core plugin");
-                }
-            });
-
-            LOG.info("Successfully loaded jvpp-core plugin");
-            return new FutureJVppCoreFacade(registry, jVpp);
-        } catch (IOException e) {
-            throw new IllegalStateException("Unable to open VPP management connection", e);
-        }
-    }
-}
diff --git a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppRegistryProvider.java b/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppRegistryProvider.java
deleted file mode 100644
index 9ecdd69ee..000000000
--- a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppRegistryProvider.java
+++ /dev/null
@@ -1,72 +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.distro;
-
-import com.google.inject.Inject;
-import io.fd.honeycomb.infra.distro.ProviderTrait;
-import io.fd.honeycomb.translate.vpp.util.VppStatusListener;
-import java.io.IOException;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Provides JVppRegistry. Must be a singleton due to shutdown hook usage. Registers shutdown hook to disconnect from
- * VPP.
- */
-public final class JVppRegistryProvider extends ProviderTrait<JVppRegistry> {
-
-    private static final Logger LOG = LoggerFactory.getLogger(JVppRegistryProvider.class);
-
-    @Inject
-    private VppConfigAttributes config;
-    @Inject
-    private VppStatusListener vppStatus;
-
-    @Override
-    protected JVppRegistryImpl create() {
-        try {
-            final JVppRegistryImpl registry = new JVppRegistryImpl(config.jvppConnectionName);
-
-            // Closing JVpp connection with shutdown hook to erase the connection from VPP so HC will be able
-            // to connect next time. If JVM is force closed, this will not be executed and VPP connection
-            // with name from config will stay open and prevent next startup of HC to success
-            Runtime.getRuntime().addShutdownHook(new Thread() {
-                @Override
-                public void run() {
-                    LOG.info("Disconnecting from VPP");
-                    if (vppStatus.isDown()) {
-                        LOG.info("VPP is down. JVppRegistry cleanup is not needed. Exiting");
-                        return;
-                    }
-                    try {
-                        registry.close();
-                        LOG.info("Successfully disconnected from VPP as {}", config.jvppConnectionName);
-                    } catch (Exception e) {
-                        LOG.warn("Unable to properly close jvpp registry", e);
-                    }
-                }
-            });
-
-            LOG.info("JVpp connection opened successfully as: {}", config.jvppConnectionName);
-            return registry;
-        } catch (IOException e) {
-            throw new IllegalStateException("Unable to open VPP management connection", e);
-        }
-    }
-}
diff --git a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/Main.java b/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/Main.java
deleted file mode 100644
index 821bd1ef9..000000000
--- a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/Main.java
+++ /dev/null
@@ -1,32 +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.distro;
-
-import com.google.common.collect.Lists;
-import com.google.inject.Module;
-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);
-
-        sampleModules.add(new VppCommonModule());
-
-        io.fd.honeycomb.infra.distro.Main.init(sampleModules);
-    }
-}
diff --git a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/VppCommonModule.java b/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/VppCommonModule.java
deleted file mode 100644
index 957819f28..000000000
--- a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/VppCommonModule.java
+++ /dev/null
@@ -1,44 +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.distro;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Singleton;
-import com.google.inject.multibindings.Multibinder;
-import io.fd.honeycomb.translate.read.ReaderFactory;
-import io.fd.honeycomb.translate.vpp.util.VppStatusListener;
-import net.jmob.guice.conf.core.ConfigurationModule;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.core.future.FutureJVppCore;
-
-public final class VppCommonModule extends AbstractModule {
-    protected void configure() {
-
-        install(ConfigurationModule.create());
-        // Inject non-dependency configuration
-        requestInjection(VppConfigAttributes.class);
-
-        bind(VppStatusListener.class).toInstance(new VppStatusListener());
-        bind(JVppRegistry.class).toProvider(JVppRegistryProvider.class).in(Singleton.class);
-        bind(FutureJVppCore.class).toProvider(JVppCoreProvider.class).in(Singleton.class);
-
-        // Naming contexts reader exposing context storage over REST/HONEYCOMB_NETCONF
-        final Multibinder<ReaderFactory> readerBinder = Multibinder.newSetBinder(binder(), ReaderFactory.class);
-        readerBinder.addBinding().toProvider(ContextsReaderFactoryProvider.class).in(Singleton.class);
-    }
-
-}
diff --git a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/VppConfigAttributes.java b/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/VppConfigAttributes.java
deleted file mode 100644
index 26b5a8385..000000000
--- a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/VppConfigAttributes.java
+++ /dev/null
@@ -1,28 +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.distro;
-
-import net.jmob.guice.conf.core.BindConfig;
-import net.jmob.guice.conf.core.InjectConfig;
-import net.jmob.guice.conf.core.Syntax;
-
-@BindConfig(value = "jvpp", syntax = Syntax.JSON)
-public class VppConfigAttributes {
-
-    @InjectConfig("jvpp-connection-name")
-    public String jvppConnectionName;
-}
diff --git a/vpp-common/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/jvpp.json b/vpp-common/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/jvpp.json
deleted file mode 100644
index 1d411872e..000000000
--- a/vpp-common/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/jvpp.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "jvpp-connection-name": "honeycomb"
-}
\ No newline at end of file
diff --git a/vpp-common/minimal-distribution/src/test/java/io/fd/honeycomb/vpp/distro/VppCommonModuleTest.java b/vpp-common/minimal-distribution/src/test/java/io/fd/honeycomb/vpp/distro/VppCommonModuleTest.java
deleted file mode 100644
index f59134812..000000000
--- a/vpp-common/minimal-distribution/src/test/java/io/fd/honeycomb/vpp/distro/VppCommonModuleTest.java
+++ /dev/null
@@ -1,53 +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.distro;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.Matchers.empty;
-import static org.junit.Assert.assertThat;
-import static org.mockito.MockitoAnnotations.initMocks;
-
-import com.google.inject.Guice;
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
-import com.google.inject.testing.fieldbinder.Bind;
-import com.google.inject.testing.fieldbinder.BoundFieldModule;
-import io.fd.honeycomb.translate.read.ReaderFactory;
-import java.util.HashSet;
-import java.util.Set;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-
-public class VppCommonModuleTest {
-
-    @Named("honeycomb-context")
-    @Bind
-    @Mock
-    private DataBroker honeycombContext;
-
-    @Inject
-    private Set<ReaderFactory> readerFactories = new HashSet<>();
-
-    @Test
-    public void testConfigure() throws Exception {
-        initMocks(this);
-        Guice.createInjector(new VppCommonModule(), BoundFieldModule.of(this)).injectMembers(this);
-        assertThat(readerFactories, is(not(empty())));
-    }
-}
\ No newline at end of file
diff --git a/vpp-common/minimal-distribution/src/test/resources/jvpp.json b/vpp-common/minimal-distribution/src/test/resources/jvpp.json
deleted file mode 100644
index 1d411872e..000000000
--- a/vpp-common/minimal-distribution/src/test/resources/jvpp.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "jvpp-connection-name": "honeycomb"
-}
\ No newline at end of file