From ab215cd0eaffee086b46a70b2ff277686cbb5803 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 19 Apr 2022 20:42:08 +0200 Subject: [PATCH] Integrate pcep-topology-stats with pcep-topology-provider These two components are tightly coupled and are tripping over each other. Remove the unneccessary indirections to reign in the lifecycle. JIRA: BGPCEP-1005 Change-Id: I65bcee1d8cb756e774ce0ecd6df92bcf743cd06c Signed-off-by: Robert Varga --- features/pcep/features-pcep/pom.xml | 6 -- .../odl-bgpcep-pcep-topology-provider/pom.xml | 6 -- .../odl-bgpcep-pcep-topology-stats/pom.xml | 42 -------- features/pcep/pom.xml | 1 - pcep/pcep-artifacts/pom.xml | 12 --- pcep/topology/pom.xml | 1 - pcep/topology/topology-provider/pom.xml | 4 +- .../PCEPTopologyProviderDependencies.java | 1 - .../provider/PCEPTopologyTracker.java | 1 - .../TopologySessionStatsRegistry.java | 4 +- .../provider/TopologyStatsProviderImpl.java | 3 +- .../TopologyStatsRpcServiceImpl.java | 2 +- .../OSGI-INF/blueprint/pcep-topology.xml | 26 ++++- .../main/yang/odl-pcep-stats-provider.yang | 0 .../provider/AbstractPCEPSessionTest.java | 1 - .../TopologyStatsRpcServiceImplTest.java | 2 +- pcep/topology/topology-spi/pom.xml | 12 --- pcep/topology/topology-stats/pom.xml | 102 ------------------ .../OSGI-INF/blueprint/pcep-stats.xml | 34 ------ 19 files changed, 29 insertions(+), 231 deletions(-) delete mode 100644 features/pcep/odl-bgpcep-pcep-topology-stats/pom.xml rename pcep/topology/{topology-spi/src/main/java/org/opendaylight/bgpcep/pcep/topology/spi/stats => topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider}/TopologySessionStatsRegistry.java (93%) rename pcep/topology/{topology-stats/src/main/java/org/opendaylight/bgpcep/pcep/topology/stats => topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology}/provider/TopologyStatsProviderImpl.java (98%) rename pcep/topology/{topology-stats/src/main/java/org/opendaylight/bgpcep/pcep/topology/stats/rpc => topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider}/TopologyStatsRpcServiceImpl.java (99%) rename pcep/topology/{topology-stats => topology-provider}/src/main/yang/odl-pcep-stats-provider.yang (100%) rename pcep/topology/{topology-stats/src/test/java/org/opendaylight/bgpcep/pcep/topology/stats/rpc => topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider}/TopologyStatsRpcServiceImplTest.java (99%) delete mode 100644 pcep/topology/topology-stats/pom.xml delete mode 100644 pcep/topology/topology-stats/src/main/resources/OSGI-INF/blueprint/pcep-stats.xml diff --git a/features/pcep/features-pcep/pom.xml b/features/pcep/features-pcep/pom.xml index a78220e673..6a0d783aa5 100644 --- a/features/pcep/features-pcep/pom.xml +++ b/features/pcep/features-pcep/pom.xml @@ -105,12 +105,6 @@ xml features - - ${project.groupId} - odl-bgpcep-pcep-topology-stats - xml - features - ${project.groupId} odl-bgpcep-pcep-config-example diff --git a/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml b/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml index 53e39dd702..ca7ae35978 100644 --- a/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml +++ b/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml @@ -38,12 +38,6 @@ xml features - - ${project.groupId} - odl-bgpcep-pcep-topology-stats - xml - features - ${project.groupId} odl-bgpcep-pcep-server-provider diff --git a/features/pcep/odl-bgpcep-pcep-topology-stats/pom.xml b/features/pcep/odl-bgpcep-pcep-topology-stats/pom.xml deleted file mode 100644 index eda675fcff..0000000000 --- a/features/pcep/odl-bgpcep-pcep-topology-stats/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - 4.0.0 - - org.opendaylight.bgpcep - single-feature-parent - 0.17.2-SNAPSHOT - ../../../single-feature-parent - - - odl-bgpcep-pcep-topology-stats - feature - OpenDaylight :: PCEP :: Topology Stats - - - - ${project.groupId} - pcep-topology-stats - - - ${project.groupId} - odl-bgpcep-pcep-stateful - xml - features - - - ${project.groupId} - odl-bgpcep-pcep-topology - xml - features - - - diff --git a/features/pcep/pom.xml b/features/pcep/pom.xml index c019f5b2e9..91d1d669ab 100644 --- a/features/pcep/pom.xml +++ b/features/pcep/pom.xml @@ -36,7 +36,6 @@ odl-bgpcep-pcep-tunnel-provider odl-bgpcep-pcep-segment-routing odl-bgpcep-pcep-auto-bandwidth - odl-bgpcep-pcep-topology-stats odl-bgpcep-pcep-config-example odl-bgpcep-pcep-cli odl-bgpcep-pcep-base-parser diff --git a/pcep/pcep-artifacts/pom.xml b/pcep/pcep-artifacts/pom.xml index a964bd433a..5b8316c63b 100644 --- a/pcep/pcep-artifacts/pom.xml +++ b/pcep/pcep-artifacts/pom.xml @@ -129,11 +129,6 @@ pcep-auto-bandwidth-extension ${project.version} - - ${project.groupId} - pcep-topology-stats - ${project.version} - ${project.groupId} pcep-cli @@ -252,13 +247,6 @@ xml ${project.version} - - ${project.groupId} - odl-bgpcep-pcep-topology-stats - features - xml - ${project.version} - ${project.groupId} odl-bgpcep-pcep-cli diff --git a/pcep/topology/pom.xml b/pcep/topology/pom.xml index 54b46835e9..44b33e0350 100644 --- a/pcep/topology/pom.xml +++ b/pcep/topology/pom.xml @@ -26,7 +26,6 @@ topology-api topology-spi topology-provider - topology-stats cli diff --git a/pcep/topology/topology-provider/pom.xml b/pcep/topology/topology-provider/pom.xml index afd5738ab4..2d4a48d7ed 100644 --- a/pcep/topology/topology-provider/pom.xml +++ b/pcep/topology/topology-provider/pom.xml @@ -14,9 +14,9 @@ 4.0.0 org.opendaylight.bgpcep - bgpcep-parent + binding-parent 0.17.2-SNAPSHOT - ../../../parent + ../../../binding-parent pcep-topology-provider diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProviderDependencies.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProviderDependencies.java index 1c95402ef4..a83225a717 100644 --- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProviderDependencies.java +++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProviderDependencies.java @@ -9,7 +9,6 @@ package org.opendaylight.bgpcep.pcep.topology.provider; import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.bgpcep.pcep.server.PceServerProvider; -import org.opendaylight.bgpcep.pcep.topology.spi.stats.TopologySessionStatsRegistry; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.RpcProviderService; import org.opendaylight.protocol.pcep.PCEPDispatcher; diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyTracker.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyTracker.java index ce82b3cfce..509ef2fd5a 100644 --- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyTracker.java +++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyTracker.java @@ -17,7 +17,6 @@ import java.util.concurrent.ConcurrentMap; import org.checkerframework.checker.lock.qual.GuardedBy; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.bgpcep.pcep.server.PceServerProvider; -import org.opendaylight.bgpcep.pcep.topology.spi.stats.TopologySessionStatsRegistry; import org.opendaylight.bgpcep.programming.spi.InstructionSchedulerFactory; import org.opendaylight.mdsal.binding.api.ClusteredDataTreeChangeListener; import org.opendaylight.mdsal.binding.api.DataBroker; diff --git a/pcep/topology/topology-spi/src/main/java/org/opendaylight/bgpcep/pcep/topology/spi/stats/TopologySessionStatsRegistry.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologySessionStatsRegistry.java similarity index 93% rename from pcep/topology/topology-spi/src/main/java/org/opendaylight/bgpcep/pcep/topology/spi/stats/TopologySessionStatsRegistry.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologySessionStatsRegistry.java index beafd7928e..81be0a5a5d 100644 --- a/pcep/topology/topology-spi/src/main/java/org/opendaylight/bgpcep/pcep/topology/spi/stats/TopologySessionStatsRegistry.java +++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologySessionStatsRegistry.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.bgpcep.pcep.topology.spi.stats; +package org.opendaylight.bgpcep.pcep.topology.provider; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stats.rev171113.PcepSessionState; @@ -16,7 +16,7 @@ import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; /** * Topology Node Sessions stats handler. Will store Session stats on DS per each Topology Node registered. */ -public interface TopologySessionStatsRegistry { +interface TopologySessionStatsRegistry { /** * Register session to Session stats Registry handler. * diff --git a/pcep/topology/topology-stats/src/main/java/org/opendaylight/bgpcep/pcep/topology/stats/provider/TopologyStatsProviderImpl.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyStatsProviderImpl.java similarity index 98% rename from pcep/topology/topology-stats/src/main/java/org/opendaylight/bgpcep/pcep/topology/stats/provider/TopologyStatsProviderImpl.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyStatsProviderImpl.java index d60f8c7182..c88801a4ed 100644 --- a/pcep/topology/topology-stats/src/main/java/org/opendaylight/bgpcep/pcep/topology/stats/provider/TopologyStatsProviderImpl.java +++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyStatsProviderImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.bgpcep.pcep.topology.stats.provider; +package org.opendaylight.bgpcep.pcep.topology.provider; import static java.util.Objects.requireNonNull; @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import org.checkerframework.checker.lock.qual.GuardedBy; import org.checkerframework.checker.lock.qual.Holding; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.bgpcep.pcep.topology.spi.stats.TopologySessionStatsRegistry; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.Transaction; import org.opendaylight.mdsal.binding.api.TransactionChain; diff --git a/pcep/topology/topology-stats/src/main/java/org/opendaylight/bgpcep/pcep/topology/stats/rpc/TopologyStatsRpcServiceImpl.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyStatsRpcServiceImpl.java similarity index 99% rename from pcep/topology/topology-stats/src/main/java/org/opendaylight/bgpcep/pcep/topology/stats/rpc/TopologyStatsRpcServiceImpl.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyStatsRpcServiceImpl.java index f7850c523a..a6b1857c7f 100644 --- a/pcep/topology/topology-stats/src/main/java/org/opendaylight/bgpcep/pcep/topology/stats/rpc/TopologyStatsRpcServiceImpl.java +++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyStatsRpcServiceImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.bgpcep.pcep.topology.stats.rpc; +package org.opendaylight.bgpcep.pcep.topology.provider; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; diff --git a/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml b/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml index c3524976f8..aff99bc8c1 100644 --- a/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml +++ b/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml @@ -6,15 +6,14 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + - - + + + + + + + + + + + + + + + diff --git a/pcep/topology/topology-stats/src/main/yang/odl-pcep-stats-provider.yang b/pcep/topology/topology-provider/src/main/yang/odl-pcep-stats-provider.yang similarity index 100% rename from pcep/topology/topology-stats/src/main/yang/odl-pcep-stats-provider.yang rename to pcep/topology/topology-provider/src/main/yang/odl-pcep-stats-provider.yang diff --git a/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java index d73955b43b..17dfe10e06 100644 --- a/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java +++ b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java @@ -30,7 +30,6 @@ import org.junit.Before; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.opendaylight.bgpcep.pcep.topology.spi.stats.TopologySessionStatsRegistry; import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractConcurrentDataBrokerTest; import org.opendaylight.protocol.pcep.impl.DefaultPCEPSessionNegotiator; import org.opendaylight.protocol.pcep.impl.PCEPSessionImpl; diff --git a/pcep/topology/topology-stats/src/test/java/org/opendaylight/bgpcep/pcep/topology/stats/rpc/TopologyStatsRpcServiceImplTest.java b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyStatsRpcServiceImplTest.java similarity index 99% rename from pcep/topology/topology-stats/src/test/java/org/opendaylight/bgpcep/pcep/topology/stats/rpc/TopologyStatsRpcServiceImplTest.java rename to pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyStatsRpcServiceImplTest.java index bb1b67f51c..729c68f066 100644 --- a/pcep/topology/topology-stats/src/test/java/org/opendaylight/bgpcep/pcep/topology/stats/rpc/TopologyStatsRpcServiceImplTest.java +++ b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyStatsRpcServiceImplTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.bgpcep.pcep.topology.stats.rpc; +package org.opendaylight.bgpcep.pcep.topology.provider; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/pcep/topology/topology-spi/pom.xml b/pcep/topology/topology-spi/pom.xml index 586f8fe8cf..ada6d28d61 100644 --- a/pcep/topology/topology-spi/pom.xml +++ b/pcep/topology/topology-spi/pom.xml @@ -25,10 +25,6 @@ ${project.artifactId} - - ${project.groupId} - pcep-api - ${project.groupId} pcep-topology-api @@ -41,14 +37,6 @@ ${project.groupId} programming-spi - - org.opendaylight.mdsal - yang-binding - - - org.opendaylight.mdsal.model - ietf-topology - com.google.guava guava diff --git a/pcep/topology/topology-stats/pom.xml b/pcep/topology/topology-stats/pom.xml deleted file mode 100644 index 0b9695c3ea..0000000000 --- a/pcep/topology/topology-stats/pom.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - 4.0.0 - - org.opendaylight.bgpcep - binding-parent - 0.17.2-SNAPSHOT - ../../../binding-parent - - - pcep-topology-stats - PCEP Topology Stats - bundle - ${project.artifactId} - - - - ${project.groupId} - pcep-api - - - org.opendaylight.mdsal.model - ietf-topology - - - ${project.groupId} - pcep-topology-api - - - ${project.groupId} - pcep-ietf-stateful - - - ${project.groupId} - pcep-topology-spi - - - ${project.groupId} - programming-spi - - - org.opendaylight.mdsal - mdsal-binding-api - - - org.opendaylight.mdsal - mdsal-common-api - - - org.opendaylight.yangtools - yang-common - - - org.opendaylight.yangtools - concepts - - - com.google.guava - guava - - - org.checkerframework - checker-qual - provided - - - - - org.opendaylight.mdsal - mdsal-binding-dom-adapter - test-jar - test - - - org.opendaylight.mdsal - mdsal-binding-dom-adapter - test - - - org.opendaylight.mdsal - mdsal-binding-test-utils - test - - - - - scm:git:ssh://git.opendaylight.org:29418/bgpcep.git - scm:git:ssh://git.opendaylight.org:29418/bgpcep.git - https://wiki.opendaylight.org/display/ODL/BGPCEP - HEAD - - diff --git a/pcep/topology/topology-stats/src/main/resources/OSGI-INF/blueprint/pcep-stats.xml b/pcep/topology/topology-stats/src/main/resources/OSGI-INF/blueprint/pcep-stats.xml deleted file mode 100644 index b5a0b560e4..0000000000 --- a/pcep/topology/topology-stats/src/main/resources/OSGI-INF/blueprint/pcep-stats.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - -- 2.36.6