HONEYCOMB-355: move BGP to separate distribution

Given current YangBindingProviderModule implementation (HONEYCOMB-358),
needed to preserve footprint of minimal distro.

The change also:
- reverts logger&persistence config changes
introduced by https://gerrit.fd.io/r/#/c/5972/
- improves logging for BGP component initialization

Change-Id: Ie223833518be21628edb7ace36c7618e427585e0
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

21 files changed, 26 insertions, 1098 deletions

diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/Main.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/Main.java
index fc8fb0e0c..4769b570d 100644
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/Main.java
+++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/Main.java
@@ -31,7 +31,6 @@ import com.google.inject.ProvisionException;
 import com.google.inject.name.Names;
 import io.fd.honeycomb.data.init.DataTreeInitializer;
 import io.fd.honeycomb.data.init.InitializerRegistry;
-import io.fd.honeycomb.infra.distro.bgp.BgpServerProvider;
 import io.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration;
 import io.fd.honeycomb.infra.distro.initializer.InitializerPipelineModule;
 import io.fd.honeycomb.infra.distro.netconf.HoneycombNotification2NetconfProvider;
@@ -120,11 +119,6 @@ public final class Main {
                 injector.getInstance(HoneycombNotification2NetconfProvider.HoneycombNotification2Netconf.class);
             }
 
