diff options
author | Marek Gradzki <mgradzki@cisco.com> | 2017-07-06 12:55:17 +0200 |
---|---|---|
committer | Marek Gradzki <mgradzki@cisco.com> | 2017-07-06 13:27:18 +0200 |
commit | 76ec4e831b2653426d8bc434dabe145d97efcc2a (patch) | |
tree | 77ed1404294299f666f65fb17bdab4bd8575da14 /infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpModule.java | |
parent | 299296e6ff842a1c275a67a07f2f3e09852c1959 (diff) |
HONEYCOMB-377: remove enabled flag for bgp
Use module configuration to enable/disabe BGP.
Also hides BgpExtensionModule module to the user
(until HONEYCOMB-363 is fixed).
Change-Id: I8294d080138a0bcf640420484b76c089aa332d93
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpModule.java')
-rw-r--r-- | infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpModule.java | 17 |
1 files changed, 6 insertions, 11 deletions
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 32c4440e0..dd6449d0d 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 @@ -19,12 +19,12 @@ package io.fd.honeycomb.infra.bgp; import static io.fd.honeycomb.infra.distro.data.InmemoryDOMDataBrokerProvider.CONFIG; import static io.fd.honeycomb.infra.distro.data.InmemoryDOMDataBrokerProvider.OPERATIONAL; +import com.google.inject.PrivateModule; import com.google.inject.Singleton; import com.google.inject.name.Names; import io.fd.honeycomb.infra.distro.data.BindingDataBrokerProvider; import io.fd.honeycomb.infra.distro.data.DataStoreProvider; import io.fd.honeycomb.infra.distro.data.InmemoryDOMDataBrokerProvider; -import io.fd.honeycomb.northbound.NorthboundPrivateModule; import io.fd.honeycomb.translate.bgp.RibWriter; import io.netty.channel.EventLoopGroup; import org.opendaylight.controller.md.sal.binding.api.DataBroker; @@ -41,22 +41,13 @@ import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.BgpNe import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public final class BgpModule extends NorthboundPrivateModule<BgpConfiguration> { +public final class BgpModule extends PrivateModule { private static final Logger LOG = LoggerFactory.getLogger(BgpModule.class); static final String HONEYCOMB_BGP = "honeycomb-bgp"; - public BgpModule() { - super(new BgpConfigurationModule(), BgpConfiguration.class); - } - protected void configure() { - if (!getConfiguration().isBgpEnabled()) { - LOG.debug("BGP disabled. Skipping initialization"); - return; - } LOG.debug("Initializing BgpModule"); - install(getConfigurationModule()); // Create BGPDispatcher BGPDispatcher for creating BGP clients bind(EventLoopGroup.class).toProvider(BgpNettyThreadGroupProvider.class).in(Singleton.class); bind(BGPDispatcher.class).toProvider(BGPDispatcherImplProvider.class).in(Singleton.class); @@ -77,6 +68,10 @@ public final class BgpModule extends NorthboundPrivateModule<BgpConfiguration> { // (initialize eagerly to configure RouteWriters) bind(RibWriter.class).toProvider(LocRibWriterProvider.class).asEagerSingleton(); expose(RibWriter.class); + + // install other BGP modules (hidden from HC user): + install(new BgpConfigurationModule()); + install(new BgpExtensionsModule()); } private void configureRIB() { |