From 197a445232128b33b601d32c7625452a60c317f4 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Wed, 6 Jul 2016 21:20:27 -0400 Subject: [PATCH] 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 --- artifacts/pom.xml | 5 + bgp/bmp-impl/pom.xml | 11 ++ .../bmp/impl/BmpDispatcherImplModule.java | 43 +++++++- .../impl/BmpDispatcherImplModuleFactory.java | 26 ++++- .../org/opendaylight/blueprint/bgp-bmp.xml | 27 ++++- .../src/main/yang/odl-bmp-impl-cfg.yang | 29 +---- .../bmp/impl/BmpDispatcherImplModuleTest.java | 96 ---------------- .../bmp/impl/BmpMonitorImplModuleTest.java | 28 +++-- .../bmp/impl/app/BmpMonitorImplTest.java | 4 +- .../impl/session/BmpDispatcherImplTest.java | 2 +- .../bmp/impl/session/BmpSessionImplTest.java | 2 +- bgp/bmp-mock/pom.xml | 4 + .../protocol/bmp/mock/BmpMock.java | 2 +- .../protocol/bmp/mock/BmpMockTest.java | 2 +- bgp/bmp-parser-impl/pom.xml | 103 ++++++++++++++++++ .../protocol/bmp/parser}/BmpActivator.java | 54 ++++----- .../parser}/message/InitiationHandler.java | 2 +- .../bmp/parser}/message/PeerDownHandler.java | 11 +- .../bmp/parser}/message/PeerUpHandler.java | 2 +- .../message/RouteMirroringMessageHandler.java | 2 +- .../RouteMonitoringMessageHandler.java | 2 +- .../message/StatisticsReportHandler.java | 2 +- .../parser}/message/TerminationHandler.java | 2 +- .../parser}/tlv/DescriptionTlvHandler.java | 2 +- .../tlv/MirrorInformationTlvHandler.java | 2 +- .../bmp/parser}/tlv/NameTlvHandler.java | 2 +- .../bmp/parser}/tlv/ReasonTlvHandler.java | 2 +- .../parser}/tlv/StatType000TlvHandler.java | 2 +- .../parser}/tlv/StatType001TlvHandler.java | 2 +- .../parser}/tlv/StatType002TlvHandler.java | 2 +- .../parser}/tlv/StatType003TlvHandler.java | 2 +- .../parser}/tlv/StatType004TlvHandler.java | 2 +- .../parser}/tlv/StatType005TlvHandler.java | 2 +- .../parser}/tlv/StatType006TlvHandler.java | 2 +- .../parser}/tlv/StatType007TlvHandler.java | 2 +- .../parser}/tlv/StatType008TlvHandler.java | 2 +- .../parser}/tlv/StatType009TlvHandler.java | 2 +- .../parser}/tlv/StatType010TlvHandler.java | 2 +- .../parser}/tlv/StatType011TlvHandler.java | 2 +- .../parser}/tlv/StatType012TlvHandler.java | 2 +- .../parser}/tlv/StatType013TlvHandler.java | 2 +- .../bmp/parser}/tlv/StringTlvHandler.java | 2 +- ...spi.registry.BmpExtensionProviderActivator | 2 +- .../blueprint/bgp-bmp-parser-ext.xml | 13 +++ .../message/AbstractBmpMessageTest.java | 4 +- .../message/InitiationHandlerTest.java | 4 +- .../parser}/message/PeerDownHandlerTest.java | 7 +- .../parser}/message/PeerUpHandlerTest.java | 5 +- .../RouteMonitoringMessageHandlerTest.java | 5 +- .../message/StatisticsReportHandlerTest.java | 5 +- .../message/TerminationHandlerTest.java | 4 +- .../bmp/parser/message}/TestUtil.java | 2 +- bgp/bmp-spi/pom.xml | 4 - ...mpleBmpExtensionProviderContextModule.java | 63 ----------- ...ExtensionProviderContextModuleFactory.java | 35 ------ .../src/main/yang/odl-bmp-spi-cfg.yang | 58 ---------- .../src/main/resources/initial/32-bmp.xml | 25 ----- bgp/pom.xml | 1 + features/bmp/pom.xml | 4 + features/bmp/src/main/features/features.xml | 1 + 60 files changed, 320 insertions(+), 421 deletions(-) delete mode 100644 bgp/bmp-impl/src/test/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModuleTest.java create mode 100644 bgp/bmp-parser-impl/pom.xml rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/BmpActivator.java (88%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/message/InitiationHandler.java (98%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/message/PeerDownHandler.java (94%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/message/PeerUpHandler.java (99%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/message/RouteMirroringMessageHandler.java (98%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/message/RouteMonitoringMessageHandler.java (98%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/message/StatisticsReportHandler.java (99%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/message/TerminationHandler.java (98%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/tlv/DescriptionTlvHandler.java (97%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/tlv/MirrorInformationTlvHandler.java (97%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/tlv/NameTlvHandler.java (97%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/tlv/ReasonTlvHandler.java (97%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/tlv/StatType000TlvHandler.java (97%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/tlv/StatType001TlvHandler.java (97%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/tlv/StatType002TlvHandler.java (97%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/tlv/StatType003TlvHandler.java (97%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/tlv/StatType004TlvHandler.java (97%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/tlv/StatType005TlvHandler.java (97%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/tlv/StatType006TlvHandler.java (97%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/tlv/StatType007TlvHandler.java (97%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/tlv/StatType008TlvHandler.java (97%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/tlv/StatType009TlvHandler.java (98%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/tlv/StatType010TlvHandler.java (98%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/tlv/StatType011TlvHandler.java (97%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/tlv/StatType012TlvHandler.java (97%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/tlv/StatType013TlvHandler.java (97%) rename bgp/{bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser}/tlv/StringTlvHandler.java (97%) rename bgp/{bmp-impl => bmp-parser-impl}/src/main/resources/META-INF/services/org.opendaylight.protocol.bmp.spi.registry.BmpExtensionProviderActivator (86%) create mode 100644 bgp/bmp-parser-impl/src/main/resources/org/opendaylight/blueprint/bgp-bmp-parser-ext.xml rename bgp/{bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser}/message/AbstractBmpMessageTest.java (93%) rename bgp/{bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser}/message/InitiationHandlerTest.java (96%) rename bgp/{bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser}/message/PeerDownHandlerTest.java (96%) rename bgp/{bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser}/message/PeerUpHandlerTest.java (97%) rename bgp/{bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser}/message/RouteMonitoringMessageHandlerTest.java (97%) rename bgp/{bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser}/message/StatisticsReportHandlerTest.java (98%) rename bgp/{bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl => bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser}/message/TerminationHandlerTest.java (94%) rename bgp/{bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/test => bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message}/TestUtil.java (99%) delete mode 100644 bgp/bmp-spi/src/main/java/org/opendaylight/controller/config/yang/bmp/spi/SimpleBmpExtensionProviderContextModule.java delete mode 100644 bgp/bmp-spi/src/main/java/org/opendaylight/controller/config/yang/bmp/spi/SimpleBmpExtensionProviderContextModuleFactory.java delete mode 100644 bgp/bmp-spi/src/main/yang/odl-bmp-spi-cfg.yang diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 84db523663..480e59bc4c 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -442,6 +442,11 @@ bgp-bmp-mock ${project.version} + + ${project.groupId} + bgp-bmp-parser-impl + ${project.version} + ${project.groupId} bgp-openconfig-api diff --git a/bgp/bmp-impl/pom.xml b/bgp/bmp-impl/pom.xml index 3584e0afe3..5d848b7598 100644 --- a/bgp/bmp-impl/pom.xml +++ b/bgp/bmp-impl/pom.xml @@ -28,6 +28,10 @@ ${project.groupId} bgp-bmp-api + + ${project.groupId} + bgp-bmp-parser-impl + org.opendaylight.controller sal-broker-impl @@ -238,6 +242,13 @@ sal-dom-broker-config test + + ${project.groupId} + bgp-bmp-parser-impl + ${project.version} + test-jar + test + diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModule.java b/bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModule.java index 62ce49a251..85c0ab2af4 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModule.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModule.java @@ -8,10 +8,21 @@ package org.opendaylight.controller.config.yang.bmp.impl; -import org.opendaylight.protocol.bmp.impl.BmpDispatcherImpl; -import org.opendaylight.protocol.bmp.impl.session.DefaultBmpSessionFactory; +import com.google.common.reflect.AbstractInvocationHandler; +import com.google.common.reflect.Reflection; +import java.lang.reflect.Method; +import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker; +import org.opendaylight.protocol.bmp.api.BmpDispatcher; +import org.osgi.framework.BundleContext; + +/** + * @deprecated Replaced by blueprint wiring but remains for backwards compatibility until downstream users + * of the provided config system service are converted to blueprint. + */ +@Deprecated +public class BmpDispatcherImplModule extends AbstractBmpDispatcherImplModule { + private BundleContext bundleContext; -public class BmpDispatcherImplModule extends org.opendaylight.controller.config.yang.bmp.impl.AbstractBmpDispatcherImplModule { public BmpDispatcherImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { super(identifier, dependencyResolver); } @@ -26,9 +37,29 @@ public class BmpDispatcherImplModule extends org.opendaylight.controller.config. } @Override - public java.lang.AutoCloseable createInstance() { - return new BmpDispatcherImpl(getBossGroupDependency(), getWorkerGroupDependency(), - getBmpExtensionsDependency().getBmpMessageRegistry(), new DefaultBmpSessionFactory()); + public AutoCloseable createInstance() { + // The BmpDispatcher instance is created and advertised as an OSGi service via blueprint + // so obtain it here (waiting if necessary). + final WaitingServiceTracker tracker = + WaitingServiceTracker.create(BmpDispatcher.class, bundleContext); + final BmpDispatcher service = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES); + + // Create a proxy to override close to close the ServiceTracker. The actual BmpDispatcher + // instance will be closed via blueprint. + return Reflection.newProxy(BmpDispatcher.class, new AbstractInvocationHandler() { + @Override + protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable { + if (method.getName().equals("close")) { + tracker.close(); + return null; + } else { + return method.invoke(service, args); + } + } + }); } + void setBundleContext(BundleContext bundleContext) { + this.bundleContext = bundleContext; + } } diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModuleFactory.java b/bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModuleFactory.java index 22f80c963b..88addd488c 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModuleFactory.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModuleFactory.java @@ -8,6 +8,30 @@ package org.opendaylight.controller.config.yang.bmp.impl; -public class BmpDispatcherImplModuleFactory extends org.opendaylight.controller.config.yang.bmp.impl.AbstractBmpDispatcherImplModuleFactory { +import org.opendaylight.controller.config.api.DependencyResolver; +import org.osgi.framework.BundleContext; + +/** + * @deprecated Replaced by blueprint wiring but remains for backwards compatibility until downstream users + * of the provided config system service are converted to blueprint. + */ +@Deprecated +public class BmpDispatcherImplModuleFactory extends AbstractBmpDispatcherImplModuleFactory { + @Override + public BmpDispatcherImplModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, + BmpDispatcherImplModule oldModule, AutoCloseable oldInstance, BundleContext bundleContext) { + BmpDispatcherImplModule module = super.instantiateModule(instanceName, dependencyResolver, oldModule, + oldInstance, bundleContext); + module.setBundleContext(bundleContext); + return module; + } + + @Override + public BmpDispatcherImplModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, + BundleContext bundleContext) { + BmpDispatcherImplModule module = super.instantiateModule(instanceName, dependencyResolver, bundleContext); + module.setBundleContext(bundleContext); + return module; + } } diff --git a/bgp/bmp-impl/src/main/resources/org/opendaylight/blueprint/bgp-bmp.xml b/bgp/bmp-impl/src/main/resources/org/opendaylight/blueprint/bgp-bmp.xml index 9dd4590e73..620340b77c 100644 --- a/bgp/bmp-impl/src/main/resources/org/opendaylight/blueprint/bgp-bmp.xml +++ b/bgp/bmp-impl/src/main/resources/org/opendaylight/blueprint/bgp-bmp.xml @@ -2,12 +2,29 @@ - + + + - - + + + + + + + + + - + + + + + + + + \ No newline at end of file diff --git a/bgp/bmp-impl/src/main/yang/odl-bmp-impl-cfg.yang b/bgp/bmp-impl/src/main/yang/odl-bmp-impl-cfg.yang index eaa42a1532..f3420f2d9e 100644 --- a/bgp/bmp-impl/src/main/yang/odl-bmp-impl-cfg.yang +++ b/bgp/bmp-impl/src/main/yang/odl-bmp-impl-cfg.yang @@ -4,7 +4,6 @@ module odl-bmp-impl-cfg { prefix "bmp-impl"; import config { prefix config; revision-date 2013-04-05; } - import odl-bmp-spi-cfg { prefix spi; revision-date 2015-05-13; } import odl-bgp-rib-spi-cfg { prefix ribspi; revision-date 2013-11-15; } import netty { prefix netty; revision-date 2013-11-19; } import ietf-inet-types { prefix inet; revision-date 2013-07-15; } @@ -39,6 +38,7 @@ module odl-bmp-impl-cfg { base "config:service-type"; config:java-class "org.opendaylight.protocol.bmp.api.BmpDispatcher"; + config:disable-osgi-service-registration; } identity bmp-dispatcher-impl { @@ -50,33 +50,6 @@ module odl-bmp-impl-cfg { augment "/config:modules/config:module/config:configuration" { case bmp-dispatcher-impl { when "/config:modules/config:module/config:type = 'bmp-dispatcher-impl'"; - - container bmp-extensions { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity spi:consumer-extensions; - } - } - } - - container boss-group { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity netty:netty-threadgroup; - } - } - } - - container worker-group { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity netty:netty-threadgroup; - } - } - } } } diff --git a/bgp/bmp-impl/src/test/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModuleTest.java b/bgp/bmp-impl/src/test/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModuleTest.java deleted file mode 100644 index 32cda8e839..0000000000 --- a/bgp/bmp-impl/src/test/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModuleTest.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.config.yang.bmp.impl; - -import static org.mockito.Mockito.mock; -import io.netty.channel.EventLoopGroup; -import io.netty.util.Timer; -import io.netty.util.concurrent.EventExecutor; -import javax.management.InstanceAlreadyExistsException; -import javax.management.ObjectName; -import org.junit.Before; -import org.junit.Test; -import org.opendaylight.controller.config.api.jmx.CommitStatus; -import org.opendaylight.controller.config.manager.impl.factoriesresolver.HardcodedModuleFactoriesResolver; -import org.opendaylight.controller.config.util.ConfigTransactionJMXClient; -import org.opendaylight.controller.config.yang.bmp.spi.SimpleBmpExtensionProviderContextModuleFactory; -import org.opendaylight.controller.config.yang.bmp.spi.SimpleBmpExtensionProviderContextModuleMXBean; -import org.opendaylight.controller.config.yang.netty.eventexecutor.GlobalEventExecutorModuleFactory; -import org.opendaylight.controller.config.yang.netty.threadgroup.NettyThreadgroupModuleFactory; -import org.opendaylight.controller.config.yang.netty.threadgroup.NettyThreadgroupModuleMXBean; - -public class BmpDispatcherImplModuleTest extends AbstractBmpModuleTest { - private static final String INSTANCE_NAME = "bmp-message-fct"; - private static final String FACTORY_NAME = BmpDispatcherImplModuleFactory.NAME; - - private static final String BMP_EXTENSION_INSTANCE_NAME = "bmp-extension-impl"; - private static final String BOSS_TG_INSTANCE_NAME = "boss-threadgroup-impl"; - private static final String WORKER_TG_INSTANCE_NAME = "worker-threadgroup-impl"; - - @Override - @Before - public void setUp() throws Exception { - super.setUp(); - super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(this.mockedContext, - new BmpDispatcherImplModuleFactory(), - new NettyThreadgroupModuleFactory(), - new GlobalEventExecutorModuleFactory(), - new SimpleBmpExtensionProviderContextModuleFactory())); - - setupMockService(EventLoopGroup.class, mock(EventLoopGroup.class)); - setupMockService(Timer.class, mock(Timer.class)); - setupMockService(EventExecutor.class, mock(EventExecutor.class)); - } - - @Test - public void testCreateBean() throws Exception { - final CommitStatus status = createInstance(); - assertBeanCount(1, FACTORY_NAME); - assertStatus(status, 4, 0, 0); - } - - @Test - public void testReusingOldInstance() throws Exception { - createInstance(); - final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction(); - assertBeanCount(1, FACTORY_NAME); - final CommitStatus status = transaction.commit(); - assertBeanCount(1, FACTORY_NAME); - assertStatus(status, 0, 0, 4); - } - - private CommitStatus createInstance() throws Exception { - final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction(); - createInstance(transaction); - return transaction.commit(); - } - - public static ObjectName createInstance(final ConfigTransactionJMXClient transaction) throws InstanceAlreadyExistsException { - final ObjectName nameCreated = transaction.createModule(FACTORY_NAME, INSTANCE_NAME); - final BmpDispatcherImplModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, BmpDispatcherImplModuleMXBean.class); - mxBean.setBossGroup(createThreadgroupInstance(transaction, BOSS_TG_INSTANCE_NAME, 10)); - mxBean.setWorkerGroup(createThreadgroupInstance(transaction, WORKER_TG_INSTANCE_NAME, 10)); - mxBean.setBmpExtensions(createBmpExtensionsInstance(transaction)); - return nameCreated; - } - - private static ObjectName createThreadgroupInstance(final ConfigTransactionJMXClient transaction, final String instanceName, - final Integer threadCount) throws InstanceAlreadyExistsException { - final ObjectName nameCreated = transaction.createModule(NettyThreadgroupModuleFactory.NAME, instanceName); - final NettyThreadgroupModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, NettyThreadgroupModuleMXBean.class); - mxBean.setThreadCount(threadCount); - return nameCreated; - } - - private static ObjectName createBmpExtensionsInstance(final ConfigTransactionJMXClient transaction) - throws InstanceAlreadyExistsException { - final ObjectName nameCreated = transaction.createModule(SimpleBmpExtensionProviderContextModuleFactory.NAME, BMP_EXTENSION_INSTANCE_NAME); - transaction.newMXBeanProxy(nameCreated, SimpleBmpExtensionProviderContextModuleMXBean.class); - return nameCreated; - } -} diff --git a/bgp/bmp-impl/src/test/java/org/opendaylight/controller/config/yang/bmp/impl/BmpMonitorImplModuleTest.java b/bgp/bmp-impl/src/test/java/org/opendaylight/controller/config/yang/bmp/impl/BmpMonitorImplModuleTest.java index 6a6169e6a0..f0aa3bb475 100644 --- a/bgp/bmp-impl/src/test/java/org/opendaylight/controller/config/yang/bmp/impl/BmpMonitorImplModuleTest.java +++ b/bgp/bmp-impl/src/test/java/org/opendaylight/controller/config/yang/bmp/impl/BmpMonitorImplModuleTest.java @@ -16,8 +16,7 @@ import com.google.common.collect.Lists; import com.google.common.io.ByteSource; import com.google.common.io.Resources; import com.google.common.util.concurrent.CheckedFuture; -import io.netty.channel.EventLoopGroup; -import io.netty.util.concurrent.EventExecutor; +import io.netty.channel.nio.NioEventLoopGroup; import java.io.IOException; import java.net.URL; import java.util.ArrayList; @@ -40,17 +39,12 @@ import org.opendaylight.controller.config.manager.impl.factoriesresolver.Hardcod import org.opendaylight.controller.config.util.ConfigTransactionJMXClient; import org.opendaylight.controller.config.yang.bgp.rib.spi.RIBExtensionsImplModuleFactory; import org.opendaylight.controller.config.yang.bgp.rib.spi.RIBExtensionsImplModuleMXBean; -import org.opendaylight.controller.config.yang.bmp.spi.SimpleBmpExtensionProviderContextModuleFactory; import org.opendaylight.controller.config.yang.md.sal.binding.impl.RuntimeMappingModuleFactory; import org.opendaylight.controller.config.yang.md.sal.binding.impl.RuntimeMappingModuleMXBean; import org.opendaylight.controller.config.yang.md.sal.dom.impl.DomInmemoryDataBrokerModuleFactory; import org.opendaylight.controller.config.yang.md.sal.dom.impl.DomInmemoryDataBrokerModuleMXBean; import org.opendaylight.controller.config.yang.md.sal.dom.impl.SchemaServiceImplSingletonModuleFactory; import org.opendaylight.controller.config.yang.md.sal.dom.impl.SchemaServiceImplSingletonModuleMXBean; -import org.opendaylight.controller.config.yang.netty.eventexecutor.AutoCloseableEventExecutor; -import org.opendaylight.controller.config.yang.netty.eventexecutor.GlobalEventExecutorModuleFactory; -import org.opendaylight.controller.config.yang.netty.threadgroup.NettyThreadgroupModuleFactory; -import org.opendaylight.controller.config.yang.netty.threadgroup.NioEventLoopGroupCloseable; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodecFactory; @@ -59,6 +53,10 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.controller.sal.core.api.model.SchemaService; import org.opendaylight.controller.sal.core.api.model.YangTextSourceProvider; +import org.opendaylight.protocol.bmp.api.BmpDispatcher; +import org.opendaylight.protocol.bmp.impl.BmpDispatcherImpl; +import org.opendaylight.protocol.bmp.impl.session.DefaultBmpSessionFactory; +import org.opendaylight.protocol.bmp.spi.registry.SimpleBmpMessageRegistry; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.sal.binding.generator.api.ClassLoadingStrategy; @@ -102,9 +100,6 @@ public class BmpMonitorImplModuleTest extends AbstractBmpModuleTest { new RuntimeMappingModuleFactory(), new DomInmemoryDataBrokerModuleFactory(), new BmpDispatcherImplModuleFactory(), - new NettyThreadgroupModuleFactory(), - new SimpleBmpExtensionProviderContextModuleFactory(), - new GlobalEventExecutorModuleFactory(), new SchemaServiceImplSingletonModuleFactory())); final ServiceReference emptyServiceReference = mock(ServiceReference.class, "Empty"); @@ -163,8 +158,9 @@ public class BmpMonitorImplModuleTest extends AbstractBmpModuleTest { BindingToNormalizedNodeCodecFactory.getOrCreateInstance( GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(), mockedSchemaService); - setupMockService(EventLoopGroup.class, NioEventLoopGroupCloseable.newInstance(0)); - setupMockService(EventExecutor.class, AutoCloseableEventExecutor.CloseableEventExecutorMixin.globalEventExecutor()); + BmpDispatcher bmpDispatcher = new BmpDispatcherImpl(new NioEventLoopGroup(), new NioEventLoopGroup(), + new SimpleBmpMessageRegistry(), new DefaultBmpSessionFactory()); + setupMockService(BmpDispatcher.class, bmpDispatcher); } private static SchemaContext parseYangStreams(final Collection streams) { @@ -208,7 +204,7 @@ public class BmpMonitorImplModuleTest extends AbstractBmpModuleTest { public void testCreateBean() throws Exception { final CommitStatus status = createInstance(); assertBeanCount(1, FACTORY_NAME); - assertStatus(status, 9, 0, 0); + assertStatus(status, 6, 0, 0); } @Test @@ -218,7 +214,7 @@ public class BmpMonitorImplModuleTest extends AbstractBmpModuleTest { assertBeanCount(1, FACTORY_NAME); final CommitStatus status = transaction.commit(); assertBeanCount(1, FACTORY_NAME); - assertStatus(status, 0, 0, 9); + assertStatus(status, 0, 0, 6); } private CommitStatus createInstance() throws Exception { @@ -259,6 +255,8 @@ public class BmpMonitorImplModuleTest extends AbstractBmpModuleTest { } private static ObjectName createDispatcher(final ConfigTransactionJMXClient transaction) throws InstanceAlreadyExistsException { - return BmpDispatcherImplModuleTest.createInstance(transaction); + final ObjectName nameCreated = transaction.createModule(BmpDispatcherImplModuleFactory.NAME, "bmp-message-fct"); + transaction.newMXBeanProxy(nameCreated, BmpDispatcherImplModuleMXBean.class); + return nameCreated; } } diff --git a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitorImplTest.java b/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitorImplTest.java index 30e60a9e25..6aeeb3efa4 100644 --- a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitorImplTest.java +++ b/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitorImplTest.java @@ -56,12 +56,12 @@ import org.opendaylight.protocol.bgp.parser.spi.pojo.SimpleBGPExtensionProviderC import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderContext; import org.opendaylight.protocol.bgp.rib.spi.SimpleRIBExtensionProviderContext; import org.opendaylight.protocol.bmp.api.BmpDispatcher; -import org.opendaylight.protocol.bmp.impl.BmpActivator; import org.opendaylight.protocol.bmp.impl.BmpDispatcherImpl; import org.opendaylight.protocol.bmp.impl.BmpHandlerFactory; import org.opendaylight.protocol.bmp.impl.session.DefaultBmpSessionFactory; import org.opendaylight.protocol.bmp.impl.spi.BmpMonitoringStation; -import org.opendaylight.protocol.bmp.impl.test.TestUtil; +import org.opendaylight.protocol.bmp.parser.BmpActivator; +import org.opendaylight.protocol.bmp.parser.message.TestUtil; import org.opendaylight.protocol.bmp.spi.registry.BmpMessageRegistry; import org.opendaylight.protocol.bmp.spi.registry.SimpleBmpExtensionProviderContext; import org.opendaylight.protocol.concepts.KeyMapping; diff --git a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/session/BmpDispatcherImplTest.java b/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/session/BmpDispatcherImplTest.java index f6112759e6..82463e25a3 100644 --- a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/session/BmpDispatcherImplTest.java +++ b/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/session/BmpDispatcherImplTest.java @@ -28,8 +28,8 @@ import org.opendaylight.protocol.bmp.api.BmpDispatcher; import org.opendaylight.protocol.bmp.api.BmpSession; import org.opendaylight.protocol.bmp.api.BmpSessionFactory; import org.opendaylight.protocol.bmp.api.BmpSessionListenerFactory; -import org.opendaylight.protocol.bmp.impl.BmpActivator; import org.opendaylight.protocol.bmp.impl.BmpDispatcherImpl; +import org.opendaylight.protocol.bmp.parser.BmpActivator; import org.opendaylight.protocol.bmp.spi.registry.BmpMessageRegistry; import org.opendaylight.protocol.bmp.spi.registry.SimpleBmpExtensionProviderContext; import org.opendaylight.protocol.concepts.KeyMapping; diff --git a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/session/BmpSessionImplTest.java b/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/session/BmpSessionImplTest.java index 578f91b180..0a2741c33b 100644 --- a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/session/BmpSessionImplTest.java +++ b/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/session/BmpSessionImplTest.java @@ -17,7 +17,7 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.opendaylight.protocol.bmp.api.BmpSession; -import org.opendaylight.protocol.bmp.impl.test.TestUtil; +import org.opendaylight.protocol.bmp.parser.message.TestUtil; import org.opendaylight.protocol.bmp.spi.parser.BmpDeserializationException; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev150512.InitiationMessage; diff --git a/bgp/bmp-mock/pom.xml b/bgp/bmp-mock/pom.xml index cf015bcd06..47b1cbfdf0 100644 --- a/bgp/bmp-mock/pom.xml +++ b/bgp/bmp-mock/pom.xml @@ -24,6 +24,10 @@ org.opendaylight.bgpcep bgp-bmp-impl + + org.opendaylight.bgpcep + bgp-bmp-parser-impl + org.opendaylight.bgpcep bgp-parser-api diff --git a/bgp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMock.java b/bgp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMock.java index 1efab2d56f..2000a3fe8f 100644 --- a/bgp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMock.java +++ b/bgp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMock.java @@ -16,7 +16,7 @@ import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionPr import org.opendaylight.protocol.bmp.api.BmpSession; import org.opendaylight.protocol.bmp.api.BmpSessionFactory; import org.opendaylight.protocol.bmp.api.BmpSessionListenerFactory; -import org.opendaylight.protocol.bmp.impl.BmpActivator; +import org.opendaylight.protocol.bmp.parser.BmpActivator; import org.opendaylight.protocol.bmp.spi.registry.BmpExtensionProviderActivator; import org.opendaylight.protocol.bmp.spi.registry.BmpExtensionProviderContext; import org.opendaylight.protocol.bmp.spi.registry.SimpleBmpExtensionProviderContext; diff --git a/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java b/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java index 4767190278..e1528587ca 100644 --- a/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java +++ b/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java @@ -21,7 +21,7 @@ import org.opendaylight.protocol.bmp.api.BmpDispatcher; import org.opendaylight.protocol.bmp.api.BmpSession; import org.opendaylight.protocol.bmp.api.BmpSessionListener; import org.opendaylight.protocol.bmp.api.BmpSessionListenerFactory; -import org.opendaylight.protocol.bmp.impl.BmpActivator; +import org.opendaylight.protocol.bmp.parser.BmpActivator; import org.opendaylight.protocol.bmp.impl.BmpDispatcherImpl; import org.opendaylight.protocol.bmp.impl.session.DefaultBmpSessionFactory; import org.opendaylight.protocol.bmp.spi.registry.BmpExtensionProviderActivator; diff --git a/bgp/bmp-parser-impl/pom.xml b/bgp/bmp-parser-impl/pom.xml new file mode 100644 index 0000000000..a5a3e0ed5a --- /dev/null +++ b/bgp/bmp-parser-impl/pom.xml @@ -0,0 +1,103 @@ + + + 4.0.0 + + scm:git:ssh://git.opendaylight.org:29418/bgpcep.git + scm:git:ssh://git.opendaylight.org:29418/bgpcep.git + https://wiki.opendaylight.org/view/BGP_LS_PCEP:Main + HEAD + + + + org.opendaylight.bgpcep + bgp-parent + 0.6.0-SNAPSHOT + + + bgp-bmp-parser-impl + bundle + ${project.artifactId} + + 3.0.4 + + + + + com.google.guava + guava + + + ${project.groupId} + bgp-bmp-api + + + ${project.groupId} + bgp-bmp-spi + + + org.opendaylight.mdsal.model + ietf-yang-types-20130715 + + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + + + + junit + junit + + + ${project.groupId} + bgp-parser-impl + test + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + ${project.groupId}.${project.artifactId} + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + package + + + + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpActivator.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/BmpActivator.java similarity index 88% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpActivator.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/BmpActivator.java index 1ba9e0f2d5..e3ddd1058e 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpActivator.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/BmpActivator.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl; +package org.opendaylight.protocol.bmp.parser; import java.util.ArrayList; import java.util.List; @@ -14,32 +14,32 @@ import org.opendaylight.protocol.bgp.parser.spi.AddressFamilyRegistry; import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionConsumerContext; import org.opendaylight.protocol.bgp.parser.spi.MessageRegistry; import org.opendaylight.protocol.bgp.parser.spi.SubsequentAddressFamilyRegistry; -import org.opendaylight.protocol.bmp.impl.message.InitiationHandler; -import org.opendaylight.protocol.bmp.impl.message.PeerDownHandler; -import org.opendaylight.protocol.bmp.impl.message.PeerUpHandler; -import org.opendaylight.protocol.bmp.impl.message.RouteMirroringMessageHandler; -import org.opendaylight.protocol.bmp.impl.message.RouteMonitoringMessageHandler; -import org.opendaylight.protocol.bmp.impl.message.StatisticsReportHandler; -import org.opendaylight.protocol.bmp.impl.message.TerminationHandler; -import org.opendaylight.protocol.bmp.impl.tlv.DescriptionTlvHandler; -import org.opendaylight.protocol.bmp.impl.tlv.MirrorInformationTlvHandler; -import org.opendaylight.protocol.bmp.impl.tlv.NameTlvHandler; -import org.opendaylight.protocol.bmp.impl.tlv.ReasonTlvHandler; -import org.opendaylight.protocol.bmp.impl.tlv.StatType000TlvHandler; -import org.opendaylight.protocol.bmp.impl.tlv.StatType001TlvHandler; -import org.opendaylight.protocol.bmp.impl.tlv.StatType002TlvHandler; -import org.opendaylight.protocol.bmp.impl.tlv.StatType003TlvHandler; -import org.opendaylight.protocol.bmp.impl.tlv.StatType004TlvHandler; -import org.opendaylight.protocol.bmp.impl.tlv.StatType005TlvHandler; -import org.opendaylight.protocol.bmp.impl.tlv.StatType006TlvHandler; -import org.opendaylight.protocol.bmp.impl.tlv.StatType007TlvHandler; -import org.opendaylight.protocol.bmp.impl.tlv.StatType008TlvHandler; -import org.opendaylight.protocol.bmp.impl.tlv.StatType009TlvHandler; -import org.opendaylight.protocol.bmp.impl.tlv.StatType010TlvHandler; -import org.opendaylight.protocol.bmp.impl.tlv.StatType011TlvHandler; -import org.opendaylight.protocol.bmp.impl.tlv.StatType012TlvHandler; -import org.opendaylight.protocol.bmp.impl.tlv.StatType013TlvHandler; -import org.opendaylight.protocol.bmp.impl.tlv.StringTlvHandler; +import org.opendaylight.protocol.bmp.parser.message.InitiationHandler; +import org.opendaylight.protocol.bmp.parser.message.PeerDownHandler; +import org.opendaylight.protocol.bmp.parser.message.PeerUpHandler; +import org.opendaylight.protocol.bmp.parser.message.RouteMirroringMessageHandler; +import org.opendaylight.protocol.bmp.parser.message.RouteMonitoringMessageHandler; +import org.opendaylight.protocol.bmp.parser.message.StatisticsReportHandler; +import org.opendaylight.protocol.bmp.parser.message.TerminationHandler; +import org.opendaylight.protocol.bmp.parser.tlv.DescriptionTlvHandler; +import org.opendaylight.protocol.bmp.parser.tlv.MirrorInformationTlvHandler; +import org.opendaylight.protocol.bmp.parser.tlv.NameTlvHandler; +import org.opendaylight.protocol.bmp.parser.tlv.ReasonTlvHandler; +import org.opendaylight.protocol.bmp.parser.tlv.StatType000TlvHandler; +import org.opendaylight.protocol.bmp.parser.tlv.StatType001TlvHandler; +import org.opendaylight.protocol.bmp.parser.tlv.StatType002TlvHandler; +import org.opendaylight.protocol.bmp.parser.tlv.StatType003TlvHandler; +import org.opendaylight.protocol.bmp.parser.tlv.StatType004TlvHandler; +import org.opendaylight.protocol.bmp.parser.tlv.StatType005TlvHandler; +import org.opendaylight.protocol.bmp.parser.tlv.StatType006TlvHandler; +import org.opendaylight.protocol.bmp.parser.tlv.StatType007TlvHandler; +import org.opendaylight.protocol.bmp.parser.tlv.StatType008TlvHandler; +import org.opendaylight.protocol.bmp.parser.tlv.StatType009TlvHandler; +import org.opendaylight.protocol.bmp.parser.tlv.StatType010TlvHandler; +import org.opendaylight.protocol.bmp.parser.tlv.StatType011TlvHandler; +import org.opendaylight.protocol.bmp.parser.tlv.StatType012TlvHandler; +import org.opendaylight.protocol.bmp.parser.tlv.StatType013TlvHandler; +import org.opendaylight.protocol.bmp.parser.tlv.StringTlvHandler; import org.opendaylight.protocol.bmp.spi.registry.AbstractBmpExtensionProviderActivator; import org.opendaylight.protocol.bmp.spi.registry.BmpExtensionProviderContext; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev150512.InitiationMessage; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/InitiationHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/InitiationHandler.java similarity index 98% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/InitiationHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/InitiationHandler.java index 04e326a1df..b40992825c 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/InitiationHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/InitiationHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.message; +package org.opendaylight.protocol.bmp.parser.message; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/PeerDownHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerDownHandler.java similarity index 94% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/PeerDownHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerDownHandler.java index d882eb0cd1..fdcf7c03c2 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/PeerDownHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerDownHandler.java @@ -6,13 +6,12 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.message; - -import static org.opendaylight.protocol.bmp.impl.message.PeerDownHandler.Reason.REASON_FOUR; -import static org.opendaylight.protocol.bmp.impl.message.PeerDownHandler.Reason.REASON_ONE; -import static org.opendaylight.protocol.bmp.impl.message.PeerDownHandler.Reason.REASON_THREE; -import static org.opendaylight.protocol.bmp.impl.message.PeerDownHandler.Reason.REASON_TWO; +package org.opendaylight.protocol.bmp.parser.message; +import static org.opendaylight.protocol.bmp.parser.message.PeerDownHandler.Reason.REASON_FOUR; +import static org.opendaylight.protocol.bmp.parser.message.PeerDownHandler.Reason.REASON_ONE; +import static org.opendaylight.protocol.bmp.parser.message.PeerDownHandler.Reason.REASON_THREE; +import static org.opendaylight.protocol.bmp.parser.message.PeerDownHandler.Reason.REASON_TWO; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import io.netty.buffer.ByteBuf; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/PeerUpHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerUpHandler.java similarity index 99% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/PeerUpHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerUpHandler.java index 0ee84ec542..c797760339 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/PeerUpHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerUpHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.message; +package org.opendaylight.protocol.bmp.parser.message; import com.google.common.base.Preconditions; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/RouteMirroringMessageHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/RouteMirroringMessageHandler.java similarity index 98% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/RouteMirroringMessageHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/RouteMirroringMessageHandler.java index 79676d53c4..9144c47f5e 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/RouteMirroringMessageHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/RouteMirroringMessageHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.message; +package org.opendaylight.protocol.bmp.parser.message; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/RouteMonitoringMessageHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/RouteMonitoringMessageHandler.java similarity index 98% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/RouteMonitoringMessageHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/RouteMonitoringMessageHandler.java index 5f503659a9..2017863c22 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/RouteMonitoringMessageHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/RouteMonitoringMessageHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.message; +package org.opendaylight.protocol.bmp.parser.message; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/StatisticsReportHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/StatisticsReportHandler.java similarity index 99% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/StatisticsReportHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/StatisticsReportHandler.java index 7a4e205b4c..bbc7e5a321 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/StatisticsReportHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/StatisticsReportHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.message; +package org.opendaylight.protocol.bmp.parser.message; import static org.opendaylight.protocol.util.ByteBufWriteUtil.INT_BYTES_LENGTH; import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedInt; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/TerminationHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/TerminationHandler.java similarity index 98% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/TerminationHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/TerminationHandler.java index c0f6b6c759..db80561c56 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/message/TerminationHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/TerminationHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.message; +package org.opendaylight.protocol.bmp.parser.message; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/DescriptionTlvHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/DescriptionTlvHandler.java similarity index 97% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/DescriptionTlvHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/DescriptionTlvHandler.java index 5baad5e52f..e1353feb6f 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/DescriptionTlvHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/DescriptionTlvHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.tlv; +package org.opendaylight.protocol.bmp.parser.tlv; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/MirrorInformationTlvHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/MirrorInformationTlvHandler.java similarity index 97% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/MirrorInformationTlvHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/MirrorInformationTlvHandler.java index 3669212a66..43ee9a0401 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/MirrorInformationTlvHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/MirrorInformationTlvHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.tlv; +package org.opendaylight.protocol.bmp.parser.tlv; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/NameTlvHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/NameTlvHandler.java similarity index 97% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/NameTlvHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/NameTlvHandler.java index 1f522d280c..1a5f4a872e 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/NameTlvHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/NameTlvHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.tlv; +package org.opendaylight.protocol.bmp.parser.tlv; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/ReasonTlvHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/ReasonTlvHandler.java similarity index 97% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/ReasonTlvHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/ReasonTlvHandler.java index db8ba91097..0372064d51 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/ReasonTlvHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/ReasonTlvHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.tlv; +package org.opendaylight.protocol.bmp.parser.tlv; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType000TlvHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType000TlvHandler.java similarity index 97% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType000TlvHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType000TlvHandler.java index b0baa42848..b5411a3511 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType000TlvHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType000TlvHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.tlv; +package org.opendaylight.protocol.bmp.parser.tlv; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType001TlvHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType001TlvHandler.java similarity index 97% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType001TlvHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType001TlvHandler.java index cad2c44d5e..db0a4e852f 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType001TlvHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType001TlvHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.tlv; +package org.opendaylight.protocol.bmp.parser.tlv; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType002TlvHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType002TlvHandler.java similarity index 97% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType002TlvHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType002TlvHandler.java index 6b556c3e02..06153f0ec6 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType002TlvHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType002TlvHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.tlv; +package org.opendaylight.protocol.bmp.parser.tlv; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType003TlvHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType003TlvHandler.java similarity index 97% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType003TlvHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType003TlvHandler.java index 27e65a6909..76db17f0ea 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType003TlvHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType003TlvHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.tlv; +package org.opendaylight.protocol.bmp.parser.tlv; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType004TlvHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType004TlvHandler.java similarity index 97% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType004TlvHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType004TlvHandler.java index 0aec63df81..dd791b8ea6 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType004TlvHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType004TlvHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.tlv; +package org.opendaylight.protocol.bmp.parser.tlv; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType005TlvHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType005TlvHandler.java similarity index 97% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType005TlvHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType005TlvHandler.java index 2fea80849d..24b70c2df1 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType005TlvHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType005TlvHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.tlv; +package org.opendaylight.protocol.bmp.parser.tlv; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType006TlvHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType006TlvHandler.java similarity index 97% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType006TlvHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType006TlvHandler.java index 3081f5e6ec..9d33a4aaac 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType006TlvHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType006TlvHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.tlv; +package org.opendaylight.protocol.bmp.parser.tlv; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType007TlvHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType007TlvHandler.java similarity index 97% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType007TlvHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType007TlvHandler.java index b8f7739307..edc6be1783 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType007TlvHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType007TlvHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.tlv; +package org.opendaylight.protocol.bmp.parser.tlv; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType008TlvHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType008TlvHandler.java similarity index 97% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType008TlvHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType008TlvHandler.java index 4a8ea4ac5a..75a6f5c44d 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType008TlvHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType008TlvHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.tlv; +package org.opendaylight.protocol.bmp.parser.tlv; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType009TlvHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType009TlvHandler.java similarity index 98% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType009TlvHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType009TlvHandler.java index 5623d0f87b..d352ffaa4e 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType009TlvHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType009TlvHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.tlv; +package org.opendaylight.protocol.bmp.parser.tlv; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType010TlvHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType010TlvHandler.java similarity index 98% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType010TlvHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType010TlvHandler.java index 2fff6cade2..59c12cbbd3 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType010TlvHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType010TlvHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.tlv; +package org.opendaylight.protocol.bmp.parser.tlv; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType011TlvHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType011TlvHandler.java similarity index 97% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType011TlvHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType011TlvHandler.java index 869dc9d56c..3848cbd114 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType011TlvHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType011TlvHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.tlv; +package org.opendaylight.protocol.bmp.parser.tlv; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType012TlvHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType012TlvHandler.java similarity index 97% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType012TlvHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType012TlvHandler.java index 61ec3eb1c7..0ec24e07ea 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType012TlvHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType012TlvHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.tlv; +package org.opendaylight.protocol.bmp.parser.tlv; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType013TlvHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType013TlvHandler.java similarity index 97% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType013TlvHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType013TlvHandler.java index 183e955f18..25a28c7a82 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StatType013TlvHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StatType013TlvHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.tlv; +package org.opendaylight.protocol.bmp.parser.tlv; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StringTlvHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StringTlvHandler.java similarity index 97% rename from bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StringTlvHandler.java rename to bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StringTlvHandler.java index d9a5e36d10..9bac3ec105 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/tlv/StringTlvHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/tlv/StringTlvHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.tlv; +package org.opendaylight.protocol.bmp.parser.tlv; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/bgp/bmp-impl/src/main/resources/META-INF/services/org.opendaylight.protocol.bmp.spi.registry.BmpExtensionProviderActivator b/bgp/bmp-parser-impl/src/main/resources/META-INF/services/org.opendaylight.protocol.bmp.spi.registry.BmpExtensionProviderActivator similarity index 86% rename from bgp/bmp-impl/src/main/resources/META-INF/services/org.opendaylight.protocol.bmp.spi.registry.BmpExtensionProviderActivator rename to bgp/bmp-parser-impl/src/main/resources/META-INF/services/org.opendaylight.protocol.bmp.spi.registry.BmpExtensionProviderActivator index 888ffe0367..ec2f25c2cd 100644 --- a/bgp/bmp-impl/src/main/resources/META-INF/services/org.opendaylight.protocol.bmp.spi.registry.BmpExtensionProviderActivator +++ b/bgp/bmp-parser-impl/src/main/resources/META-INF/services/org.opendaylight.protocol.bmp.spi.registry.BmpExtensionProviderActivator @@ -4,4 +4,4 @@ # under the terms of the Eclipse Public License v1.0 which # accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html -org.opendaylight.protocol.bmp.impl.BmpActivator +org.opendaylight.protocol.bmp.parser.BmpActivator diff --git a/bgp/bmp-parser-impl/src/main/resources/org/opendaylight/blueprint/bgp-bmp-parser-ext.xml b/bgp/bmp-parser-impl/src/main/resources/org/opendaylight/blueprint/bgp-bmp-parser-ext.xml new file mode 100644 index 0000000000..d09a9f2242 --- /dev/null +++ b/bgp/bmp-parser-impl/src/main/resources/org/opendaylight/blueprint/bgp-bmp-parser-ext.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/AbstractBmpMessageTest.java b/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/AbstractBmpMessageTest.java similarity index 93% rename from bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/AbstractBmpMessageTest.java rename to bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/AbstractBmpMessageTest.java index 1c188feb5d..a83d353381 100644 --- a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/AbstractBmpMessageTest.java +++ b/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/AbstractBmpMessageTest.java @@ -6,14 +6,14 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.message; +package org.opendaylight.protocol.bmp.parser.message; import org.junit.After; import org.junit.Before; import org.opendaylight.protocol.bgp.parser.impl.BGPActivator; import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext; import org.opendaylight.protocol.bgp.parser.spi.pojo.SimpleBGPExtensionProviderContext; -import org.opendaylight.protocol.bmp.impl.BmpActivator; +import org.opendaylight.protocol.bmp.parser.BmpActivator; import org.opendaylight.protocol.bmp.spi.registry.BmpMessageRegistry; import org.opendaylight.protocol.bmp.spi.registry.SimpleBmpExtensionProviderContext; diff --git a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/InitiationHandlerTest.java b/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/InitiationHandlerTest.java similarity index 96% rename from bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/InitiationHandlerTest.java rename to bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/InitiationHandlerTest.java index 5b17983700..057c425727 100644 --- a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/InitiationHandlerTest.java +++ b/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/InitiationHandlerTest.java @@ -6,11 +6,11 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.message; +package org.opendaylight.protocol.bmp.parser.message; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import static org.opendaylight.protocol.bmp.impl.test.TestUtil.createInitMsg; +import static org.opendaylight.protocol.bmp.parser.message.TestUtil.createInitMsg; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.junit.Test; diff --git a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/PeerDownHandlerTest.java b/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/PeerDownHandlerTest.java similarity index 96% rename from bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/PeerDownHandlerTest.java rename to bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/PeerDownHandlerTest.java index a20f7cef7a..2d8956dc8b 100644 --- a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/PeerDownHandlerTest.java +++ b/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/PeerDownHandlerTest.java @@ -5,13 +5,12 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.message; +package org.opendaylight.protocol.bmp.parser.message; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import static org.opendaylight.protocol.bmp.impl.test.TestUtil.createPeerDownFSM; -import static org.opendaylight.protocol.bmp.impl.test.TestUtil.createPeerDownNotification; - +import static org.opendaylight.protocol.bmp.parser.message.TestUtil.createPeerDownFSM; +import static org.opendaylight.protocol.bmp.parser.message.TestUtil.createPeerDownNotification; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.junit.Test; diff --git a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/PeerUpHandlerTest.java b/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/PeerUpHandlerTest.java similarity index 97% rename from bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/PeerUpHandlerTest.java rename to bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/PeerUpHandlerTest.java index 6a605c8f47..4e58639975 100644 --- a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/PeerUpHandlerTest.java +++ b/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/PeerUpHandlerTest.java @@ -5,12 +5,11 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.message; +package org.opendaylight.protocol.bmp.parser.message; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import static org.opendaylight.protocol.bmp.impl.test.TestUtil.createPeerUpNotification; - +import static org.opendaylight.protocol.bmp.parser.message.TestUtil.createPeerUpNotification; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.junit.Test; diff --git a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/RouteMonitoringMessageHandlerTest.java b/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/RouteMonitoringMessageHandlerTest.java similarity index 97% rename from bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/RouteMonitoringMessageHandlerTest.java rename to bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/RouteMonitoringMessageHandlerTest.java index a92d79a394..5fdb53ffd4 100644 --- a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/RouteMonitoringMessageHandlerTest.java +++ b/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/RouteMonitoringMessageHandlerTest.java @@ -6,12 +6,11 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.message; +package org.opendaylight.protocol.bmp.parser.message; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import static org.opendaylight.protocol.bmp.impl.test.TestUtil.createRouteMonitMsg; - +import static org.opendaylight.protocol.bmp.parser.message.TestUtil.createRouteMonitMsg; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.junit.Test; diff --git a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/StatisticsReportHandlerTest.java b/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/StatisticsReportHandlerTest.java similarity index 98% rename from bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/StatisticsReportHandlerTest.java rename to bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/StatisticsReportHandlerTest.java index 3ef2730daa..3a9c13d919 100644 --- a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/StatisticsReportHandlerTest.java +++ b/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/StatisticsReportHandlerTest.java @@ -5,12 +5,11 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.message; +package org.opendaylight.protocol.bmp.parser.message; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import static org.opendaylight.protocol.bmp.impl.test.TestUtil.createStatsReportMsg; - +import static org.opendaylight.protocol.bmp.parser.message.TestUtil.createStatsReportMsg; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.junit.Test; diff --git a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/TerminationHandlerTest.java b/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TerminationHandlerTest.java similarity index 94% rename from bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/TerminationHandlerTest.java rename to bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TerminationHandlerTest.java index 807a84eba7..37fbf65508 100644 --- a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/message/TerminationHandlerTest.java +++ b/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TerminationHandlerTest.java @@ -5,11 +5,11 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.message; +package org.opendaylight.protocol.bmp.parser.message; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import static org.opendaylight.protocol.bmp.impl.test.TestUtil.createTerminationMsg; +import static org.opendaylight.protocol.bmp.parser.message.TestUtil.createTerminationMsg; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.junit.Test; diff --git a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/test/TestUtil.java b/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java similarity index 99% rename from bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/test/TestUtil.java rename to bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java index 468954b8cd..e8616865d1 100644 --- a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/test/TestUtil.java +++ b/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bmp.impl.test; +package org.opendaylight.protocol.bmp.parser.message; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; diff --git a/bgp/bmp-spi/pom.xml b/bgp/bmp-spi/pom.xml index 3a72e33bf6..a8c1485719 100644 --- a/bgp/bmp-spi/pom.xml +++ b/bgp/bmp-spi/pom.xml @@ -126,10 +126,6 @@ - - org.opendaylight.yangtools - yang-maven-plugin - org.apache.felix maven-bundle-plugin diff --git a/bgp/bmp-spi/src/main/java/org/opendaylight/controller/config/yang/bmp/spi/SimpleBmpExtensionProviderContextModule.java b/bgp/bmp-spi/src/main/java/org/opendaylight/controller/config/yang/bmp/spi/SimpleBmpExtensionProviderContextModule.java deleted file mode 100644 index 796d6da37e..0000000000 --- a/bgp/bmp-spi/src/main/java/org/opendaylight/controller/config/yang/bmp/spi/SimpleBmpExtensionProviderContextModule.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.bmp.spi; - -import com.google.common.reflect.AbstractInvocationHandler; -import com.google.common.reflect.Reflection; -import java.lang.reflect.Method; -import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker; -import org.opendaylight.protocol.bmp.spi.registry.BmpExtensionProviderContext; -import org.osgi.framework.BundleContext; - -/** - * @deprecated Replaced by blueprint wiring - */ -@Deprecated -public class SimpleBmpExtensionProviderContextModule extends org.opendaylight.controller.config.yang.bmp.spi.AbstractSimpleBmpExtensionProviderContextModule { - private BundleContext bundleContext; - - public SimpleBmpExtensionProviderContextModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public SimpleBmpExtensionProviderContextModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.bmp.spi.SimpleBmpExtensionProviderContextModule oldModule, java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public void customValidation() { - // add custom validation form module attributes here. - } - - @Override - public AutoCloseable createInstance() { - final WaitingServiceTracker tracker = - WaitingServiceTracker.create(BmpExtensionProviderContext.class, bundleContext); - final BmpExtensionProviderContext service = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES); - - return Reflection.newProxy(AutoCloseableBmpExtensionProviderContext.class, new AbstractInvocationHandler() { - @Override - protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable { - if (method.getName().equals("close")) { - tracker.close(); - return null; - } else { - return method.invoke(service, args); - } - } - }); - } - - void setBundleContext(BundleContext bundleContext) { - this.bundleContext = bundleContext; - } - - private static interface AutoCloseableBmpExtensionProviderContext extends BmpExtensionProviderContext, AutoCloseable { - } -} diff --git a/bgp/bmp-spi/src/main/java/org/opendaylight/controller/config/yang/bmp/spi/SimpleBmpExtensionProviderContextModuleFactory.java b/bgp/bmp-spi/src/main/java/org/opendaylight/controller/config/yang/bmp/spi/SimpleBmpExtensionProviderContextModuleFactory.java deleted file mode 100644 index 3d0c70f0c7..0000000000 --- a/bgp/bmp-spi/src/main/java/org/opendaylight/controller/config/yang/bmp/spi/SimpleBmpExtensionProviderContextModuleFactory.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.bmp.spi; - -import org.opendaylight.controller.config.api.DependencyResolver; -import org.osgi.framework.BundleContext; - -/** - * @deprecated Replaced by blueprint wiring - */ -@Deprecated -public class SimpleBmpExtensionProviderContextModuleFactory extends AbstractSimpleBmpExtensionProviderContextModuleFactory { - @Override - public SimpleBmpExtensionProviderContextModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, - SimpleBmpExtensionProviderContextModule oldModule, AutoCloseable oldInstance, BundleContext bundleContext) { - SimpleBmpExtensionProviderContextModule module = super.instantiateModule(instanceName, dependencyResolver, oldModule, - oldInstance, bundleContext); - module.setBundleContext(bundleContext); - return module; - } - - @Override - public SimpleBmpExtensionProviderContextModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, - BundleContext bundleContext) { - SimpleBmpExtensionProviderContextModule module = super.instantiateModule(instanceName, dependencyResolver, bundleContext); - module.setBundleContext(bundleContext); - return module; - } -} diff --git a/bgp/bmp-spi/src/main/yang/odl-bmp-spi-cfg.yang b/bgp/bmp-spi/src/main/yang/odl-bmp-spi-cfg.yang deleted file mode 100644 index 9bac23cd59..0000000000 --- a/bgp/bmp-spi/src/main/yang/odl-bmp-spi-cfg.yang +++ /dev/null @@ -1,58 +0,0 @@ -// vi: set smarttab et sw=4 tabstop=4: -module odl-bmp-spi-cfg { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:bmp:spi"; - prefix "bmp-spi"; - - import config { prefix config; revision-date 2013-04-05; } - - organization "Cisco Systems, Inc."; - - contact "Milos Fabian "; - - description - "This module contains the base YANG definitions for - BMP SPI module. - - Copyright (c)2015 Cisco Systems, Inc. All rights reserved.; - - This program and the accompanying materials are made available - under the terms of the Eclipse Public License v1.0 which - accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html"; - - revision "2015-05-13" { - description - "Initial revision"; - } - - identity consumer-extensions { - description - "Service representing a BMP parser extension registry. Extension - consumers have this service injected."; - - base "config:service-type"; - config:java-class "org.opendaylight.protocol.bmp.spi.registry.BmpExtensionConsumerContext"; - } - - identity extensions { - description - "Service representing a BMP parser extension registry. Extension - providers have this service injected for registration."; - - base "consumer-extensions"; - config:java-class "org.opendaylight.protocol.bmp.spi.registry.BmpExtensionProviderContext"; - } - - identity bmp-extensions-impl { - base config:module-type; - config:provided-service extensions; - config:java-name-prefix SimpleBmpExtensionProviderContext; - } - - augment "/config:modules/config:module/config:configuration" { - case bmp-extensions-impl { - when "/config:modules/config:module/config:type = 'bmp-extensions-impl'"; - } - } -} \ No newline at end of file diff --git a/bgp/controller-config/src/main/resources/initial/32-bmp.xml b/bgp/controller-config/src/main/resources/initial/32-bmp.xml index 67c611b862..36cd2fb733 100644 --- a/bgp/controller-config/src/main/resources/initial/32-bmp.xml +++ b/bgp/controller-config/src/main/resources/initial/32-bmp.xml @@ -9,44 +9,19 @@ --> - urn:opendaylight:params:xml:ns:yang:controller:bmp:spi?module=odl-bmp-spi-cfg&revision=2015-05-13 urn:opendaylight:params:xml:ns:yang:controller:bmp:impl?module=odl-bmp-impl-cfg&revision=2015-05-18 - urn:opendaylight:params:xml:ns:yang:controller:netty?module=netty&revision=2013-11-19 - - prefix:bmp-extensions-impl - global-bmp-extensions - prefix:bmp-dispatcher-impl global-bmp-dispatcher - - bmp-spi:extensions - global-bmp-extensions - - - netty:netty-threadgroup - global-boss-group - - - netty:netty-threadgroup - global-worker-group - - - bmp-spi:extensions - - global-bmp-extensions - /modules/module[type='bmp-extensions-impl'][name='global-bmp-extensions'] - - prefix:bmp-dispatcher diff --git a/bgp/pom.xml b/bgp/pom.xml index 405dc44d11..f8cb8dfd88 100644 --- a/bgp/pom.xml +++ b/bgp/pom.xml @@ -51,6 +51,7 @@ bmp-spi bmp-impl bmp-mock + bmp-parser-impl controller-config openconfig-api openconfig-spi diff --git a/features/bmp/pom.xml b/features/bmp/pom.xml index 8a1e2c7424..0b66f34d2e 100644 --- a/features/bmp/pom.xml +++ b/features/bmp/pom.xml @@ -133,6 +133,10 @@ ${project.groupId} bgp-bmp-impl + + ${project.groupId} + bgp-bmp-parser-impl + ${project.groupId} data-change-counter-controller-config diff --git a/features/bmp/src/main/features/features.xml b/features/bmp/src/main/features/features.xml index 2bdb6ae9b5..6fbb097faa 100644 --- a/features/bmp/src/main/features/features.xml +++ b/features/bmp/src/main/features/features.xml @@ -30,6 +30,7 @@ odl-bgpcep-bgp-labeled-unicast mvn:org.opendaylight.bgpcep/bgp-bmp-api/{{VERSION}} mvn:org.opendaylight.bgpcep/bgp-bmp-spi/{{VERSION}} + mvn:org.opendaylight.bgpcep/bgp-bmp-parser-impl/{{VERSION}} mvn:org.opendaylight.bgpcep/bgp-bmp-impl/{{VERSION}} mvn:org.opendaylight.bgpcep/bgp-controller-config/{{VERSION}}/xml/config mvn:org.opendaylight.bgpcep/bgp-controller-config/{{VERSION}}/xml/bmp-config -- 2.36.6