From 824c740124a9a73f567ff600ab6b388292cfcdd9 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Wed, 22 May 2019 15:46:54 +0200 Subject: move stats to separate module Change-Id: Id349e926ecf336aeabac89afa45a5e0d0f37e36b Signed-off-by: Michal Cmarada --- pom.xml | 1 + stats/asciidoc/Readme.adoc | 3 + stats/pom.xml | 58 +++++++++++++ stats/stats-api/asciidoc/Readme.adoc | 3 + stats/stats-api/pom.xml | 33 ++++++++ stats/stats-impl/asciidoc/Readme.adoc | 3 + stats/stats-impl/pom.xml | 99 ++++++++++++++++++++++ .../main/java/io/fd/hc2vpp/stats/StatsModule.java | 54 ++++++++++++ .../io/fd/hc2vpp/stats/jvpp/JVppStatsProvider.java | 49 +++++++++++ .../java/io/fd/hc2vpp/stats/StatsModuleTest.java | 44 ++++++++++ v3po/v3po2vpp/pom.xml | 6 ++ .../main/java/io/fd/hc2vpp/v3po/V3poModule.java | 2 +- .../interfacesstate/cache/JVppStatsProvider.java | 49 ----------- vpp-integration/api-docs/docs/pom.xml | 1 + vpp-integration/minimal-distribution/pom.xml | 6 ++ 15 files changed, 361 insertions(+), 50 deletions(-) create mode 100644 stats/asciidoc/Readme.adoc create mode 100644 stats/pom.xml create mode 100644 stats/stats-api/asciidoc/Readme.adoc create mode 100644 stats/stats-api/pom.xml create mode 100644 stats/stats-impl/asciidoc/Readme.adoc create mode 100644 stats/stats-impl/pom.xml create mode 100644 stats/stats-impl/src/main/java/io/fd/hc2vpp/stats/StatsModule.java create mode 100644 stats/stats-impl/src/main/java/io/fd/hc2vpp/stats/jvpp/JVppStatsProvider.java create mode 100644 stats/stats-impl/src/test/java/io/fd/hc2vpp/stats/StatsModuleTest.java delete mode 100644 v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/JVppStatsProvider.java diff --git a/pom.xml b/pom.xml index 8c10e33de..ee4ff8c28 100644 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,7 @@ common vpp-common + stats v3po ioam nsh diff --git a/stats/asciidoc/Readme.adoc b/stats/asciidoc/Readme.adoc new file mode 100644 index 000000000..c25cda105 --- /dev/null +++ b/stats/asciidoc/Readme.adoc @@ -0,0 +1,3 @@ += stats-aggregator + +Overview of stats-aggregator \ No newline at end of file diff --git a/stats/pom.xml b/stats/pom.xml new file mode 100644 index 000000000..3b355b3fd --- /dev/null +++ b/stats/pom.xml @@ -0,0 +1,58 @@ + + + + + + io.fd.hc2vpp.common + hc2vpp-parent + 1.19.08-SNAPSHOT + ../common/hc2vpp-parent + + + io.fd.hc2vpp.stats + stats-aggregator + 1.19.08-SNAPSHOT + stats-aggregator + pom + 4.0.0 + Aggregator for Hc2vpp Stats plugin + + + stats-api + stats-impl + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + + diff --git a/stats/stats-api/asciidoc/Readme.adoc b/stats/stats-api/asciidoc/Readme.adoc new file mode 100644 index 000000000..f2852f3de --- /dev/null +++ b/stats/stats-api/asciidoc/Readme.adoc @@ -0,0 +1,3 @@ += stats-api + +The APIs are based on vpp stats model. diff --git a/stats/stats-api/pom.xml b/stats/stats-api/pom.xml new file mode 100644 index 000000000..57af462a6 --- /dev/null +++ b/stats/stats-api/pom.xml @@ -0,0 +1,33 @@ + + + + + io.fd.hc2vpp.common + api-parent + 1.19.08-SNAPSHOT + ../../common/api-parent + + + 4.0.0 + io.fd.hc2vpp.stats + stats-api + ${project.artifactId} + 1.19.08-SNAPSHOT + bundle + + + diff --git a/stats/stats-impl/asciidoc/Readme.adoc b/stats/stats-impl/asciidoc/Readme.adoc new file mode 100644 index 000000000..3948377a7 --- /dev/null +++ b/stats/stats-impl/asciidoc/Readme.adoc @@ -0,0 +1,3 @@ += stats-impl + +Overview of stats-impl \ No newline at end of file diff --git a/stats/stats-impl/pom.xml b/stats/stats-impl/pom.xml new file mode 100644 index 000000000..8e6bc37d3 --- /dev/null +++ b/stats/stats-impl/pom.xml @@ -0,0 +1,99 @@ + + + + + io.fd.hc2vpp.common + vpp-impl-parent + 1.19.08-SNAPSHOT + ../../vpp-common/vpp-impl-parent + + + 4.0.0 + io.fd.hc2vpp.stats + stats-impl + ${project.artifactId} + 1.19.08-SNAPSHOT + bundle + + + + io.fd.jvpp + jvpp-stats + ${jvpp.version} + + + + io.fd.honeycomb + binding-init + ${project.version} + + + + io.fd.honeycomb + cfg-init + ${project.version} + + + + io.fd.jvpp + jvpp-registry + ${jvpp.version} + + + + + com.google.inject + guice + + + net.jmob + guice.conf + + + com.google.inject.extensions + guice-multibindings + + + + + junit + junit + test + + + org.mockito + mockito-core + test + + + org.skinny-framework + skinny-logback + test + + + com.google.inject.extensions + guice-testlib + test + + + org.hamcrest + hamcrest + test + + + diff --git a/stats/stats-impl/src/main/java/io/fd/hc2vpp/stats/StatsModule.java b/stats/stats-impl/src/main/java/io/fd/hc2vpp/stats/StatsModule.java new file mode 100644 index 000000000..66dca9fa6 --- /dev/null +++ b/stats/stats-impl/src/main/java/io/fd/hc2vpp/stats/StatsModule.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2019 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.stats; + +import com.google.common.annotations.VisibleForTesting; +import com.google.inject.AbstractModule; +import com.google.inject.Provider; +import com.google.inject.Singleton; +import io.fd.hc2vpp.stats.jvpp.JVppStatsProvider; +import io.fd.jvpp.stats.future.FutureJVppStatsFacade; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Module class instantiating stats plugin components. + */ +public class StatsModule extends AbstractModule { + + private static final Logger LOG = LoggerFactory.getLogger(StatsModule.class); + private final Class> jvppStatsProviderClass; + + public StatsModule() { + this(JVppStatsProvider.class); + } + + @VisibleForTesting + protected StatsModule(Class> jvppStatsProvider) { + this.jvppStatsProviderClass = jvppStatsProvider; + } + + @Override + protected void configure() { + LOG.debug("Installing Stats module"); + + // Bind to Plugin's JVPP + bind(FutureJVppStatsFacade.class).toProvider(jvppStatsProviderClass).in(Singleton.class); + + LOG.info("Module Stats successfully configured"); + } +} diff --git a/stats/stats-impl/src/main/java/io/fd/hc2vpp/stats/jvpp/JVppStatsProvider.java b/stats/stats-impl/src/main/java/io/fd/hc2vpp/stats/jvpp/JVppStatsProvider.java new file mode 100644 index 000000000..729ef4f3a --- /dev/null +++ b/stats/stats-impl/src/main/java/io/fd/hc2vpp/stats/jvpp/JVppStatsProvider.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2019 PANTHEON.tech. + * + * 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.stats.jvpp; + +import com.google.inject.Inject; +import io.fd.honeycomb.binding.init.ProviderTrait; +import io.fd.honeycomb.data.init.ShutdownHandler; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.stats.JVppStatsImpl; +import io.fd.jvpp.stats.future.FutureJVppStatsFacade; +import java.io.IOException; + +public class JVppStatsProvider extends ProviderTrait { + + @Inject + private JVppRegistry registry; + + @Inject + private ShutdownHandler shutdownHandler; + + private static JVppStatsImpl initStatsApi(final ShutdownHandler shutdownHandler) { + final JVppStatsImpl jvppStats = new JVppStatsImpl(); + shutdownHandler.register("jvpp-stats", jvppStats); + return jvppStats; + } + + @Override + protected FutureJVppStatsFacade create() { + try { + return new FutureJVppStatsFacade(registry, initStatsApi(shutdownHandler)); + } catch (IOException e) { + throw new IllegalStateException("Unable to open VPP management connection", e); + } + } +} diff --git a/stats/stats-impl/src/test/java/io/fd/hc2vpp/stats/StatsModuleTest.java b/stats/stats-impl/src/test/java/io/fd/hc2vpp/stats/StatsModuleTest.java new file mode 100644 index 000000000..79c4a46f2 --- /dev/null +++ b/stats/stats-impl/src/test/java/io/fd/hc2vpp/stats/StatsModuleTest.java @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2019 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.stats; + +import static org.mockito.Mockito.mock; +import static org.mockito.MockitoAnnotations.initMocks; + +import com.google.inject.Guice; +import com.google.inject.Provider; +import com.google.inject.testing.fieldbinder.BoundFieldModule; +import io.fd.jvpp.stats.future.FutureJVppStatsFacade; +import org.junit.Before; + +public class StatsModuleTest { + + @Before + public void setUp() throws Exception { + initMocks(this); + Guice.createInjector(new StatsModule(MockJVppStatsProvider.class), BoundFieldModule.of(this)) + .injectMembers(this); + } + + private static final class MockJVppStatsProvider implements Provider { + + @Override + public FutureJVppStatsFacade get() { + return mock(FutureJVppStatsFacade.class); + } + } +} \ No newline at end of file diff --git a/v3po/v3po2vpp/pom.xml b/v3po/v3po2vpp/pom.xml index 9572ed16e..7bcdbf631 100644 --- a/v3po/v3po2vpp/pom.xml +++ b/v3po/v3po2vpp/pom.xml @@ -80,6 +80,12 @@ ${jvpp.version} + + io.fd.hc2vpp.stats + stats-impl + ${project.version} + + com.google.inject diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/V3poModule.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/V3poModule.java index 4bd4cca4a..569f58fb4 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/V3poModule.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/V3poModule.java @@ -23,6 +23,7 @@ import com.google.inject.Singleton; import com.google.inject.multibindings.Multibinder; import com.google.inject.name.Names; import io.fd.hc2vpp.common.translate.util.NamingContext; +import io.fd.hc2vpp.stats.jvpp.JVppStatsProvider; import io.fd.hc2vpp.v3po.factory.InterfacesStateReaderFactory; import io.fd.hc2vpp.v3po.factory.InterfacesWriterFactory; import io.fd.hc2vpp.v3po.factory.L2HoneycombWriterFactory; @@ -33,7 +34,6 @@ import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManager; import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManagerProvider; import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceStatisticsManager; import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceStatisticsManagerProvider; -import io.fd.hc2vpp.v3po.interfacesstate.cache.JVppStatsProvider; import io.fd.hc2vpp.v3po.notification.InterfaceChangeNotificationProducerProvider; import io.fd.honeycomb.notification.ManagedNotificationProducer; import io.fd.honeycomb.translate.read.ReaderFactory; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/JVppStatsProvider.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/JVppStatsProvider.java deleted file mode 100644 index 2ffc10419..000000000 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/JVppStatsProvider.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2019 PANTHEON.tech. - * - * 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.v3po.interfacesstate.cache; - -import com.google.inject.Inject; -import io.fd.honeycomb.binding.init.ProviderTrait; -import io.fd.honeycomb.data.init.ShutdownHandler; -import io.fd.jvpp.JVppRegistry; -import io.fd.jvpp.stats.JVppStatsImpl; -import io.fd.jvpp.stats.future.FutureJVppStatsFacade; -import java.io.IOException; - -public class JVppStatsProvider extends ProviderTrait { - - @Inject - private JVppRegistry registry; - - @Inject - private ShutdownHandler shutdownHandler; - - private static JVppStatsImpl initStatsApi(final ShutdownHandler shutdownHandler) { - final JVppStatsImpl jvppStats = new JVppStatsImpl(); - shutdownHandler.register("jvpp-stats", jvppStats); - return jvppStats; - } - - @Override - protected FutureJVppStatsFacade create() { - try { - return new FutureJVppStatsFacade(registry, initStatsApi(shutdownHandler)); - } catch (IOException e) { - throw new IllegalStateException("Unable to open VPP management connection", e); - } - } -} diff --git a/vpp-integration/api-docs/docs/pom.xml b/vpp-integration/api-docs/docs/pom.xml index 3eed16ab2..d0fb409cf 100644 --- a/vpp-integration/api-docs/docs/pom.xml +++ b/vpp-integration/api-docs/docs/pom.xml @@ -35,6 +35,7 @@ io.fd.hc2vpp.fib.management.FibManagementModule, io.fd.hc2vpp.lisp.LispModule, io.fd.hc2vpp.lisp.gpe.GpeModule, + io.fd.hc2vpp.stats.StatsModule, io.fd.hc2vpp.v3po.V3poModule, io.fd.hc2vpp.iface.role.InterfaceRoleModule, io.fd.hc2vpp.l3.InterfaceL3Module, diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml index d6ac65082..337ca1883 100644 --- a/vpp-integration/minimal-distribution/pom.xml +++ b/vpp-integration/minimal-distribution/pom.xml @@ -52,6 +52,7 @@ io.fd.hc2vpp.fib.management.FibManagementModule, io.fd.hc2vpp.lisp.LispModule, io.fd.hc2vpp.lisp.gpe.GpeModule, + io.fd.hc2vpp.stats.StatsModule, io.fd.hc2vpp.v3po.V3poModule, io.fd.hc2vpp.iface.role.InterfaceRoleModule, io.fd.hc2vpp.l3.InterfaceL3Module, @@ -198,6 +199,11 @@ ipsec-impl ${project.version} + + io.fd.hc2vpp.stats + stats-impl + ${project.version} + -- cgit 1.2.3-korg