Bug 6331 - BMP does not show routes

Wapped BGP messages are not serialized, because the
BGP codecs activator is not initiated.
Make sure the activator is started before BMP activator
is initiated.

Change-Id: I29d7893342d89d53470da07a2986e8bb9ed700c1
Signed-off-by: Milos Fabian <milfabia@cisco.com>
(cherry picked from commit 3dae73b0df2a6d08ba2f10483afc438972300937)

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 2000a3fe8f6da99077588e3f7e9776067b1442ae..19d6a3c29e0c3b668174bb796efd61544eb3ef7f 100644 (file)
--- 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
@@ -12,7 +12,9 @@ import com.google.common.net.InetAddresses;
 import io.netty.channel.Channel;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
-import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
+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.api.BmpSession;
 import org.opendaylight.protocol.bmp.api.BmpSessionFactory;
 import org.opendaylight.protocol.bmp.api.BmpSessionListenerFactory;
@@ -48,9 +50,11 @@ public final class BmpMock {
 
 
     private static BmpMockDispatcher initiateMock(final BmpMockArguments arguments) {
+        final BGPExtensionProviderContext bgpCtx = new SimpleBGPExtensionProviderContext();
+        final BGPActivator bgpActivator = new BGPActivator();
+        bgpActivator.start(bgpCtx);
         final BmpExtensionProviderContext ctx = new SimpleBmpExtensionProviderContext();
-        final BmpExtensionProviderActivator bmpActivator = new BmpActivator(
-            ServiceLoaderBGPExtensionProviderContext.getSingletonInstance());
+        final BmpExtensionProviderActivator bmpActivator = new BmpActivator(bgpCtx);
         bmpActivator.start(ctx);
 
         return new BmpMockDispatcher(ctx.getBmpMessageRegistry(),