From 048cf910960206bf92a7dbfbc1a02b24a41f6591 Mon Sep 17 00:00:00 2001 From: "Claudio D. Gasparini" Date: Wed, 25 Oct 2017 14:20:01 +0200 Subject: [PATCH] Create pcep topology parent aggregator Change-Id: I3fbf0eb152ba84da138881f1080eb7b65d15469c Signed-off-by: Claudio D. Gasparini --- pcep/pom.xml | 5 +-- pcep/topology/pom.xml | 41 +++++++++++++++++++ pcep/{ => topology}/topology-api/pom.xml | 2 +- .../network-topology-pcep-programming.yang | 0 .../src/main/yang/network-topology-pcep.yang | 0 pcep/{ => topology}/topology-provider/pom.xml | 2 +- .../AbstractTopologySessionListener.java | 0 .../topology/provider/OperationResults.java | 0 .../pcep/topology/provider/PCEPRequest.java | 0 .../provider/PCEPStatefulPeerProposal.java | 0 .../provider/PCEPTopologyProvider.java | 0 .../provider/ServerSessionManager.java | 0 .../provider/SessionListenerState.java | 0 .../Stateful07TopologySessionListener.java | 0 ...teful07TopologySessionListenerFactory.java | 0 .../topology/provider/SyncOptimization.java | 0 .../topology/provider/TopologyNodeState.java | 0 .../provider/TopologyProgramming.java | 0 .../pcep/topology/provider/TopologyRPCs.java | 0 .../provider/TopologySessionListener.java | 0 .../TopologySessionListenerFactory.java | 0 .../provider/TopologySessionRPCs.java | 0 .../PCEPTopologyConfigDependencies.java | 0 .../provider/config/PCEPTopologyDeployer.java | 0 .../config/PCEPTopologyDeployerImpl.java | 0 .../config/PCEPTopologyProviderBean.java | 0 ...PTopologyProviderDependenciesProvider.java | 0 .../config/PCEPTopologyProviderUtil.java | 0 .../provider/PCEPTopologyProviderModule.java | 0 .../PCEPTopologyProviderModuleFactory.java | 0 ...ateful07TopologySessionListenerModule.java | 0 ...7TopologySessionListenerModuleFactory.java | 0 .../opendaylight/blueprint/pcep-topology.xml | 0 .../yang/odl-pcep-topology-provider-cfg.yang | 0 .../provider/AbstractPCEPSessionTest.java | 0 ...crementalSynchronizationProcedureTest.java | 0 .../PCEPStatefulPeerProposalTest.java | 0 ...iggeredReSynchronizationProcedureTest.java | 0 .../PCETriggeredInitialSyncProcedureTest.java | 0 ...SynchronizationAvoidanceProcedureTest.java | 0 ...Stateful07TopologySessionListenerTest.java | 0 .../provider/SyncOptimizationTest.java | 0 .../provider/TopologyProgrammingTest.java | 0 pcep/{ => topology}/topology-spi/pom.xml | 2 +- .../spi/AbstractInstructionExecutor.java | 0 45 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 pcep/topology/pom.xml rename pcep/{ => topology}/topology-api/pom.xml (98%) rename pcep/{ => topology}/topology-api/src/main/yang/network-topology-pcep-programming.yang (100%) rename pcep/{ => topology}/topology-api/src/main/yang/network-topology-pcep.yang (100%) rename pcep/{ => topology}/topology-provider/pom.xml (99%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/OperationResults.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPRequest.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposal.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProvider.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SessionListenerState.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerFactory.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimization.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyNodeState.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgramming.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyRPCs.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologySessionListener.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologySessionListenerFactory.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologySessionRPCs.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyConfigDependencies.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyDeployer.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyDeployerImpl.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderBean.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderDependenciesProvider.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderUtil.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModule.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModuleFactory.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/Stateful07TopologySessionListenerModule.java (100%) rename pcep/{ => topology}/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/Stateful07TopologySessionListenerModuleFactory.java (100%) rename pcep/{ => topology}/topology-provider/src/main/resources/org/opendaylight/blueprint/pcep-topology.xml (100%) rename pcep/{ => topology}/topology-provider/src/main/yang/odl-pcep-topology-provider-cfg.yang (100%) rename pcep/{ => topology}/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java (100%) rename pcep/{ => topology}/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/IncrementalSynchronizationProcedureTest.java (100%) rename pcep/{ => topology}/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposalTest.java (100%) rename pcep/{ => topology}/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTriggeredReSynchronizationProcedureTest.java (100%) rename pcep/{ => topology}/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCETriggeredInitialSyncProcedureTest.java (100%) rename pcep/{ => topology}/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/StateSynchronizationAvoidanceProcedureTest.java (100%) rename pcep/{ => topology}/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java (100%) rename pcep/{ => topology}/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimizationTest.java (100%) rename pcep/{ => topology}/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgrammingTest.java (100%) rename pcep/{ => topology}/topology-spi/pom.xml (97%) rename pcep/{ => topology}/topology-spi/src/main/java/org/opendaylight/bgpcep/pcep/topology/spi/AbstractInstructionExecutor.java (100%) diff --git a/pcep/pom.xml b/pcep/pom.xml index 5801c1be3c..ff5b863c23 100644 --- a/pcep/pom.xml +++ b/pcep/pom.xml @@ -38,12 +38,9 @@ base-parser ietf-stateful07 testtool - topology-api - topology-spi - topology-provider tunnel-api tunnel-provider - + topology controller-config segment-routing pcc-mock diff --git a/pcep/topology/pom.xml b/pcep/topology/pom.xml new file mode 100644 index 0000000000..6cbf9d256c --- /dev/null +++ b/pcep/topology/pom.xml @@ -0,0 +1,41 @@ + + + 4.0.0 + + org.opendaylight.odlparent + odlparent-lite + 2.0.5 + + + + org.opendaylight.bgpcep + pcep-topology-parent + 0.9.0-SNAPSHOT + pom + PCEP Topology related components + ${project.artifactId} + + + topology-api + topology-spi + topology-provider + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + \ No newline at end of file diff --git a/pcep/topology-api/pom.xml b/pcep/topology/topology-api/pom.xml similarity index 98% rename from pcep/topology-api/pom.xml rename to pcep/topology/topology-api/pom.xml index 45b4ba65eb..35fe57eb7f 100644 --- a/pcep/topology-api/pom.xml +++ b/pcep/topology/topology-api/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.bgpcep binding-parent 0.9.0-SNAPSHOT - ../../binding-parent + ../../../binding-parent pcep-topology-api diff --git a/pcep/topology-api/src/main/yang/network-topology-pcep-programming.yang b/pcep/topology/topology-api/src/main/yang/network-topology-pcep-programming.yang similarity index 100% rename from pcep/topology-api/src/main/yang/network-topology-pcep-programming.yang rename to pcep/topology/topology-api/src/main/yang/network-topology-pcep-programming.yang diff --git a/pcep/topology-api/src/main/yang/network-topology-pcep.yang b/pcep/topology/topology-api/src/main/yang/network-topology-pcep.yang similarity index 100% rename from pcep/topology-api/src/main/yang/network-topology-pcep.yang rename to pcep/topology/topology-api/src/main/yang/network-topology-pcep.yang diff --git a/pcep/topology-provider/pom.xml b/pcep/topology/topology-provider/pom.xml similarity index 99% rename from pcep/topology-provider/pom.xml rename to pcep/topology/topology-provider/pom.xml index 54bc96507a..73f11874c9 100644 --- a/pcep/topology-provider/pom.xml +++ b/pcep/topology/topology-provider/pom.xml @@ -15,7 +15,7 @@ org.opendaylight.bgpcep config-parent 0.9.0-SNAPSHOT - ../../config-parent + ../../../config-parent pcep-topology-provider diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/OperationResults.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/OperationResults.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/OperationResults.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/OperationResults.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPRequest.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPRequest.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPRequest.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPRequest.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposal.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposal.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposal.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposal.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProvider.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProvider.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProvider.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProvider.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SessionListenerState.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SessionListenerState.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SessionListenerState.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SessionListenerState.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerFactory.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerFactory.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerFactory.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerFactory.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimization.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimization.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimization.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimization.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyNodeState.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyNodeState.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyNodeState.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyNodeState.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgramming.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgramming.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgramming.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgramming.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyRPCs.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyRPCs.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyRPCs.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyRPCs.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologySessionListener.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologySessionListener.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologySessionListener.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologySessionListener.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologySessionListenerFactory.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologySessionListenerFactory.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologySessionListenerFactory.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologySessionListenerFactory.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologySessionRPCs.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologySessionRPCs.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologySessionRPCs.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologySessionRPCs.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyConfigDependencies.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyConfigDependencies.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyConfigDependencies.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyConfigDependencies.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyDeployer.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyDeployer.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyDeployer.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyDeployer.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyDeployerImpl.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyDeployerImpl.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyDeployerImpl.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyDeployerImpl.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderBean.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderBean.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderBean.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderBean.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderDependenciesProvider.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderDependenciesProvider.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderDependenciesProvider.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderDependenciesProvider.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderUtil.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderUtil.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderUtil.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderUtil.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModule.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModule.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModule.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModule.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModuleFactory.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModuleFactory.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModuleFactory.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModuleFactory.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/Stateful07TopologySessionListenerModule.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/Stateful07TopologySessionListenerModule.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/Stateful07TopologySessionListenerModule.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/Stateful07TopologySessionListenerModule.java diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/Stateful07TopologySessionListenerModuleFactory.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/Stateful07TopologySessionListenerModuleFactory.java similarity index 100% rename from pcep/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/Stateful07TopologySessionListenerModuleFactory.java rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/Stateful07TopologySessionListenerModuleFactory.java diff --git a/pcep/topology-provider/src/main/resources/org/opendaylight/blueprint/pcep-topology.xml b/pcep/topology/topology-provider/src/main/resources/org/opendaylight/blueprint/pcep-topology.xml similarity index 100% rename from pcep/topology-provider/src/main/resources/org/opendaylight/blueprint/pcep-topology.xml rename to pcep/topology/topology-provider/src/main/resources/org/opendaylight/blueprint/pcep-topology.xml diff --git a/pcep/topology-provider/src/main/yang/odl-pcep-topology-provider-cfg.yang b/pcep/topology/topology-provider/src/main/yang/odl-pcep-topology-provider-cfg.yang similarity index 100% rename from pcep/topology-provider/src/main/yang/odl-pcep-topology-provider-cfg.yang rename to pcep/topology/topology-provider/src/main/yang/odl-pcep-topology-provider-cfg.yang diff --git a/pcep/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 similarity index 100% rename from pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java rename to pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/IncrementalSynchronizationProcedureTest.java b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/IncrementalSynchronizationProcedureTest.java similarity index 100% rename from pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/IncrementalSynchronizationProcedureTest.java rename to pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/IncrementalSynchronizationProcedureTest.java diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposalTest.java b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposalTest.java similarity index 100% rename from pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposalTest.java rename to pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposalTest.java diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTriggeredReSynchronizationProcedureTest.java b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTriggeredReSynchronizationProcedureTest.java similarity index 100% rename from pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTriggeredReSynchronizationProcedureTest.java rename to pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTriggeredReSynchronizationProcedureTest.java diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCETriggeredInitialSyncProcedureTest.java b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCETriggeredInitialSyncProcedureTest.java similarity index 100% rename from pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCETriggeredInitialSyncProcedureTest.java rename to pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCETriggeredInitialSyncProcedureTest.java diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/StateSynchronizationAvoidanceProcedureTest.java b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/StateSynchronizationAvoidanceProcedureTest.java similarity index 100% rename from pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/StateSynchronizationAvoidanceProcedureTest.java rename to pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/StateSynchronizationAvoidanceProcedureTest.java diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java similarity index 100% rename from pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java rename to pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimizationTest.java b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimizationTest.java similarity index 100% rename from pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimizationTest.java rename to pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimizationTest.java diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgrammingTest.java b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgrammingTest.java similarity index 100% rename from pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgrammingTest.java rename to pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgrammingTest.java diff --git a/pcep/topology-spi/pom.xml b/pcep/topology/topology-spi/pom.xml similarity index 97% rename from pcep/topology-spi/pom.xml rename to pcep/topology/topology-spi/pom.xml index 64b3a55d04..5be5767ab8 100644 --- a/pcep/topology-spi/pom.xml +++ b/pcep/topology/topology-spi/pom.xml @@ -15,7 +15,7 @@ org.opendaylight.bgpcep binding-parent 0.9.0-SNAPSHOT - ../../binding-parent + ../../../binding-parent pcep-topology-spi diff --git a/pcep/topology-spi/src/main/java/org/opendaylight/bgpcep/pcep/topology/spi/AbstractInstructionExecutor.java b/pcep/topology/topology-spi/src/main/java/org/opendaylight/bgpcep/pcep/topology/spi/AbstractInstructionExecutor.java similarity index 100% rename from pcep/topology-spi/src/main/java/org/opendaylight/bgpcep/pcep/topology/spi/AbstractInstructionExecutor.java rename to pcep/topology/topology-spi/src/main/java/org/opendaylight/bgpcep/pcep/topology/spi/AbstractInstructionExecutor.java -- 2.36.6