Convert bmp extenstions to blueprint 11/40511/7
authorTom Pantelis <tpanteli@brocade.com>
Thu, 16 Jun 2016 15:47:18 +0000 (11:47 -0400)
committerTom Pantelis <tpanteli@brocade.com>
Thu, 14 Jul 2016 07:06:41 +0000 (03:06 -0400)
commit33e0a3d726e5b8733b00f3d54f66b11194984f1e
tree995ad76b023864c75016f357e5628751d49a49c5
parent2495cd145d0e79a3bce78d5c2695860e3b9a4b3e
Convert bmp extenstions to blueprint

Added blueprint XML file, bmp-spi.xml, to the spi bundle that Utilizes
the new blueprint extension, "specific-reference-list" (added by
https://git.opendaylight.org/gerrit/#/c/40267/), to obtain the
specific list of BmpExtensionProviderActivator OSGi service instances.
The specific expected services are announced via
META-INF/services/org.opendaylight.protocol.bmp.spi.registry.BmpExtensionProviderActivator
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 BmpExtensionProviderActivator instance List
bean is created and injected into the SimpleBmpExtensionProviderContextActivator
bean instance which calls start on each.

The only BmpExtensionProviderActivator instance wired in 32-bmp.xml is
the BmpActivator in bmp-impl. This instance is now created via the
blueprint XML, bgp-bmp.xml, and the config yang and associated Module
class were removed.

The SimpleBmpExtensionProviderContextModule was deprecated but still
remains for now to provide the BmpExtensionProviderContext 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: I96205d078d9a7ec5fa58eae7c0f66a88227f7bc5
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
14 files changed:
bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BaseBmpParserModule.java [deleted file]
bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BaseBmpParserModuleFactory.java [deleted file]
bgp/bmp-impl/src/main/resources/META-INF/services/org.opendaylight.protocol.bmp.spi.registry.BmpExtensionProviderActivator [new file with mode: 0644]
bgp/bmp-impl/src/main/resources/org/opendaylight/blueprint/bgp-bmp.xml [new file with mode: 0644]
bgp/bmp-impl/src/main/yang/odl-bmp-impl-cfg.yang
bgp/bmp-impl/src/test/java/org/opendaylight/controller/config/yang/bmp/impl/AbstractBmpModuleTest.java
bgp/bmp-impl/src/test/java/org/opendaylight/controller/config/yang/bmp/impl/BaseBmpParserModuleTest.java [deleted file]
bgp/bmp-spi/src/main/java/org/opendaylight/controller/config/yang/bmp/spi/SimpleBmpExtensionProviderContextModule.java
bgp/bmp-spi/src/main/java/org/opendaylight/controller/config/yang/bmp/spi/SimpleBmpExtensionProviderContextModuleFactory.java
bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpExtensionProviderContextActivator.java [new file with mode: 0644]
bgp/bmp-spi/src/main/resources/org/opendaylight/blueprint/bgp-bmp-spi.xml [new file with mode: 0644]
bgp/bmp-spi/src/main/yang/odl-bmp-spi-cfg.yang
bgp/bmp-spi/src/test/java/org/opendaylight/controller/config/yang/bmp/spi/SimpleBmpExtensionProviderContextModuleTest.java [deleted file]
bgp/controller-config/src/main/resources/initial/32-bmp.xml