From d2664a4f307a833e293b2dfbe44d9ab6579eef2d Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Thu, 13 Jul 2017 10:41:27 +0200 Subject: HONEYCOMB-369: configurable BGP peers BGP peer configuration is no longer read from bgp-peer.json file. Netconf/Restconf is can be used instead. BGP peer configuration in HC follows openconfig-extensions model (as in ODL BGP): * http://docs.opendaylight.org/en/stable-boron/user-guide/bgp-user-guide.html#bgp-peering * http://docs.opendaylight.org/en/stable-boron/user-guide/bgp-user-guide.html#bgp-application-peer-and-programmable-rib Change-Id: I91aa6c4fc0923edbacf6cd10abd3957569a4f8c6 Signed-off-by: Marek Gradzki (cherry picked from commit a3d562afdd96d4c37fe608af99f364e879ee92b6) --- .../src/main/java/io/fd/honeycomb/infra/bgp/BgpModule.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpModule.java') diff --git a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpModule.java b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpModule.java index dd6449d0d..3cab508b4 100644 --- a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpModule.java +++ b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpModule.java @@ -31,13 +31,8 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; 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; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,16 +49,9 @@ public final class BgpModule extends PrivateModule { configureRIB(); - // Configure peer registry - bind(BGPOpenConfigMappingService.class).toInstance(new BGPOpenConfigMappingServiceImpl()); - bind(BGPPeerRegistry.class).toInstance(StrictBGPPeerRegistry.instance()); - // Create BGP server instance (initialize eagerly to start BGP) bind(BgpServerProvider.BgpServer.class).toProvider(BgpServerProvider.class).asEagerSingleton(); - // Initialize BgpNeighbours (initialize eagerly to start BGP neighbours) - bind(BgpNeighbors.class).toProvider(BgpNeighboursProvider.class).asEagerSingleton(); - // Listens for local RIB modifications and passes routes to translation layer // (initialize eagerly to configure RouteWriters) bind(RibWriter.class).toProvider(LocRibWriterProvider.class).asEagerSingleton(); @@ -96,5 +84,6 @@ public final class BgpModule extends PrivateModule { // Create RIB instance bind(RIB.class).toProvider(BgpRIBProvider.class).in(Singleton.class); + expose(RIB.class); } } -- cgit 1.2.3-korg