1 files changed, 8 insertions, 1 deletions
diff --git a/infra/bgp-distribution/src/main/java/io/fd/honeycomb/infra/bgp/BgpModule.java b/infra/bgp-distribution/src/main/java/io/fd/honeycomb/infra/bgp/BgpModule.java
index 128e9f0de..efef5a71f 100644
--- a/infra/bgp-distribution/src/main/java/io/fd/honeycomb/infra/bgp/BgpModule.java
+++ b/infra/bgp-distribution/src/main/java/io/fd/honeycomb/infra/bgp/BgpModule.java
@@ -32,9 +32,11 @@ import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore;
 import org.opendaylight.protocol.bgp.openconfig.impl.BGPOpenConfigMappingServiceImpl;
 import org.opendaylight.protocol.bgp.openconfig.spi.BGPOpenConfigMappingService;
+import org.opendaylight.protocol.bgp.rib.impl.StrictBGPPeerRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPDispatcher;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.spi.RIB;
+import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.BgpNeighbors;
 
 public final class BgpModule extends PrivateModule {
 
@@ -49,11 +51,16 @@ public final class BgpModule extends PrivateModule {
 
         // Configure peer registry
         bind(BGPOpenConfigMappingService.class).toInstance(new BGPOpenConfigMappingServiceImpl());
-        bind(BGPPeerRegistry.class).toProvider(BGPPeerRegistryProvider.class);
+        bind(BGPPeerRegistry.class).toInstance(StrictBGPPeerRegistry.instance());
+
 
         // Create BGP server instance
         bind(BgpServerProvider.BgpServer.class).toProvider(BgpServerProvider.class).in(Singleton.class);
         expose(BgpServerProvider.BgpServer.class);
+
+        // Initialize BgpNeighbours
+        bind(BgpNeighbors.class).toProvider(BgpNeighboursProvider.class).in(Singleton.class);
+        expose(BgpNeighbors.class);
     }
 
     private void configureRIB() {