Add blueprint XML wiring for the BmpDispatcher 71/41671/5
authorTom Pantelis <tpanteli@brocade.com>
Thu, 7 Jul 2016 01:20:27 +0000 (21:20 -0400)
committerTom Pantelis <tpanteli@brocade.com>
Thu, 21 Jul 2016 15:58:21 +0000 (11:58 -0400)
commit197a445232128b33b601d32c7625452a60c317f4
tree51fb394e3c3791c9011b5c71b0ef029ddba42f29
parent5c7acb767406a36a4fcc78e4ebd10b9a8a1f85df
Add blueprint XML wiring for the BmpDispatcher

Added blueprint wiring for the BGPDispatcher. The BmpDispatcherImplModule
was deprecated but still remains for now to provide the BmpDispatcher
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 and Module classes can be removed.

There was one complication. The BmpActivator protcol extension is in the
bmp-impl bundle and the service is consumed by the bmp-spi bundle.
The BmpExtensionConsumerContext is provided by the bmp-spi bundle and is
consumed by the bmp-impl bundle. This causes a circular service
dependency which causes a deadlock with blueprint. To avoid this I moved
the BmpActivator and related message and tlv classes (which are only used by
BmpActivator) to a new bundle, bmp-parser-ext. This bundle now provides
the BmpActivator extension provider to the bmp-spi bundle thereby
breaking the circular dependency.

Change-Id: Idbee9a7c2632d1e26c76314213389f83ff8ae5c1
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
60 files changed:
artifacts/pom.xml
bgp/bmp-impl/pom.xml
bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModule.java
bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModuleFactory.java
bgp/bmp-impl/src/main/resources/org/opendaylight/blueprint/bgp-bmp.xml
bgp/bmp-impl/src/main/yang/odl-bmp-impl-cfg.yang
bgp/bmp-impl/src/test/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModuleTest.java [deleted file]
bgp/bmp-impl/src/test/java/org/opendaylight/controller/config/yang/bmp/impl/BmpMonitorImplModuleTest.java
bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitorImplTest.java
bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/session/BmpDispatcherImplTest.java
bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/session/BmpSessionImplTest.java
bgp/bmp-mock/pom.xml
bgp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMock.java
bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java
bgp/bmp-parser-impl/pom.xml [new file with mode: 0644]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/BmpActivator.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpActivator.java with 88% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/InitiationHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/InitiationHandler.java with 98% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerDownHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/PeerDownHandler.java with 94% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerUpHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/PeerUpHandler.java with 99% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/RouteMirroringMessageHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/RouteMirroringMessageHandler.java with 98% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/RouteMonitoringMessageHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/RouteMonitoringMessageHandler.java with 98% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/StatisticsReportHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/StatisticsReportHandler.java with 99% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/TerminationHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/TerminationHandler.java with 98% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/DescriptionTlvHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/DescriptionTlvHandler.java with 97% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/MirrorInformationTlvHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/MirrorInformationTlvHandler.java with 97% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/NameTlvHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/NameTlvHandler.java with 97% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/ReasonTlvHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/ReasonTlvHandler.java with 97% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType000TlvHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType000TlvHandler.java with 97% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType001TlvHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType001TlvHandler.java with 97% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType002TlvHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType002TlvHandler.java with 97% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType003TlvHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType003TlvHandler.java with 97% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType004TlvHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType004TlvHandler.java with 97% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType005TlvHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType005TlvHandler.java with 97% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType006TlvHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType006TlvHandler.java with 97% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType007TlvHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType007TlvHandler.java with 97% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType008TlvHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType008TlvHandler.java with 97% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType009TlvHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType009TlvHandler.java with 98% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType010TlvHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType010TlvHandler.java with 98% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType011TlvHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType011TlvHandler.java with 97% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType012TlvHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType012TlvHandler.java with 97% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType013TlvHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType013TlvHandler.java with 97% similarity]
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StringTlvHandler.java [moved from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StringTlvHandler.java with 97% similarity]
bgp/bmp-parser-impl/src/main/resources/META-INF/services/org.opendaylight.protocol.bmp.spi.registry.BmpExtensionProviderActivator [moved from bgp/bmp-impl/src/main/resources/META-INF/services/org.opendaylight.protocol.bmp.spi.registry.BmpExtensionProviderActivator with 86% similarity]
bgp/bmp-parser-impl/src/main/resources/org/opendaylight/blueprint/bgp-bmp-parser-ext.xml [new file with mode: 0644]
bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/AbstractBmpMessageTest.java [moved from bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/AbstractBmpMessageTest.java with 93% similarity]
bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/InitiationHandlerTest.java [moved from bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/InitiationHandlerTest.java with 96% similarity]
bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/PeerDownHandlerTest.java [moved from bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/PeerDownHandlerTest.java with 96% similarity]
bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/PeerUpHandlerTest.java [moved from bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/PeerUpHandlerTest.java with 97% similarity]
bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/RouteMonitoringMessageHandlerTest.java [moved from bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/RouteMonitoringMessageHandlerTest.java with 97% similarity]
bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/StatisticsReportHandlerTest.java [moved from bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/StatisticsReportHandlerTest.java with 98% similarity]
bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TerminationHandlerTest.java [moved from bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/TerminationHandlerTest.java with 94% similarity]
bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java [moved from bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/test/TestUtil.java with 99% similarity]
bgp/bmp-spi/pom.xml
bgp/bmp-spi/src/main/java/org/opendaylight/controller/config/yang/bmp/spi/SimpleBmpExtensionProviderContextModule.java [deleted file]
bgp/bmp-spi/src/main/java/org/opendaylight/controller/config/yang/bmp/spi/SimpleBmpExtensionProviderContextModuleFactory.java [deleted file]
bgp/bmp-spi/src/main/yang/odl-bmp-spi-cfg.yang [deleted file]
bgp/controller-config/src/main/resources/initial/32-bmp.xml
bgp/pom.xml
features/bmp/pom.xml
features/bmp/src/main/features/features.xml