diff options
author | 2016-08-05 14:49:14 +0200 | |
---|---|---|
committer | 2016-08-19 13:54:35 +0200 | |
commit | f8bb88dac590165a9909b6e60e6c06b435a2d456 (patch) | |
tree | 66e1c9b7de5b29f2025a178c03d16916e69f4f29 /vpp-common/minimal-distribution | |
parent | 3f93e39fbb780f19ce34ea407e0534eea7c1af30 (diff) |
HONEYCOMB-117: add support for jvpp plugins
Change-Id: I9f1dd5562b13a37392ce92b170a466c48d61bcc5
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'vpp-common/minimal-distribution')
-rw-r--r-- | vpp-common/minimal-distribution/pom.xml | 7 | ||||
-rw-r--r-- | vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppCoreProvider.groovy | 54 | ||||
-rw-r--r-- | vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppRegistryProvider.groovy (renamed from vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppProvider.groovy) | 19 | ||||
-rw-r--r-- | vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/VppCommonModule.groovy | 6 |
4 files changed, 72 insertions, 14 deletions
diff --git a/vpp-common/minimal-distribution/pom.xml b/vpp-common/minimal-distribution/pom.xml index 4efe12b54..e80f0eb7e 100644 --- a/vpp-common/minimal-distribution/pom.xml +++ b/vpp-common/minimal-distribution/pom.xml @@ -90,7 +90,12 @@ </dependency> <dependency> <groupId>io.fd.vpp</groupId> - <artifactId>jvpp</artifactId> + <artifactId>jvpp-registry</artifactId> + <version>16.09-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>io.fd.vpp</groupId> + <artifactId>jvpp-core</artifactId> <version>16.09-SNAPSHOT</version> </dependency> <dependency> diff --git a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppCoreProvider.groovy b/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppCoreProvider.groovy new file mode 100644 index 000000000..1d4fd1af5 --- /dev/null +++ b/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppCoreProvider.groovy @@ -0,0 +1,54 @@ +/* + * 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 groovy.transform.ToString +import groovy.util.logging.Slf4j +import io.fd.honeycomb.infra.distro.ProviderTrait +import org.openvpp.jvpp.JVppRegistry +import org.openvpp.jvpp.core.JVppCoreImpl +import org.openvpp.jvpp.core.future.FutureJVppCore +import org.openvpp.jvpp.core.future.FutureJVppCoreFacade + +/** + * 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. + */ +@Slf4j +@ToString +class JVppCoreProvider extends ProviderTrait<FutureJVppCore> { + + @Inject + JVppRegistry registry + + def create() { + try { + def jVpp = new JVppCoreImpl() + // Free jvpp-core plugin's resources on shutdown + Runtime.addShutdownHook { + log.info("Unloading jvpp-core plugin") + jVpp.close() + log.info("Successfully unloaded jvpp-core plugin") + } + log.info("Successfully loaded jvpp-core plugin") + 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/JVppProvider.groovy b/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppRegistryProvider.groovy index 51bf5be9e..125f7660b 100644 --- a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppProvider.groovy +++ b/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppRegistryProvider.groovy @@ -20,37 +20,34 @@ import com.google.inject.Inject import groovy.transform.ToString import groovy.util.logging.Slf4j import io.fd.honeycomb.infra.distro.ProviderTrait -import org.openvpp.jvpp.JVppImpl -import org.openvpp.jvpp.VppJNIConnection -import org.openvpp.jvpp.future.FutureJVpp -import org.openvpp.jvpp.future.FutureJVppFacade +import org.openvpp.jvpp.JVppRegistry +import org.openvpp.jvpp.JVppRegistryImpl /** - * This must be a singleton due to shutdown hook usage. + * Provides JVppRegistry. Must be a singleton due to shutdown hook usage. + * Registers shutdown hook to disconnect from VPP. */ @Slf4j @ToString -class JVppProvider extends ProviderTrait<FutureJVpp> { +class JVppRegistryProvider extends ProviderTrait<JVppRegistry> { @Inject VppConfigAttributes config def create() { try { - def connection = new VppJNIConnection(config.jvppConnectionName) - def jVpp = new JVppImpl(connection) + def 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.addShutdownHook { log.info("Disconnecting from VPP") - jVpp.close() - connection.close() + registry.close() log.info("Successfully disconnected from VPP as {}", config.jvppConnectionName) } log.info("JVpp connection opened successfully as: {}", config.jvppConnectionName) - new FutureJVppFacade(jVpp) + 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/VppCommonModule.groovy b/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/VppCommonModule.groovy index 68261c34d..cd5816f11 100644 --- a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/VppCommonModule.groovy +++ b/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/VppCommonModule.groovy @@ -22,7 +22,8 @@ import com.google.inject.multibindings.Multibinder import groovy.util.logging.Slf4j import io.fd.honeycomb.translate.read.ReaderFactory import net.jmob.guice.conf.core.ConfigurationModule -import org.openvpp.jvpp.future.FutureJVpp +import org.openvpp.jvpp.JVppRegistry +import org.openvpp.jvpp.core.future.FutureJVppCore @Slf4j public final class VppCommonModule extends AbstractModule { @@ -32,7 +33,8 @@ public final class VppCommonModule extends AbstractModule { // Inject non-dependency configuration requestInjection(VppConfigAttributes) - bind(FutureJVpp).toProvider(JVppProvider).in(Singleton) + bind(JVppRegistry).toProvider(JVppRegistryProvider).in(Singleton) + bind(FutureJVppCore).toProvider(JVppCoreProvider).in(Singleton) // Naming contexts reader exposing context storage over REST/HONEYCOMB_NETCONF Multibinder.newSetBinder(binder(), ReaderFactory.class).with { |