Convert PCEP extensions to blueprint 12/41512/7
authorTom Pantelis <tpanteli@brocade.com>
Thu, 7 Jul 2016 09:10:22 +0000 (05:10 -0400)
committerMilos Fabian <milfabia@cisco.com>
Tue, 19 Jul 2016 11:40:04 +0000 (11:40 +0000)
commitd0f0ae49e470f1e48932c7db539ff44caa33660a
tree82184e2c09ac223e758171a2f8f3858027fcd87c
parenta661496ef91d2c13270f9517b08067cdedeeda45
Convert PCEP extensions to blueprint

Added blueprint XML file, pcep-spi.xml, to the spi bundle that utilizes
the blueprint extension, "specific-reference-list" , to obtain the
specific list of PCEPExtensionProviderActivator OSGi service instances.
The specific expected services are announced via
META-INF/services/org.opendaylight.protocol.pcep.spi.PCEPExtensionProviderActivator
resources in the provider bundles which the "specific-reference-list"
extension scan so it knows which services to look for. Once all expected
services are obtained, the PCEPExtensionProviderActivator instance List
bean is created and injected into the SimplePCEPExtensionProviderContextActivator
bean instance which calls start on each.

All 6 PCEPExtensionProviderActivator implementations, base-parser,
auto-bandwidth, segment-routing, and 3 in ietf-stateful07, now created via
new blueprint XML files and the corresponding config yang and associated Module
class were removed.

The SimplePCEPExtensionProviderContextModule was deprecated but still
remains for now to provide the PCEPExtensionProviderContext instance
created via blueprint to the config system so it can be injected into
other users. Once the other user(s) are converted to blueprint then the
config yang, Module classes can be removed.

Change-Id: I71193376f762975f775d1a5a6cee0f7702b525b2
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
51 files changed:
artifacts/pom.xml
features/pcep/pom.xml
features/pcep/src/main/features/features.xml
pcep/auto-bandwidth-extension/src/main/java/org/opendaylight/controller/config/yang/pcep/auto/bandwidth/cfg/AutoBandwidthPCEPParserModule.java [deleted file]
pcep/auto-bandwidth-extension/src/main/java/org/opendaylight/controller/config/yang/pcep/auto/bandwidth/cfg/AutoBandwidthPCEPParserModuleFactory.java [deleted file]
pcep/auto-bandwidth-extension/src/main/java/org/opendaylight/protocol/pcep/auto/bandwidth/extension/Activator.java
pcep/auto-bandwidth-extension/src/main/resources/META-INF/services/org.opendaylight.protocol.pcep.spi.PCEPExtensionProviderActivator [new file with mode: 0644]
pcep/auto-bandwidth-extension/src/main/resources/org/opendaylight/blueprint/pcep-auto-bandwidth.xml [new file with mode: 0644]
pcep/auto-bandwidth-extension/src/main/yang/odl-pcep-auto-bandwidth-cfg.yang [deleted file]
pcep/auto-bandwidth-extension/src/main/yang/pcep-auto-bandwidth-app-config.yang [new file with mode: 0644]
pcep/auto-bandwidth-extension/src/test/java/org/opendaylight/controller/config/yang/pcep/auto/bandwidth/cfg/AutoBandwidthPCEPParserModuleTest.java [deleted file]
pcep/base-parser/src/main/resources/org/opendaylight/blueprint/pcep-base-parser.xml [new file with mode: 0644]
pcep/controller-config/pom.xml
pcep/controller-config/src/main/resources/initial/32-pcep.xml
pcep/controller-config/src/main/resources/initial/33-pcep-segment-routing.xml
pcep/controller-config/src/main/resources/initial/34-pcep-auto-bandwidth.xml [deleted file]
pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/IetfInitiated00PCEPParserModule.java [deleted file]
pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/IetfInitiated00PCEPParserModuleFactory.java [deleted file]
pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/IetfStateful07PCEPParserModule.java [deleted file]
pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/IetfStateful07PCEPParserModuleFactory.java [deleted file]
pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/SyncOptimizationsPCEPParserModule.java [deleted file]
pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/SyncOptimizationsPCEPParserModuleFactory.java [deleted file]
pcep/ietf-stateful07/src/main/resources/META-INF/services/org.opendaylight.protocol.pcep.spi.PCEPExtensionProviderActivator
pcep/ietf-stateful07/src/main/resources/org/opendaylight/blueprint/pcep-ietf-stateful.xml [new file with mode: 0644]
pcep/ietf-stateful07/src/main/yang/odl-pcep-ietf-stateful07-cfg.yang
pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/IetfInitiated00PCEPParserModuleTest.java [deleted file]
pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/IetfStateful07PCEPParserModuleTest.java [deleted file]
pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/SyncOptimizationsPCEPParserModuleTest.java [deleted file]
pcep/impl/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/BasePCEPParserModule.java [deleted file]
pcep/impl/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/BasePCEPParserModuleFactory.java [deleted file]
pcep/impl/src/main/yang/odl-pcep-impl-cfg.yang
pcep/impl/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/BasePCEPParserModuleTest.java [deleted file]
pcep/impl/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModuleTest.java
pcep/segment-routing/src/main/java/org/opendaylight/controller/config/yang/pcep/sr/cfg/SegmentRoutingPCEPParserModule.java [deleted file]
pcep/segment-routing/src/main/java/org/opendaylight/controller/config/yang/pcep/sr/cfg/SegmentRoutingPCEPParserModuleFactory.java [deleted file]
pcep/segment-routing/src/main/resources/META-INF/services/org.opendaylight.protocol.pcep.spi.PCEPExtensionProviderActivator [new file with mode: 0644]
pcep/segment-routing/src/main/resources/org/opendaylight/blueprint/pcep-segment-routing.xml [new file with mode: 0644]
pcep/segment-routing/src/main/yang/odl-pcep-segment-routing-cfg.yang
pcep/segment-routing/src/main/yang/pcep-segment-routing-app-config.yang [new file with mode: 0644]
pcep/segment-routing/src/test/java/org/opendaylight/controller/config/yang/pcep/sr/cfg/SegmentRoutingPCEPParserModuleTest.java [deleted file]
pcep/spi/src/main/java/org/opendaylight/controller/config/yang/pcep/spi/ReusablePCEPExtensionProviderContext.java [deleted file]
pcep/spi/src/main/java/org/opendaylight/controller/config/yang/pcep/spi/SimplePCEPExtensionProviderContextModule.java
pcep/spi/src/main/java/org/opendaylight/controller/config/yang/pcep/spi/SimplePCEPExtensionProviderContextModuleFactory.java
pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimplePCEPExtensionProviderContextActivator.java [new file with mode: 0644]
pcep/spi/src/main/resources/org/opendaylight/blueprint/pcep-spi.xml [new file with mode: 0644]
pcep/spi/src/main/yang/odl-pcep-spi-cfg.yang
pcep/spi/src/test/java/org/opendaylight/controller/config/yang/pcep/spi/ReusablePCEPExtensionProviderContextTest.java [deleted file]
pcep/spi/src/test/java/org/opendaylight/controller/config/yang/pcep/spi/SimplePCEPExtensionProviderContextModuleTest.java [deleted file]
pcep/topology-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModuleTest.java
pcep/tunnel-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModuleTest.java
programming/impl/src/test/java/org/opendaylight/controller/config/yang/programming/impl/AbstractInstructionSchedulerTest.java