<modules>
<module>common</module>
<module>vpp-common</module>
+ <module>stats</module>
<module>v3po</module>
<module>ioam</module>
<module>nsh</module>
--- /dev/null
+= stats-aggregator
+
+Overview of stats-aggregator
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>io.fd.hc2vpp.common</groupId>
+ <artifactId>hc2vpp-parent</artifactId>
+ <version>1.19.08-SNAPSHOT</version>
+ <relativePath>../common/hc2vpp-parent</relativePath>
+ </parent>
+
+ <groupId>io.fd.hc2vpp.stats</groupId>
+ <artifactId>stats-aggregator</artifactId>
+ <version>1.19.08-SNAPSHOT</version>
+ <name>stats-aggregator</name>
+ <packaging>pom</packaging>
+ <modelVersion>4.0.0</modelVersion>
+ <description>Aggregator for Hc2vpp Stats plugin</description>
+
+ <modules>
+ <module>stats-api</module>
+ <module>stats-impl</module>
+ </modules>
+
+ <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
--- /dev/null
+= stats-api
+
+The APIs are based on vpp stats model.
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>io.fd.hc2vpp.common</groupId>
+ <artifactId>api-parent</artifactId>
+ <version>1.19.08-SNAPSHOT</version>
+ <relativePath>../../common/api-parent</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>io.fd.hc2vpp.stats</groupId>
+ <artifactId>stats-api</artifactId>
+ <name>${project.artifactId}</name>
+ <version>1.19.08-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <dependencies/>
+</project>
--- /dev/null
+= stats-impl
+
+Overview of stats-impl
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>io.fd.hc2vpp.common</groupId>
+ <artifactId>vpp-impl-parent</artifactId>
+ <version>1.19.08-SNAPSHOT</version>
+ <relativePath>../../vpp-common/vpp-impl-parent</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>io.fd.hc2vpp.stats</groupId>
+ <artifactId>stats-impl</artifactId>
+ <name>${project.artifactId}</name>
+ <version>1.19.08-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>io.fd.jvpp</groupId>
+ <artifactId>jvpp-stats</artifactId>
+ <version>${jvpp.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.fd.honeycomb</groupId>
+ <artifactId>binding-init</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.fd.honeycomb</groupId>
+ <artifactId>cfg-init</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.fd.jvpp</groupId>
+ <artifactId>jvpp-registry</artifactId>
+ <version>${jvpp.version}</version>
+ </dependency>
+
+ <!-- DI -->
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.jmob</groupId>
+ <artifactId>guice.conf</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-multibindings</artifactId>
+ </dependency>
+
+ <!-- Testing Dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.skinny-framework</groupId>
+ <artifactId>skinny-logback</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-testlib</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
--- /dev/null
+/*
+ * 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<? extends Provider<FutureJVppStatsFacade>> jvppStatsProviderClass;
+
+ public StatsModule() {
+ this(JVppStatsProvider.class);
+ }
+
+ @VisibleForTesting
+ protected StatsModule(Class<? extends Provider<FutureJVppStatsFacade>> 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");
+ }
+}
* limitations under the License.
*/
-package io.fd.hc2vpp.v3po.interfacesstate.cache;
+package io.fd.hc2vpp.stats.jvpp;
import com.google.inject.Inject;
import io.fd.honeycomb.binding.init.ProviderTrait;
--- /dev/null
+/*
+ * 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<FutureJVppStatsFacade> {
+
+ @Override
+ public FutureJVppStatsFacade get() {
+ return mock(FutureJVppStatsFacade.class);
+ }
+ }
+}
\ No newline at end of file
<version>${jvpp.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.fd.hc2vpp.stats</groupId>
+ <artifactId>stats-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<!-- DI -->
<dependency>
<groupId>com.google.inject</groupId>
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;
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;
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,
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,
<artifactId>ipsec-impl</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.fd.hc2vpp.stats</groupId>
+ <artifactId>stats-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- To use samples uncomment following dependency and rebuild the project -->
<!-- <dependency>-->
<!-- <groupId>io.fd.hc2vpp.samples</groupId>-->
Code Review / hc2vpp.git / commitdiff