Convert PCEP session capabilities to blueprint 53/41853/5
authorTom Pantelis <tpanteli@brocade.com>
Fri, 8 Jul 2016 12:05:27 +0000 (08:05 -0400)
committerMilos Fabian <milfabia@cisco.com>
Thu, 28 Jul 2016 12:14:12 +0000 (12:14 +0000)
commit05cb37954bee21954a94045f4b40e311c048b632
tree34af8e2cb858361ec746e3c52c70f66d8bfd1917
parentaf60da2d2d9460c2703d32e58c073d7d4d1b731f
Convert PCEP session capabilities to blueprint

Added blueprint XML file, pcep-impl.xml, to the impl bundle that utilizes
the blueprint extension, "specific-reference-list" , to obtain the
specific list of PCEPCapability OSGi service instances.
The specific expected services are announced via
META-INF/services/org.opendaylight.protocol.pcep.PCEPCapability
resources in the provider bundles which the "specific-reference-list"
extension scans so it knows which services to look for. Once all expected
services are obtained, the PCEPCapability instance List bean is created and
injected into the BasePCEPSessionProposalFactory. Also added a yang app
config module and container to retrieve the dead-timer and
keep-alive-timer settings for the BasePCEPSessionProposalFactory.

The 2 PCEPCapability implementations, one in segment-routing and the
other in ietf-stateful07, are now created via new blueprint XML files and
the corresponding config yang and associated Module class were removed.

The PCEPSessionProposalFactoryImplModule was deprecated but still
remains for now to provide the PCEPSessionProposalFactory 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: I6e9aca62d3199abe844b9edc848f6bc3ee5a91fb
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
33 files changed:
artifacts/pom.xml
features/pcep/pom.xml
features/pcep/src/main/features/features.xml
pcep/api/src/main/yang/odl-pcep-api-cfg.yang
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 [deleted file]
pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/PCEPStatefulCapabilityModule.java [deleted file]
pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/PCEPStatefulCapabilityModuleFactory.java [deleted file]
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PCEPStatefulCapability.java
pcep/ietf-stateful07/src/main/resources/META-INF/services/org.opendaylight.protocol.pcep.PCEPCapability [new file with mode: 0644]
pcep/ietf-stateful07/src/main/resources/org/opendaylight/blueprint/pcep-ietf-stateful.xml
pcep/ietf-stateful07/src/main/yang/odl-pcep-ietf-stateful07-app-config.yang [new file with mode: 0644]
pcep/ietf-stateful07/src/main/yang/odl-pcep-ietf-stateful07-cfg.yang [deleted file]
pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPStatefulCapabilityModuleTest.java [deleted file]
pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPStatefulCapabilityTest.java
pcep/impl/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModule.java
pcep/impl/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModuleFactory.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/BasePCEPSessionProposalFactory.java
pcep/impl/src/main/resources/org/opendaylight/blueprint/pcep-impl.xml [new file with mode: 0644]
pcep/impl/src/main/yang/odl-pcep-impl-cfg.yang
pcep/impl/src/main/yang/pcep-app-config.yang [new file with mode: 0644]
pcep/impl/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModuleTest.java
pcep/impl/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModuleTest.java [deleted file]
pcep/segment-routing/src/main/java/org/opendaylight/controller/config/yang/pcep/sr/cfg/PCEPSegmentRoutingCapabilityModule.java [deleted file]
pcep/segment-routing/src/main/java/org/opendaylight/controller/config/yang/pcep/sr/cfg/PCEPSegmentRoutingCapabilityModuleFactory.java [deleted file]
pcep/segment-routing/src/main/resources/META-INF/services/org.opendaylight.protocol.pcep.PCEPCapability [new file with mode: 0644]
pcep/segment-routing/src/main/resources/org/opendaylight/blueprint/pcep-segment-routing.xml
pcep/segment-routing/src/main/yang/odl-pcep-segment-routing-cfg.yang [deleted file]
pcep/segment-routing/src/main/yang/pcep-segment-routing-app-config.yang
pcep/segment-routing/src/test/java/org/opendaylight/controller/config/yang/pcep/sr/cfg/PCEPSegmentRoutingCapabilityModuleTest.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