-            if (cfgAttributes.isBgpEnabled()) {
-                LOG.info("Starting BGP");
-                injector.getInstance(BgpServerProvider.BgpServer.class);
-            }
-
             try {
                 LOG.info("Initializing configuration");
                 injector.getInstance(Key.get(InitializerRegistry.class,
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BGPDispatcherImplProvider.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BGPDispatcherImplProvider.java
deleted file mode 100644
index 1de26c4f0..000000000
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BGPDispatcherImplProvider.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.honeycomb.infra.distro.bgp;
-
-import com.google.inject.Inject;
-import io.fd.honeycomb.infra.distro.ProviderTrait;
-import io.netty.channel.EventLoopGroup;
-import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionConsumerContext;
-import org.opendaylight.protocol.bgp.rib.impl.BGPDispatcherImpl;
-import org.opendaylight.protocol.bgp.rib.impl.spi.BGPDispatcher;
-
-final class BGPDispatcherImplProvider extends ProviderTrait<BGPDispatcher> {
-    @Inject
-    private BGPExtensionConsumerContext consumerContext;
-    @Inject
-    private EventLoopGroup threadGroup;
-
-    @Override
-    protected BGPDispatcher create() {
-        return new BGPDispatcherImpl(consumerContext.getMessageRegistry(), threadGroup, threadGroup);
-    }
-}
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BGPExtensionConsumerContextProvider.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BGPExtensionConsumerContextProvider.java
deleted file mode 100644
index c57440d26..000000000
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BGPExtensionConsumerContextProvider.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2017 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.honeycomb.infra.distro.bgp;
-
-import com.google.inject.Inject;
-import io.fd.honeycomb.infra.distro.ProviderTrait;
-import java.util.ArrayList;
-import java.util.Set;
-import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionConsumerContext;
-import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderActivator;
-import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext;
-import org.opendaylight.protocol.bgp.parser.spi.pojo.SimpleBGPExtensionProviderContext;
-import org.opendaylight.protocol.bgp.parser.spi.pojo.SimpleBGPExtensionProviderContextActivator;
-
-final class BGPExtensionConsumerContextProvider extends ProviderTrait<BGPExtensionConsumerContext> {
-    @Inject
-    private Set<BGPExtensionProviderActivator> activators;
-
-    @Override
-    protected BGPExtensionConsumerContext create() {
-        final BGPExtensionProviderContext ctx = new SimpleBGPExtensionProviderContext();
-        final SimpleBGPExtensionProviderContextActivator activator =
-            new SimpleBGPExtensionProviderContextActivator(ctx, new ArrayList<>(activators));
-        activator.start();
-        return ctx;
-    }
-}
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BGPPeerRegistryProvider.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BGPPeerRegistryProvider.java
deleted file mode 100644
index 611656a75..000000000
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BGPPeerRegistryProvider.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2017 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.honeycomb.infra.distro.bgp;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static io.fd.honeycomb.translate.util.JsonUtils.readContainerEntryJson;
-import static org.opendaylight.protocol.bgp.openconfig.impl.util.OpenConfigUtil.APPLICATION_PEER_GROUP_NAME;
-import static org.opendaylight.yangtools.sal.binding.generator.impl.BindingSchemaContextUtils.findDataNodeContainer;
-
-import com.google.common.base.Optional;
-import com.google.inject.Inject;
-import io.fd.honeycomb.infra.distro.ProviderTrait;
-import java.io.InputStream;
-import java.util.Map;
-import javax.annotation.Nonnull;
-import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec;
-import org.opendaylight.controller.sal.core.api.model.SchemaService;
-import org.opendaylight.protocol.bgp.openconfig.spi.BGPOpenConfigMappingService;
-import org.opendaylight.protocol.bgp.rib.impl.StrictBGPPeerRegistry;
-import org.opendaylight.protocol.bgp.rib.impl.config.AppPeer;
-import org.opendaylight.protocol.bgp.rib.impl.config.BgpPeer;
-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.BgpNeighborPeerGroupConfig;
-import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbors.Neighbor;
-import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.Bgp;
-import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.bgp.Neighbors;
-import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.NetworkInstances;
-import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.network.instances.NetworkInstance;
-import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.network.instances.NetworkInstanceKey;
-import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.network.instances.network.instance.Protocols;
-import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.network.instances.network.instance.protocols.Protocol;
-import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.network.instances.network.instance.protocols.ProtocolKey;
-import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.policy.types.rev151009.BGP;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev160614.Config2;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev160614.Protocol1;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.model.api.SchemaNode;
-
-final class BGPPeerRegistryProvider extends ProviderTrait<BGPPeerRegistry> {
-    private static final String PEERS_CFG = "/bgp-peers.json";
-    @Inject
-    private BindingToNormalizedNodeCodec codec;
-    @Inject
-    private RIB globalRib;
-    @Inject
-    private BGPOpenConfigMappingService mappingService;
-    @Inject
-    private SchemaService schemaService;
-
-    @Override
-    protected BGPPeerRegistry create() {
-        final BGPPeerRegistry peerRegistry = StrictBGPPeerRegistry.instance();
-        final Neighbors neighbors = readNeighbours();
-        for (final Neighbor neighbor : neighbors.getNeighbor()) {
-            if (isApplicationPeer(neighbor)) {
-                new AppPeer().start(globalRib, neighbor, mappingService, null);
-            } else {
-                new BgpPeer(null, peerRegistry).start(globalRib, neighbor, mappingService, null);
-            }
-        }
-        return peerRegistry;
-    }
-
-    private Neighbors readNeighbours() {
-        final InputStream resourceStream = this.getClass().getResourceAsStream(PEERS_CFG);
-        checkState(resourceStream != null, "Resource %s not found", PEERS_CFG);
-
-        final InstanceIdentifier<Bgp> bgpII = InstanceIdentifier.create(NetworkInstances.class)
-            .child(NetworkInstance.class, new NetworkInstanceKey("dummy-value")).child(Protocols.class)
-            .child(Protocol.class, new ProtocolKey(BGP.class, "dummy-value")).augmentation(Protocol1.class)
-            .child(Bgp.class);
-        final InstanceIdentifier<Neighbors> neighborsII = bgpII.child(Neighbors.class);
-
-        final YangInstanceIdentifier neighborsYII = codec.toYangInstanceIdentifier(neighborsII);
-        final SchemaContext schemaContext = schemaService.getGlobalContext();
-        final Optional<DataNodeContainer> parentNode = findDataNodeContainer(schemaContext, bgpII);
-        final ContainerNode parentContainer = readContainerEntryJson(schemaContext, resourceStream,
-            (SchemaNode) parentNode.get(),
-            (YangInstanceIdentifier.NodeIdentifier) neighborsYII.getLastPathArgument());
-        final NormalizedNode<?, ?> neighborsContainer = parentContainer.getValue().iterator().next();
-
-        final Map.Entry<InstanceIdentifier<?>, DataObject> entry = codec.fromNormalizedNode(neighborsYII, neighborsContainer);
-        checkNotNull(entry, "Failed to deserialize neighbours configuration at %s", PEERS_CFG);
-        return (Neighbors) entry.getValue();
-    }
-
-    private static boolean isApplicationPeer(@Nonnull final Neighbor neighbor) {
-        return java.util.Optional.of(neighbor.getConfig())
-            .map(config -> config.getAugmentation(Config2.class))
-            .map(BgpNeighborPeerGroupConfig::getPeerGroup)
-            .map(APPLICATION_PEER_GROUP_NAME::equals)
-            .orElse(false);
-    }
-}
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpExtensionsModule.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpExtensionsModule.java
deleted file mode 100644
index 19402248c..000000000
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpExtensionsModule.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2017 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.honeycomb.infra.distro.bgp;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.multibindings.Multibinder;
-import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionConsumerContext;
-import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderActivator;
-import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionConsumerContext;
-import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderActivator;
-
-/**
- * Registers BGP extensions provided by ODL implementation.
- * TODO add support for flowspec (requires some special initialization)
- */
-public final class BgpExtensionsModule extends AbstractModule {
-
-    protected void configure() {
-        // This should be part of BgpModule, but that one is Private and Multibinders + private BASE_MODULES
-        // do not work together, that's why there's a dedicated module here
-        // https://github.com/google/guice/issues/906
-        configureRIBExtensions();
-        configureBGPExtensions();
-    }
-
-    private void configureRIBExtensions() {
-        final Multibinder<RIBExtensionProviderActivator> ribExtensionBinder = Multibinder.newSetBinder(binder(),
-            RIBExtensionProviderActivator.class);
-        ribExtensionBinder.addBinding().to(org.opendaylight.protocol.bgp.evpn.impl.RIBActivator.class);
-        ribExtensionBinder.addBinding().to(org.opendaylight.protocol.bgp.inet.RIBActivator.class);
-        ribExtensionBinder.addBinding().to(org.opendaylight.protocol.bgp.labeled.unicast.RIBActivator.class);
-        ribExtensionBinder.addBinding().to(org.opendaylight.protocol.bgp.linkstate.impl.RIBActivator.class);
-        ribExtensionBinder.addBinding().to(org.opendaylight.protocol.bgp.l3vpn.ipv4.RibIpv4Activator.class);
-        ribExtensionBinder.addBinding().to(org.opendaylight.protocol.bgp.l3vpn.ipv6.RibIpv6Activator.class);
-        bind(RIBExtensionConsumerContext.class).toProvider(RIBExtensionConsumerContextProvider.class);
-    }
-
-    private void configureBGPExtensions() {
-        final Multibinder<BGPExtensionProviderActivator> bgpExtensionBinder = Multibinder.newSetBinder(binder(),
-            BGPExtensionProviderActivator.class);
-        bgpExtensionBinder.addBinding().to(org.opendaylight.protocol.bgp.parser.impl.BGPActivator.class);
-        bgpExtensionBinder.addBinding().to(org.opendaylight.protocol.bgp.evpn.impl.BGPActivator.class);
-        bgpExtensionBinder.addBinding().to(org.opendaylight.protocol.bgp.inet.BGPActivator.class);
-        bgpExtensionBinder.addBinding().to(org.opendaylight.protocol.bgp.labeled.unicast.BGPActivator.class);
-        bgpExtensionBinder.addBinding().to(org.opendaylight.protocol.bgp.linkstate.impl.BGPActivator.class);
-        bgpExtensionBinder.addBinding().to(org.opendaylight.protocol.bgp.l3vpn.ipv4.BgpIpv4Activator.class);
-        bgpExtensionBinder.addBinding().to(org.opendaylight.protocol.bgp.l3vpn.ipv6.BgpIpv6Activator.class);
-        bind(BGPExtensionConsumerContext.class).toProvider(BGPExtensionConsumerContextProvider.class);
-    }
-}
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpModule.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpModule.java
deleted file mode 100644
index ca6b065b0..000000000
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpModule.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2017 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.honeycomb.infra.distro.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.netty.channel.EventLoopGroup;
-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.spi.BGPDispatcher;
-import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry;
-import org.opendaylight.protocol.bgp.rib.impl.spi.RIB;
-
-public final class BgpModule extends PrivateModule {
-
-    static final String HONEYCOMB_BGP = "honeycomb-bgp";
-
-    protected void configure() {
-        // 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);
-
-        configureRIB();
-
-        // Configure peer registry
-        bind(BGPOpenConfigMappingService.class).toInstance(new BGPOpenConfigMappingServiceImpl());
-        bind(BGPPeerRegistry.class).toProvider(BGPPeerRegistryProvider.class);
-
-        // Create BGP server instance
-        bind(BgpServerProvider.BgpServer.class).toProvider(BgpServerProvider.class).in(Singleton.class);
-        expose(BgpServerProvider.BgpServer.class);
-    }
-
-    private void configureRIB() {
-        // Create inmemory config data store for HONEYCOMB_BGP
-        bind(InMemoryDOMDataStore.class).annotatedWith(Names.named(CONFIG))
-            .toProvider(new DataStoreProvider(CONFIG, LogicalDatastoreType.CONFIGURATION))
-            .in(Singleton.class);
-
-        // Create inmemory operational data store for HONEYCOMB_BGP
-        bind(InMemoryDOMDataStore.class).annotatedWith(Names.named(OPERATIONAL))
-            .toProvider(new DataStoreProvider(OPERATIONAL, LogicalDatastoreType.OPERATIONAL))
-            .in(Singleton.class);
-
-        // Wrap datastores as DOMDataBroker
-        // TODO make executor service configurable
-        bind(DOMDataBroker.class).toProvider(InmemoryDOMDataBrokerProvider.class).in(Singleton.class);
-
-        // Wrap DOMDataBroker as BA data broker (required by BgpReaderFactoryProvider)
-        bind(DataBroker.class).annotatedWith(Names.named(HONEYCOMB_BGP)).toProvider(BindingDataBrokerProvider.class)
-            .in(Singleton.class);
-        expose(DataBroker.class).annotatedWith(Names.named(HONEYCOMB_BGP));
-
-        // Create RIB instance
-        bind(RIB.class).toProvider(BgpRIBProvider.class).in(Singleton.class);
-    }
-}
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpNettyThreadGroupProvider.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpNettyThreadGroupProvider.java
deleted file mode 100644
index b4ac322b2..000000000
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpNettyThreadGroupProvider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.honeycomb.infra.distro.bgp;
-
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import com.google.inject.Inject;
-import io.fd.honeycomb.infra.distro.ProviderTrait;
-import io.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration;
-import io.netty.channel.nio.NioEventLoopGroup;
-
-final class BgpNettyThreadGroupProvider extends ProviderTrait<NioEventLoopGroup> {
-
-    @Inject
-    private HoneycombConfiguration cfgAttributes;
-
-    @Override
-    protected NioEventLoopGroup create() {
-        return new NioEventLoopGroup(cfgAttributes.bgpNettyThreads,
-                new ThreadFactoryBuilder().setNameFormat("bgp-netty-%d").build());
-    }
-}
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpRIBProvider.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpRIBProvider.java
deleted file mode 100644
index f161e952c..000000000
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpRIBProvider.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2017 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.honeycomb.infra.distro.bgp;
-
-import com.google.common.collect.ImmutableList;
-import com.google.inject.Inject;
-import io.fd.honeycomb.infra.distro.ProviderTrait;
-import io.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
-import org.opendaylight.controller.md.sal.dom.broker.impl.PingPongDataBroker;
-import org.opendaylight.controller.sal.core.api.model.SchemaService;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration;
-import org.opendaylight.protocol.bgp.mode.api.PathSelectionMode;
-import org.opendaylight.protocol.bgp.openconfig.spi.BGPOpenConfigMappingService;
-import org.opendaylight.protocol.bgp.rib.impl.RIBImpl;
-import org.opendaylight.protocol.bgp.rib.impl.spi.BGPDispatcher;
-import org.opendaylight.protocol.bgp.rib.impl.spi.RIB;
-import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionConsumerContext;
-import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.multiprotocol.rev151009.bgp.common.afi.safi.list.AfiSafi;
-import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.multiprotocol.rev151009.bgp.common.afi.safi.list.AfiSafiBuilder;
-import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV4UNICAST;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev160614.AfiSafi2;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev160614.AfiSafi2Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.RibId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.TablesKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.BgpId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.ClusterIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-final class BgpRIBProvider extends ProviderTrait<RIB> {
-
-    private static final String HC_BGP_INSTANCE_NAME = "hc-bgp-instance";
-
-    @Inject
-    private HoneycombConfiguration cfg;
-    @Inject
-    private RIBExtensionConsumerContext extensions;
-    @Inject
-    private BGPDispatcher dispatcher;
-    @Inject
-    private BindingToNormalizedNodeCodec codec;
-    @Inject
-    private DOMDataBroker domBroker;
-    @Inject
-    private BGPOpenConfigMappingService mappingService;
-    @Inject
-    private SchemaService schemaService;
-
-    @Override
-    protected RIB create() {
-        final AsNumber asNumber = new AsNumber(cfg.bgpAsNumber.get().longValue());
-        final Ipv4Address routerId = new Ipv4Address(cfg.bgpBindingAddress.get());
-        final ClusterIdentifier clusterId = new ClusterIdentifier(routerId);
-        // TODO configure other BGP Multiprotocol extensions:
-        final List<AfiSafi> afiSafi = ImmutableList.of(new AfiSafiBuilder().setAfiSafiName(IPV4UNICAST.class)
-            .addAugmentation(AfiSafi2.class,
-                new AfiSafi2Builder().setReceive(cfg.isBgpMultiplePathsEnabled())
-                    .setSendMax(cfg.bgpSendMaxMaths.get().shortValue()).build())
-            .build());
-        final Map<TablesKey, PathSelectionMode> pathSelectionModes = mappingService.toPathSelectionMode(afiSafi)
-            .entrySet().stream().collect(Collectors.toMap(entry ->
-                new TablesKey(entry.getKey().getAfi(), entry.getKey().getSafi()), Map.Entry::getValue));
-        // based on RIBImpl.createRib
-        final RIBImpl rib =
-            new RIBImpl(new NoopClusterSingletonServiceProvider(), new RibId(HC_BGP_INSTANCE_NAME), asNumber,
-            new BgpId(routerId), clusterId, extensions, dispatcher, codec, new PingPongDataBroker(domBroker),
-            mappingService.toTableTypes(afiSafi), pathSelectionModes, extensions.getClassLoadingStrategy(), null);
-
-        // required for proper RIB's CodecRegistry initialization (based on RIBImpl.start)
-        schemaService.registerSchemaContextListener(rib);
-        return rib;
-    }
-
-    /**
-     * HC does not support clustering, but BGP uses {@link ClusterSingletonServiceProvider}
-     * to initialize {@link RIBImpl}. Therefore we provide this dummy implementation.
-     */
-    private static final class NoopClusterSingletonServiceProvider implements ClusterSingletonServiceProvider {
-        private static final Logger LOG = LoggerFactory.getLogger(NoopClusterSingletonServiceProvider.class);
-
-        private static final ClusterSingletonServiceRegistration REGISTRATION =
-            () -> LOG.debug("Closing ClusterSingletonServiceRegistration");
-
-        @Override
-        public ClusterSingletonServiceRegistration registerClusterSingletonService(
-            final ClusterSingletonService clusterSingletonService) {
-            clusterSingletonService.instantiateServiceInstance();
-            return REGISTRATION;
-        }
-
-        @Override
-        public void close() throws Exception {
-            LOG.debug("Closing NoopClusterSingletonServiceProvider");
-        }
-    }
-}
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpReaderFactoryProvider.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpReaderFactoryProvider.java
deleted file mode 100644
index 2e8ef8ff3..000000000
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpReaderFactoryProvider.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2017 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.honeycomb.infra.distro.bgp;
-
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
-import io.fd.honeycomb.infra.distro.ProviderTrait;
-import io.fd.honeycomb.translate.read.ReaderFactory;
-import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder;
-import io.fd.honeycomb.translate.util.read.BindingBrokerReader;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.BgpRib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.BgpRibBuilder;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-final class BgpReaderFactoryProvider extends ProviderTrait<ReaderFactory> {
-
-    @Inject
-    @Named(BgpModule.HONEYCOMB_BGP)
-    private DataBroker bgpDataBroker;
-
-    @Override
-    protected BgpReaderFactory create() {
-        return new BgpReaderFactory(bgpDataBroker);
-    }
-
-    /**
-     * {@link ReaderFactory} provides reader form BGP's dedicated data store.
-     * Makes BGP operational data available over NETCONF/RESTCONF.
-     */
-    private static final class BgpReaderFactory implements ReaderFactory {
-
-        private final DataBroker bgpDataBroker;
-
-        BgpReaderFactory(final DataBroker bgpDataBroker) {
-            this.bgpDataBroker = bgpDataBroker;
-        }
-
-        @Override
-        public void init(final ModifiableReaderRegistryBuilder registry) {
-            registry.add(new BindingBrokerReader<>(InstanceIdentifier.create(BgpRib.class),
-                bgpDataBroker, LogicalDatastoreType.OPERATIONAL, BgpRibBuilder.class));
-        }
-    }
-}
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpReadersModule.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpReadersModule.java
deleted file mode 100644
index b61cf37a0..000000000
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpReadersModule.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2017 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.honeycomb.infra.distro.bgp;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Singleton;
-import com.google.inject.multibindings.Multibinder;
-import io.fd.honeycomb.translate.read.ReaderFactory;
-
-public class BgpReadersModule extends AbstractModule {
-
-    protected void configure() {
-        // This should be part of BgpModule, but that one is Private and Multibinders + private BASE_MODULES
-        // do not work together, that's why there's a dedicated module here
-        // https://github.com/google/guice/issues/906
-        final Multibinder<ReaderFactory> binder = Multibinder.newSetBinder(binder(), ReaderFactory.class);
-        binder.addBinding().toProvider(BgpReaderFactoryProvider.class).in(Singleton.class);
-    }
-}
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpServerProvider.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpServerProvider.java
deleted file mode 100644
index 4ade07fc1..000000000
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpServerProvider.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2017 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.honeycomb.infra.distro.bgp;
-
-import com.google.common.base.Preconditions;
-import com.google.inject.Inject;
-import io.fd.honeycomb.infra.distro.ProviderTrait;
-import io.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelConfig;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.epoll.Epoll;
-import io.netty.channel.epoll.EpollChannelOption;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
-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.BGPSessionPreferences;
-import org.opendaylight.protocol.bgp.rib.impl.spi.PeerRegistryListener;
-import org.opendaylight.protocol.concepts.KeyMapping;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
-
-public final class BgpServerProvider  extends ProviderTrait<BgpServerProvider.BgpServer> {
-    @Inject
-    private HoneycombConfiguration cfg;
-    @Inject
-    private BGPPeerRegistry peerRegistry;
-    @Inject
-    private BGPDispatcher dispatcher;
-
-    @Override
-    protected BgpServer create() {
-        // code based on org.opendaylight.controller.config.yang.bgp.rib.impl.BGPPeerAcceptorModule from Boron-SR3
-        final InetAddress bindingAddress;
-        try {
-            bindingAddress = InetAddress.getByName(cfg.bgpBindingAddress.get());
-        } catch (UnknownHostException e) {
-            throw new IllegalArgumentException("Illegal BGP binding address", e);
-        }
-        final InetSocketAddress address = new InetSocketAddress(bindingAddress, cfg.bgpPort.get());
-        final ChannelFuture localServer = dispatcher.createServer(peerRegistry, address);
-        localServer.addListener(future -> {
-            Preconditions.checkArgument(future.isSuccess(), "Unable to start bgp server on %s", address, future.cause());
-            final Channel channel = localServer.channel();
-            if (Epoll.isAvailable()) {
-                peerRegistry.registerPeerRegisterListener(new PeerRegistryListenerImpl(channel.config()));
-            }
-        });
-        return new BgpServer(localServer);
-    }
-
-    public static final class BgpServer {
-        private ChannelFuture localServer;
-
-        BgpServer(final ChannelFuture localServer) {
-            this.localServer = localServer;
-        }
-
-        public ChannelFuture getLocalServer() {
-            return localServer;
-        }
-    }
-
-    private static final class PeerRegistryListenerImpl implements PeerRegistryListener {
-        private final ChannelConfig channelConfig;
-        private final KeyMapping keys;
-
-        PeerRegistryListenerImpl(final ChannelConfig channelConfig) {
-            this.channelConfig = channelConfig;
-            this.keys = KeyMapping.getKeyMapping();
-        }
-        @Override
-        public void onPeerAdded(final IpAddress ip, final BGPSessionPreferences prefs) {
-            if (prefs.getMd5Password().isPresent()) {
-                this.keys.put(IetfInetUtil.INSTANCE.inetAddressFor(ip), prefs.getMd5Password().get());
-                this.channelConfig.setOption(EpollChannelOption.TCP_MD5SIG, this.keys);
-            }
-        }
-        @Override
-        public void onPeerRemoved(final IpAddress ip) {
-            if (this.keys.remove(IetfInetUtil.INSTANCE.inetAddressFor(ip)) != null) {
-                this.channelConfig.setOption(EpollChannelOption.TCP_MD5SIG, this.keys);
-            }
-        }
-    }
-}
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpWriterFactoryProvider.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpWriterFactoryProvider.java
deleted file mode 100644
index 0441ec080..000000000
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpWriterFactoryProvider.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2017 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.honeycomb.infra.distro.bgp;
-
-import com.google.common.collect.Sets;
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
-import io.fd.honeycomb.infra.distro.ProviderTrait;
-import io.fd.honeycomb.translate.util.write.BindingBrokerWriter;
-import io.fd.honeycomb.translate.write.WriterFactory;
-import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.ipv4.routes.Ipv4Routes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.ipv4.routes.ipv4.routes.Ipv4Route;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.Attributes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.LocalPref;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.Origin;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.ApplicationRib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.Tables;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.ipv4.next.hop._case.Ipv4NextHop;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-final class BgpWriterFactoryProvider extends ProviderTrait<WriterFactory> {
-    @Inject
-    @Named(BgpModule.HONEYCOMB_BGP)
-    private DataBroker bgpDataBroker;
-    @Override
-    protected BgpWriterFactory create() {
-        return new BgpWriterFactory(bgpDataBroker);
-    }
-
-    /**
-     * {@link WriterFactory} for BGP cfg write integration with HC writer registry.
-     * Using BindingBrokerWriter to write BGP configuration data via dedicated broker that, unlike
-     * {@link io.fd.honeycomb.data.impl.DataBroker}, supports tx chains and DOMDataChangeListener registration
-     * extensively used by ODL's bgp.
-     *
-     * As a bonus BGP route configuration is persisted and available for read via RESTCONF/NETCONF.
-     */
-    private static final class BgpWriterFactory implements WriterFactory {
-        private final DataBroker dataBroker;
-
-        private static final InstanceIdentifier<ApplicationRib> AR_IID =
-            InstanceIdentifier.create(ApplicationRib.class);
-        private static final InstanceIdentifier<Tables> TABLES_IID = AR_IID.child(Tables.class);
-        private static final InstanceIdentifier<Ipv4Routes> IPV4_ROUTES_IID = TABLES_IID.child((Class) Ipv4Routes.class);
-        private static final InstanceIdentifier<Ipv4Route> IPV4_ROUTE_IID = IPV4_ROUTES_IID.child(Ipv4Route.class);
-
-        private BgpWriterFactory(final DataBroker dataBroker) {
-            this.dataBroker = dataBroker;
-        }
-
-        // TODO
-        // BGP models are huge, we need some kind of wildcarded subtree writer, that works for whole subtree.
-        // 1) we can either move checking handledTypes to writers (getHandledTypes, isAffected, writer.getHandedTypes, ...)
-        // but then precondition check in flatWriterRegistry might be slower (we need to check if we have all writers
-        // in order to avoid unnecessary reverts).
-        //
-        // 2) alternative is to compute all child nodes during initialization (might introduce some footprint penalty).
-        @Override
-        public void init(final ModifiableWriterRegistryBuilder registry) {
-            registry.subtreeAdd(
-                Sets.newHashSet(
-                    TABLES_IID,
-                    IPV4_ROUTES_IID,
-                    IPV4_ROUTES_IID.child(Ipv4Route.class),
-                    IPV4_ROUTE_IID.child(Attributes.class),
-                    IPV4_ROUTE_IID.child(Attributes.class).child(Origin.class),
-                    IPV4_ROUTE_IID.child(Attributes.class).child(LocalPref.class),
-                    IPV4_ROUTE_IID.child(Attributes.class).child(Ipv4NextHop.class)
-                ),
-                new BindingBrokerWriter<>(InstanceIdentifier.create(ApplicationRib.class), dataBroker)
-            );
-        }
-    }
-}
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpWritersModule.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpWritersModule.java
deleted file mode 100644
index f9e2e4c5b..000000000
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/BgpWritersModule.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2017 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.honeycomb.infra.distro.bgp;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Singleton;
-import com.google.inject.multibindings.Multibinder;
-import io.fd.honeycomb.translate.write.WriterFactory;
-
-public class BgpWritersModule extends AbstractModule {
-
-    protected void configure() {
-        // This should be part of BgpModule, but that one is Private and Multibinders + private BASE_MODULES
-        // do not work together, that's why there's a dedicated module here
-        // https://github.com/google/guice/issues/906
-        final Multibinder<WriterFactory> binder = Multibinder.newSetBinder(binder(), WriterFactory.class);
-        binder.addBinding().toProvider(BgpWriterFactoryProvider.class).in(Singleton.class);
-    }
-}
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/RIBExtensionConsumerContextProvider.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/RIBExtensionConsumerContextProvider.java
deleted file mode 100644
index 480caa0eb..000000000
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/bgp/RIBExtensionConsumerContextProvider.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2017 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.honeycomb.infra.distro.bgp;
-
-import com.google.inject.Inject;
-import io.fd.honeycomb.infra.distro.ProviderTrait;
-import java.util.ArrayList;
-import java.util.Set;
-import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionConsumerContext;
-import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderActivator;
-import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderContext;
-import org.opendaylight.protocol.bgp.rib.spi.SimpleRIBExtensionProviderContext;
-import org.opendaylight.protocol.bgp.rib.spi.SimpleRIBExtensionProviderContextActivator;
-
-public class RIBExtensionConsumerContextProvider extends ProviderTrait<RIBExtensionConsumerContext> {
-    @Inject
-    private Set<RIBExtensionProviderActivator> activators;
-
-    @Override
-    protected RIBExtensionConsumerContext create() {
-        final RIBExtensionProviderContext ctx = new SimpleRIBExtensionProviderContext();
-        final SimpleRIBExtensionProviderContextActivator activator =
-            new SimpleRIBExtensionProviderContextActivator(ctx, new ArrayList<>(activators));
-        activator.start();
-        return ctx;
-    }
-}
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/HoneycombConfiguration.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/HoneycombConfiguration.java
index c3d406c9f..cc46f7b8e 100644
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/HoneycombConfiguration.java
+++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/HoneycombConfiguration.java
@@ -55,10 +55,6 @@ public class HoneycombConfiguration {
         return isNetconfTcpEnabled() || isNetconfSshEnabled();
     }
 
-    public boolean isBgpEnabled() {
-        return Boolean.valueOf(bgpEnabled);
-    }
-
     public boolean isConfigPersistenceEnabled() {
         return persistConfig.isPresent() && Boolean.valueOf(persistConfig.get());
     }
@@ -66,10 +62,6 @@ public class HoneycombConfiguration {
         return persistContext.isPresent() && Boolean.valueOf(persistContext.get());
     }
 
-    public boolean isBgpMultiplePathsEnabled() {
-        return Boolean.valueOf(bgpMultiplePaths.get());
-    }
-
     @InjectConfig("persist-context")
     public Optional<String> persistContext = Optional.of("true");
     @InjectConfig("persisted-context-path")
@@ -146,20 +138,6 @@ public class HoneycombConfiguration {
     public Optional<Integer> netconfSshBindingPort;
     @InjectConfig("netconf-notification-stream-name")
     public Optional<String> netconfNotificationStreamName = Optional.of("honeycomb");
-    @InjectConfig("bgp-enabled")
-    public String bgpEnabled;
-    @InjectConfig("bgp-binding-address")
-    public Optional<String> bgpBindingAddress;
-    @InjectConfig("bgp-port")
-    public Optional<Integer> bgpPort;
-    @InjectConfig("bgp-as-number")
-    public Optional<Integer> bgpAsNumber;
-    @InjectConfig("bgp-receive-multiple-paths")
-    public Optional<String> bgpMultiplePaths;
-    @InjectConfig("bgp-send-max-paths")
-    public Optional<Integer> bgpSendMaxMaths;
-    @InjectConfig("bgp-netty-threads")
-    public Integer bgpNettyThreads;
     @InjectConfig("username")
     public String username;
     @InjectConfig("password")
@@ -200,13 +178,6 @@ public class HoneycombConfiguration {
                 .add("netconfSshBindingAddress", netconfSshBindingAddress)
                 .add("netconfSshBindingPort", netconfSshBindingPort)
                 .add("netconfNotificationStreamName", netconfNotificationStreamName)
-                .add("bgpEnabled", bgpEnabled)
-                .add("bgpBindingAddress", bgpBindingAddress)
-                .add("bgpPort", bgpPort)
-                .add("bgp-as-number", bgpAsNumber)
-                .add("bgp-netty-threads", bgpNettyThreads)
-                .add("bgp-receive-multiple-paths", bgpMultiplePaths)
-                .add("bgp-send-max-paths", bgpSendMaxMaths)
                 .add("username", username)
                 .add("password", password)
                 .toString();
diff --git a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/bgp-peers.json b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/bgp-peers.json
deleted file mode 100644
index 6de2065b8..000000000
--- a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/bgp-peers.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "bgp-openconfig-extensions:neighbors": {
-    "neighbor": [
-      {
-        "neighbor-address": "10.25.1.9",
-        "config": {
-          "peer-group": "application-peers"
-        },
-        "afi-safis": {
-          "afi-safi": [
-            {
-              "afi-safi-name": "openconfig-bgp-types:IPV4-UNICAST",
-              "receive": true,
-              "send-max": 0
-            }
-          ]
-        }
-      },
-      {
-        "neighbor-address": "127.0.0.2",
-        "config": {
-          "peer-type": "INTERNAL"
-        },
-        "timers": {
-          "config": {
-            "connect-retry": 10,
-            "hold-time": 90
-          }
-        },
-        "transport": {
-          "config": {
-            "remote-port": 17900,
-            "passive-mode": false
-          }
-        },
-        "afi-safis": {
-          "afi-safi": [
-            {
-              "afi-safi-name": "openconfig-bgp-types:IPV4-UNICAST",
-              "receive": true,
-              "send-max": 0
-            }
-          ]
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json
index 95ab71292..1199f85bc 100644
--- a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json
+++ b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json
@@ -1,8 +1,8 @@
   {
-  "persist-context": "false",
+  "persist-context": "true",
   "persisted-context-path": "/var/lib/honeycomb/persist/context/data.json",
   "persisted-context-restoration-type": "Merge",
-  "persist-config": "false",
+  "persist-config": "true",
   "persisted-config-path": "/var/lib/honeycomb/persist/config/data.json",
   "persisted-config-restoration-type": "Merge",
 
@@ -37,14 +37,6 @@
   "netconf-ssh-binding-port": 2831,
   "netconf-notification-stream-name": "honeycomb",
 
-  "bgp-enabled": "true",
-  "bgp-binding-address": "127.0.0.1",
-  "bgp-port": 1790,
-  "bgp-as-number": 65000,
-  "bgp-receive-multiple-paths": "true",
-  "bgp-send-max-paths": 0,
-  "bgp-netty-threads": 2,
-
   "username": "admin",
   "password": "admin"
 }
\ No newline at end of file
diff --git a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/logback.xml b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/logback.xml
index 02e801d00..6dd4d4fc0 100644
--- a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/logback.xml
+++ b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/logback.xml
@@ -6,10 +6,10 @@
     </encoder>
   </appender>
   <appender name="honeycomb.log" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>honeycomb.log</file>
+    <file>/var/log/honeycomb/honeycomb.log</file>
 
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>logs/honeycomb.%d.log.zip</fileNamePattern>
+      <fileNamePattern>/var/log/honeycomb/logs/honeycomb.%d.log.zip</fileNamePattern>
       <maxHistory>1</maxHistory>
     </rollingPolicy>
 
diff --git a/infra/minimal-distribution/src/test/java/io/fd/honeycomb/infra/distro/BaseMinimalDistributionTest.java b/infra/minimal-distribution/src/test/java/io/fd/honeycomb/infra/distro/BaseMinimalDistributionTest.java
index fdd265b79..ced29590b 100644
--- a/infra/minimal-distribution/src/test/java/io/fd/honeycomb/infra/distro/BaseMinimalDistributionTest.java
+++ b/infra/minimal-distribution/src/test/java/io/fd/honeycomb/infra/distro/BaseMinimalDistributionTest.java
@@ -18,7 +18,6 @@ package io.fd.honeycomb.infra.distro;
 
 import static com.google.common.collect.ImmutableSet.of;
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
@@ -31,10 +30,6 @@ import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.Session;
 import com.mashape.unirest.http.HttpResponse;
 import com.mashape.unirest.http.Unirest;
-import io.fd.honeycomb.infra.distro.bgp.BgpExtensionsModule;
-import io.fd.honeycomb.infra.distro.bgp.BgpModule;
-import io.fd.honeycomb.infra.distro.bgp.BgpReadersModule;
-import io.fd.honeycomb.infra.distro.bgp.BgpWritersModule;
 import io.fd.honeycomb.infra.distro.cfgattrs.CfgAttrsModule;
 import io.fd.honeycomb.infra.distro.data.ConfigAndOperationalPipelineModule;
 import io.fd.honeycomb.infra.distro.data.context.ContextPipelineModule;
@@ -46,7 +41,6 @@ import io.fd.honeycomb.infra.distro.schema.SchemaModule;
 import io.fd.honeycomb.infra.distro.schema.YangBindingProviderModule;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.InetAddress;
 import java.net.Socket;
 import java.util.Properties;
 import java.util.Set;
@@ -75,36 +69,28 @@ public class BaseMinimalDistributionTest {
     private static final String NETCONF_NAMESPACE = "urn:ietf:params:xml:ns:netconf:base:1.0";
     private static final int HELLO_WAIT = 2500;
 
-    private static final int BGP_MSG_TYPE_OFFSET = 18; // 16 (MARKER) + 2 (LENGTH);
-    private static final byte BGP_OPEN_MSG_TYPE = 1;
-    private static final int BGP_PORT = 1790;
-
     public static final Set<Module> BASE_MODULES = of(
-            new YangBindingProviderModule(),
-            new SchemaModule(),
-            new ConfigAndOperationalPipelineModule(),
-            new ContextPipelineModule(),
-            new InitializerPipelineModule(),
-            new NetconfModule(),
-            new NetconfReadersModule(),
-            new RestconfModule(),
-            new BgpModule(),
-            new BgpExtensionsModule(),
-            new BgpReadersModule(),
-            new BgpWritersModule(),
-            new CfgAttrsModule());
+        new YangBindingProviderModule(),
+        new SchemaModule(),
+        new ConfigAndOperationalPipelineModule(),
+        new ContextPipelineModule(),
+        new InitializerPipelineModule(),
+        new NetconfModule(),
+        new NetconfReadersModule(),
+        new RestconfModule(),
+        new CfgAttrsModule());
 
     @Before
     public void setUp() throws Exception {
         SSLContext sslcontext = SSLContexts.custom()
-                .loadTrustMaterial(getClass().getResource("/honeycomb-keystore"),
-                        CERT_PASSWORD.toCharArray(), new TrustSelfSignedStrategy())
-                .build();
+            .loadTrustMaterial(getClass().getResource("/honeycomb-keystore"),
+                CERT_PASSWORD.toCharArray(), new TrustSelfSignedStrategy())
+            .build();
 
         SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslcontext);
         CloseableHttpClient httpclient = HttpClients.custom()
-                .setSSLSocketFactory(sslsf)
-                .build();
+            .setSSLSocketFactory(sslsf)
+            .build();
         Unirest.setHttpClient(httpclient);
     }
 
@@ -124,8 +110,6 @@ public class BaseMinimalDistributionTest {
         assertRestconfHttp();
         LOG.info("Testing RESTCONF HTTPS");
         assertRestconfHttps();
-        LOG.info("Testing BGP");
-        assertBgp();
     }
 
     private void assertNetconfTcp() throws Exception {
@@ -182,13 +166,13 @@ public class BaseMinimalDistributionTest {
 
     private void assertRestconfHttp() throws Exception {
         final String url =
-                "http://127.0.0.1:" + HTTP_PORT + "/restconf/operational/ietf-netconf-monitoring:netconf-state";
+            "http://127.0.0.1:" + HTTP_PORT + "/restconf/operational/ietf-netconf-monitoring:netconf-state";
         LOG.info("RESTCONF HTTP GET to {}", url);
         final HttpResponse<String> jsonNodeHttpResponse = Unirest.get(url)
-                .basicAuth(UNAME, PASSWORD)
-                .asString();
+            .basicAuth(UNAME, PASSWORD)
+            .asString();
         LOG.info("RESTCONF HTTP GET to {}, status: {}, data: {}",
-                url, jsonNodeHttpResponse.getStatus(), jsonNodeHttpResponse.getBody());
+            url, jsonNodeHttpResponse.getStatus(), jsonNodeHttpResponse.getBody());
 
         assertSuccessStatus(jsonNodeHttpResponse);
         assertSuccessResponseForNetconfMonitoring(jsonNodeHttpResponse);
@@ -196,13 +180,13 @@ public class BaseMinimalDistributionTest {
 
     private void assertRestconfHttps() throws Exception {
         final String url =
-                "https://127.0.0.1:" + HTTPS_PORT + "/restconf/operational/ietf-netconf-monitoring:netconf-state";
+            "https://127.0.0.1:" + HTTPS_PORT + "/restconf/operational/ietf-netconf-monitoring:netconf-state";
         LOG.info("RESTCONF HTTPS GET to {}", url);
         final HttpResponse<String> jsonNodeHttpResponse = Unirest.get(url)
-                .basicAuth(UNAME, PASSWORD)
-                .asString();
+            .basicAuth(UNAME, PASSWORD)
+            .asString();
         LOG.info("RESTCONF HTTPS GET to {}, status: {}, data: {}",
-                url, jsonNodeHttpResponse.getStatus(), jsonNodeHttpResponse.getBody());
+            url, jsonNodeHttpResponse.getStatus(), jsonNodeHttpResponse.getBody());
 
         assertSuccessStatus(jsonNodeHttpResponse);
         assertSuccessResponseForNetconfMonitoring(jsonNodeHttpResponse);
@@ -217,19 +201,4 @@ public class BaseMinimalDistributionTest {
         assertTrue(jsonNodeHttpResponse.getStatus() >= 200);
         assertTrue(jsonNodeHttpResponse.getStatus() < 400);
     }
-
-    private void assertBgp() throws Exception {
-        final InetAddress bgpHost = InetAddress.getByName("127.0.0.1");
-        final InetAddress bgpPeerAddress = InetAddress.getByName("127.0.0.2");
-        try (final Socket localhost = new Socket(bgpHost, BGP_PORT, bgpPeerAddress, 0);
-             final InputStream inputStream = localhost.getInputStream()) {
-            // wait until bgp message is sent
-            Thread.sleep(HELLO_WAIT);
-
-            final byte[] msg = readMessage(inputStream);
-            LOG.info("Received BGP message: {}", msg);
-
-            assertEquals(BGP_OPEN_MSG_TYPE, msg[BGP_MSG_TYPE_OFFSET]);
-        }
-    }
 }
\ No newline at end of file
diff --git a/infra/minimal-distribution/src/test/resources/bgp-peers.json b/infra/minimal-distribution/src/test/resources/bgp-peers.json
deleted file mode 100644
index 3a7e01060..000000000
--- a/infra/minimal-distribution/src/test/resources/bgp-peers.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "bgp-openconfig-extensions:neighbors": {
-    "neighbor": [
-      {
-        "neighbor-address": "10.25.1.9",
-        "config": {
-          "peer-group": "application-peers"
-        },
-        "afi-safis": {
-          "afi-safi": [
-            {
-              "afi-safi-name": "openconfig-bgp-types:IPV4-UNICAST",
-              "receive": true,
-              "send-max": 0
-            }
-          ]
-        }
-      },
-      {
-        "neighbor-address": "10.25.1.10",
-        "config": {
-          "peer-group": "application-peers"
-        },
-        "afi-safis": {
-          "afi-safi": [
-            {
-              "afi-safi-name": "openconfig-bgp-types:IPV4-UNICAST",
-              "receive": true,
-              "send-max": 0
-            }
-          ]
-        }
-      },
-      {
-        "neighbor-address": "127.0.0.2",
-        "config": {
-          "peer-type": "INTERNAL"
-        },
-        "timers": {
-          "config": {
-            "connect-retry": 10,
-            "hold-time": 90
-          }
-        },
-        "transport": {
-          "config": {
-            "remote-port": 17900,
-            "passive-mode": false
-          }
-        },
-        "afi-safis": {
-          "afi-safi": [
-            {
-              "afi-safi-name": "openconfig-bgp-types:IPV4-UNICAST",
-              "receive": true,
-              "send-max": 0
-            }
-          ]
-        }
-      },
-      {
-        "neighbor-address": "127.0.0.3",
-        "config": {
-          "peer-type": "EXTERNAL"
-        },
-        "timers": {
-          "config": {
-            "connect-retry": 10,
-            "hold-time": 90
-          }
-        },
-        "transport": {
-          "config": {
-            "remote-port": 17900,
-            "passive-mode": false
-          }
-        },
-        "afi-safis": {
-          "afi-safi": [
-            {
-              "afi-safi-name": "openconfig-bgp-types:IPV4-UNICAST",
-              "receive": true,
-              "send-max": 0
-            }
-          ]
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/infra/minimal-distribution/src/test/resources/honeycomb.json b/infra/minimal-distribution/src/test/resources/honeycomb.json
index be627747b..a0b2a633c 100644
--- a/infra/minimal-distribution/src/test/resources/honeycomb.json
+++ b/infra/minimal-distribution/src/test/resources/honeycomb.json
@@ -35,14 +35,6 @@
   "netconf-ssh-binding-port": 2832,
   "netconf-notification-stream-name": "honeycomb",
 
-  "bgp-enabled": "true",
-  "bgp-binding-address": "127.0.0.1",
-  "bgp-port": 1790,
-  "bgp-as-number": 65000,
-  "bgp-receive-multiple-paths": "true",
-  "bgp-send-max-paths": 0,
-  "bgp-netty-threads": 2,
-
   "username": "admin",
   "password": "admin"
 }
\ No newline at end of file