Bump upstream versions
[bgpcep.git] / bgp / rib-impl / src / main / java / org / opendaylight / protocol / bgp / rib / impl / config / BgpPeer.java
index 66e22b1c4315593d17dbc4eeeb2523305d828369..123f3ce8d8e907572daf20e8b3c4dfc9561582c9 100644 (file)
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.protocol.bgp.rib.impl.config;
 
-import static org.opendaylight.protocol.bgp.rib.impl.config.OpenConfigMappingUtil.getHoldTimer;
-import static org.opendaylight.protocol.bgp.rib.impl.config.OpenConfigMappingUtil.getPeerAs;
+import static com.google.common.base.Preconditions.checkState;
+import static java.util.Objects.requireNonNull;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterables;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import io.netty.util.concurrent.Future;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
-import org.opendaylight.controller.config.yang.bgp.rib.impl.BGPPeerRuntimeMXBean;
-import org.opendaylight.controller.config.yang.bgp.rib.impl.BgpPeerState;
-import org.opendaylight.controller.config.yang.bgp.rib.impl.BgpSessionState;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration;
-import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
-import org.opendaylight.protocol.bgp.openconfig.spi.BGPOpenConfigMappingService;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.lock.qual.GuardedBy;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
+import org.opendaylight.protocol.bgp.openconfig.spi.BGPTableTypeRegistryConsumer;
 import org.opendaylight.protocol.bgp.parser.BgpExtendedMessageUtil;
 import org.opendaylight.protocol.bgp.parser.spi.MultiprotocolCapabilitiesUtil;
+import org.opendaylight.protocol.bgp.parser.spi.RevisedErrorHandlingSupport;
 import org.opendaylight.protocol.bgp.rib.impl.BGPPeer;
+import org.opendaylight.protocol.bgp.rib.impl.BgpPeerUtil;
 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.BgpDeployer.WriteConfiguration;
 import org.opendaylight.protocol.bgp.rib.impl.spi.RIB;
+import org.opendaylight.protocol.bgp.rib.spi.state.BGPPeerState;
+import org.opendaylight.protocol.bgp.rib.spi.state.BGPPeerStateProvider;
+import org.opendaylight.protocol.bgp.rib.spi.state.BGPStateProviderRegistry;
 import org.opendaylight.protocol.concepts.KeyMapping;
 import org.opendaylight.protocol.util.Ipv4Util;
 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.rev151009.bgp.neighbor.group.AfiSafis;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbor.group.Config;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbors.Neighbor;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.open.message.BgpParameters;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.open.message.BgpParametersBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.open.message.bgp.parameters.OptionalCapabilities;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.open.message.bgp.parameters.OptionalCapabilitiesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.open.message.bgp.parameters.optional.capabilities.CParametersBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.open.message.bgp.parameters.optional.capabilities.c.parameters.As4BytesCapabilityBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.BgpTableType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.CParameters1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.CParameters1Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.mp.capabilities.AddPathCapabilityBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.mp.capabilities.MultiprotocolCapabilityBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.mp.capabilities.add.path.capability.AddressFamilies;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev160614.AfiSafi2;
-import org.osgi.framework.ServiceRegistration;
+import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.peer.group.PeerGroup;
+import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.Bgp;
+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.IpAddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.open.message.BgpParameters;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.open.message.bgp.parameters.OptionalCapabilities;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.open.message.bgp.parameters.OptionalCapabilitiesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.open.message.bgp.parameters.optional.capabilities.CParametersBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.open.message.bgp.parameters.optional.capabilities.c.parameters.As4BytesCapabilityBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.BgpTableType;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.CParameters1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.AddPathCapabilityBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.MultiprotocolCapabilityBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.add.path.capability.AddressFamilies;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.network.instance.protocol.NeighborPeerGroupConfig;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.PeerRole;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.TablesKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.ClusterIdentifier;
+import org.opendaylight.yangtools.concepts.Registration;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
-public class BgpPeer implements PeerBean, BGPPeerRuntimeMXBean {
-
+public class BgpPeer extends PeerBean {
     private static final Logger LOG = LoggerFactory.getLogger(BgpPeer.class);
 
-    private final RpcProviderRegistry rpcRegistry;
-    private final BGPPeerRegistry peerRegistry;
-    private ServiceRegistration<?> serviceRegistration;
+    private final RpcProviderService rpcRegistry;
+    private final BGPStateProviderRegistry stateProviderRegistry;
+
+    @GuardedBy("this")
     private Neighbor currentConfiguration;
+    @GuardedBy("this")
     private BgpPeerSingletonService bgpPeerSingletonService;
+    @GuardedBy("this")
+    private Registration stateProviderRegistration;
 
-    public BgpPeer(final RpcProviderRegistry rpcRegistry, final BGPPeerRegistry peerRegistry) {
-        this.rpcRegistry = rpcRegistry;
-        this.peerRegistry = peerRegistry;
-    }
-
-    @Override
-    public void start(final RIB rib, final Neighbor neighbor, final BGPOpenConfigMappingService mappingService,
-        final WriteConfiguration configurationWriter) {
-        Preconditions.checkState(this.bgpPeerSingletonService == null, "Previous peer instance {} was not closed.");
-        this.bgpPeerSingletonService = new BgpPeerSingletonService(rib, neighbor, mappingService, configurationWriter);
-        this.currentConfiguration = neighbor;
-    }
-
-    @Override
-    public void restart(final RIB rib, final BGPOpenConfigMappingService mappingService) {
-        Preconditions.checkState(this.currentConfiguration != null);
-        start(rib, this.currentConfiguration, mappingService, null);
-    }
-
-    @Override
-    public void close() {
-        try {
-            this.bgpPeerSingletonService.close();
-            this.bgpPeerSingletonService = null;
-        } catch (final Exception e) {
-            LOG.warn("Failed to close peer instance", e);
-        }
-        this.currentConfiguration = null;
-        if (this.serviceRegistration != null) {
-            this.serviceRegistration.unregister();
-            this.serviceRegistration = null;
-        }
-    }
-
-    @Override
-    public Boolean containsEqualConfiguration(final Neighbor neighbor) {
-        final AfiSafis actAfiSafi = this.currentConfiguration.getAfiSafis();
-        final AfiSafis extAfiSafi = neighbor.getAfiSafis();
-        final List<AfiSafi> actualSafi = actAfiSafi.getAfiSafi();
-        final List<AfiSafi> extSafi = extAfiSafi.getAfiSafi();
-        return actualSafi.containsAll(extSafi) && extSafi.containsAll(actualSafi)
-        && Objects.equals(this.currentConfiguration.getConfig(), neighbor.getConfig())
-        && Objects.equals(this.currentConfiguration.getNeighborAddress(), neighbor.getNeighborAddress())
-        && Objects.equals(this.currentConfiguration.getAddPaths(),neighbor.getAddPaths())
-        && Objects.equals(this.currentConfiguration.getApplyPolicy(), neighbor.getApplyPolicy())
-        && Objects.equals(this.currentConfiguration.getAsPathOptions(), neighbor.getAsPathOptions())
-        && Objects.equals(this.currentConfiguration.getEbgpMultihop(), neighbor.getEbgpMultihop())
-        && Objects.equals(this.currentConfiguration.getGracefulRestart(), neighbor.getGracefulRestart())
-        && Objects.equals(this.currentConfiguration.getErrorHandling(), neighbor.getErrorHandling())
-        && Objects.equals(this.currentConfiguration.getLoggingOptions(), neighbor.getLoggingOptions())
-        && Objects.equals(this.currentConfiguration.getRouteReflector(), neighbor.getRouteReflector())
-        && Objects.equals(this.currentConfiguration.getState(), neighbor.getState())
-        && Objects.equals(this.currentConfiguration.getTimers(), neighbor.getTimers())
-        && Objects.equals(this.currentConfiguration.getTransport(), neighbor.getTransport());
+    public BgpPeer(final RpcProviderService rpcRegistry, final BGPStateProviderRegistry stateProviderRegistry) {
+        this.rpcRegistry = requireNonNull(rpcRegistry);
+        this.stateProviderRegistry = requireNonNull(stateProviderRegistry);
     }
 
-    private static List<BgpParameters> getBgpParameters(final Neighbor neighbor, final RIB rib,
-            final BGPOpenConfigMappingService mappingService) {
-        final List<BgpParameters> tlvs = new ArrayList<>();
+    private static List<OptionalCapabilities> getBgpCapabilities(final AfiSafis afiSafis, final RIB rib,
+                                                          final BGPTableTypeRegistryConsumer tableTypeRegistry) {
         final List<OptionalCapabilities> caps = new ArrayList<>();
         caps.add(new OptionalCapabilitiesBuilder().setCParameters(new CParametersBuilder().setAs4BytesCapability(
                 new As4BytesCapabilityBuilder().setAsNumber(rib.getLocalAs()).build()).build()).build());
 
-        caps.add(new OptionalCapabilitiesBuilder().setCParameters(BgpExtendedMessageUtil.EXTENDED_MESSAGE_CAPABILITY).build());
-        caps.add(new OptionalCapabilitiesBuilder().setCParameters(MultiprotocolCapabilitiesUtil.RR_CAPABILITY).build());
+        caps.add(new OptionalCapabilitiesBuilder()
+                .setCParameters(BgpExtendedMessageUtil.EXTENDED_MESSAGE_CAPABILITY).build());
+        caps.add(new OptionalCapabilitiesBuilder()
+                .setCParameters(MultiprotocolCapabilitiesUtil.RR_CAPABILITY).build());
 
-        final List<AddressFamilies> addPathCapability = mappingService.toAddPathCapability(neighbor.getAfiSafis().getAfiSafi());
+        final Collection<AfiSafi> afiSafi = OpenConfigMappingUtil.getAfiSafiWithDefault(afiSafis, false).values();
+        final List<AddressFamilies> addPathCapability = OpenConfigMappingUtil.toAddPathCapability(afiSafi,
+            tableTypeRegistry);
         if (!addPathCapability.isEmpty()) {
-            caps.add(new OptionalCapabilitiesBuilder().setCParameters(new CParametersBuilder().addAugmentation(CParameters1.class,
-                    new CParameters1Builder().setAddPathCapability(
-                            new AddPathCapabilityBuilder().setAddressFamilies(addPathCapability).build()).build()).build()).build());
+            caps.add(new OptionalCapabilitiesBuilder()
+                .setCParameters(new CParametersBuilder()
+                    .addAugmentation(new CParameters1Builder()
+                        .setAddPathCapability(new AddPathCapabilityBuilder()
+                            .setAddressFamilies(addPathCapability)
+                            .build())
+                        .build())
+                    .build())
+                .build());
         }
 
-        final List<BgpTableType> tableTypes = mappingService.toTableTypes(neighbor.getAfiSafis().getAfiSafi());
+        final List<BgpTableType> tableTypes = OpenConfigMappingUtil.toTableTypes(afiSafi, tableTypeRegistry);
         for (final BgpTableType tableType : tableTypes) {
             if (!rib.getLocalTables().contains(tableType)) {
-                LOG.info("RIB instance does not list {} in its local tables. Incoming data will be dropped.", tableType);
+                LOG.info("RIB instance does not list {} in its local tables. Incoming data will be dropped.",
+                    tableType);
             }
 
-            caps.add(new OptionalCapabilitiesBuilder().setCParameters(
-                    new CParametersBuilder().addAugmentation(CParameters1.class,
-                            new CParameters1Builder().setMultiprotocolCapability(
-                                    new MultiprotocolCapabilityBuilder(tableType).build()).build()).build()).build());
+            caps.add(new OptionalCapabilitiesBuilder()
+                .setCParameters(new CParametersBuilder()
+                    .addAugmentation(new CParameters1Builder()
+                        .setMultiprotocolCapability(new MultiprotocolCapabilityBuilder(tableType).build())
+                        .build())
+                    .build())
+                .build());
         }
-        tlvs.add(new BgpParametersBuilder().setOptionalCapabilities(caps).build());
-        return tlvs;
+        return caps;
+    }
+
+    @Override
+    synchronized void start(final RIB rib, final Neighbor neighbor, final InstanceIdentifier<Bgp> bgpIid,
+            final PeerGroupConfigLoader peerGroupLoader, final BGPTableTypeRegistryConsumer tableTypeRegistry) {
+        checkState(bgpPeerSingletonService == null, "Previous peer instance was not closed.");
+        LOG.info("Starting BgPeer instance {}", neighbor.getNeighborAddress());
+        bgpPeerSingletonService = new BgpPeerSingletonService(rib, neighbor, bgpIid, peerGroupLoader,
+                tableTypeRegistry);
+        currentConfiguration = neighbor;
+        stateProviderRegistration = stateProviderRegistry.register(this);
     }
 
-    private static Optional<byte[]> getPassword(final KeyMapping key) {
-        if (key != null) {
-            return Optional.of(Iterables.getOnlyElement(key.values()));
+    @Override
+    synchronized ListenableFuture<?> stop() {
+        if (bgpPeerSingletonService == null) {
+            LOG.info("BGP Peer {} already closed, skipping", currentConfiguration.getNeighborAddress());
+            return Futures.immediateVoidFuture();
+        }
+        LOG.info("Closing BGP Peer {}", currentConfiguration.getNeighborAddress());
+        if (stateProviderRegistration != null) {
+            stateProviderRegistration.close();
+            stateProviderRegistration = null;
         }
-        return Optional.absent();
+
+        final var future = bgpPeerSingletonService.closeServiceInstance();
+        bgpPeerSingletonService = null;
+        return future;
     }
 
     @Override
-    public BgpPeerState getBgpPeerState() {
-        return this.bgpPeerSingletonService.getPeer().getBgpPeerState();
+    synchronized void instantiateServiceInstance() {
+        if (bgpPeerSingletonService != null) {
+            bgpPeerSingletonService.instantiateServiceInstance();
+        }
     }
 
     @Override
-    public BgpSessionState getBgpSessionState() {
-        return this.bgpPeerSingletonService.getPeer().getBgpSessionState();
+    synchronized ListenableFuture<?> closeServiceInstance() {
+        return bgpPeerSingletonService != null ? bgpPeerSingletonService.closeServiceInstance()
+            : Futures.immediateVoidFuture();
     }
 
     @Override
-    public void resetSession() {
-        this.bgpPeerSingletonService.getPeer().resetSession();
+    synchronized boolean containsEqualConfiguration(final Neighbor neighbor) {
+        if (currentConfiguration == null) {
+            return false;
+        }
+        final AfiSafis actAfiSafi = currentConfiguration.getAfiSafis();
+        final AfiSafis extAfiSafi = neighbor.getAfiSafis();
+        final Collection<AfiSafi> actualSafi = actAfiSafi != null ? actAfiSafi.nonnullAfiSafi().values()
+                : Collections.emptyList();
+        final Collection<AfiSafi> extSafi = extAfiSafi != null ? extAfiSafi.nonnullAfiSafi().values()
+                : Collections.emptyList();
+        return actualSafi.containsAll(extSafi) && extSafi.containsAll(actualSafi)
+                && Objects.equals(currentConfiguration.getConfig(), neighbor.getConfig())
+                && Objects.equals(currentConfiguration.getNeighborAddress(), neighbor.getNeighborAddress())
+                && Objects.equals(currentConfiguration.getAddPaths(), neighbor.getAddPaths())
+                && Objects.equals(currentConfiguration.getApplyPolicy(), neighbor.getApplyPolicy())
+                && Objects.equals(currentConfiguration.getAsPathOptions(), neighbor.getAsPathOptions())
+                && Objects.equals(currentConfiguration.getEbgpMultihop(), neighbor.getEbgpMultihop())
+                && Objects.equals(currentConfiguration.getGracefulRestart(), neighbor.getGracefulRestart())
+                && Objects.equals(currentConfiguration.getErrorHandling(), neighbor.getErrorHandling())
+                && Objects.equals(currentConfiguration.getLoggingOptions(), neighbor.getLoggingOptions())
+                && Objects.equals(currentConfiguration.getRouteReflector(), neighbor.getRouteReflector())
+                && Objects.equals(currentConfiguration.getState(), neighbor.getState())
+                && Objects.equals(currentConfiguration.getTimers(), neighbor.getTimers())
+                && Objects.equals(currentConfiguration.getTransport(), neighbor.getTransport());
     }
 
     @Override
-    public void resetStats() {
-        this.bgpPeerSingletonService.getPeer().resetStats();
+    synchronized Neighbor getCurrentConfiguration() {
+        return currentConfiguration;
     }
 
-    void setServiceRegistration(final ServiceRegistration<?> serviceRegistration) {
-        this.serviceRegistration = serviceRegistration;
+    @Override
+    public synchronized BGPPeerState getPeerState() {
+        if (bgpPeerSingletonService == null) {
+            return null;
+        }
+        return bgpPeerSingletonService.getPeerState();
+    }
+
+    synchronized void removePeer(final BGPPeerRegistry bgpPeerRegistry) {
+        if (currentConfiguration != null) {
+            bgpPeerRegistry.removePeer(OpenConfigMappingUtil.convertIpAddress(
+                currentConfiguration.getNeighborAddress()));
+        }
     }
 
-    private final class BgpPeerSingletonService implements ClusterSingletonService, AutoCloseable {
-        private final ServiceGroupIdentifier serviceGroupIdentifier;
+    private final class BgpPeerSingletonService implements BGPPeerStateProvider {
         private final boolean activeConnection;
         private final BGPDispatcher dispatcher;
         private final InetSocketAddress inetAddress;
         private final int retryTimer;
-        private final Optional<KeyMapping> key;
-        private final WriteConfiguration configurationWriter;
-        private ClusterSingletonServiceRegistration registration;
+        private final KeyMapping keys;
+        private final InetSocketAddress localAddress;
         private final BGPPeer bgpPeer;
-        private final IpAddress neighborAddress;
+        private final IpAddressNoZone neighborAddress;
         private final BGPSessionPreferences prefs;
         private Future<Void> connection;
+        private boolean isServiceInstantiated;
+        private final List<OptionalCapabilities> finalCapabilities;
+        private final int gracefulRestartTimer;
+        private final RevisedErrorHandlingSupport errorHandling;
 
-        private BgpPeerSingletonService(final RIB rib, final Neighbor neighbor, final BGPOpenConfigMappingService mappingService,
-            final WriteConfiguration configurationWriter) {
-            this.neighborAddress = neighbor.getNeighborAddress();
-            this.bgpPeer = new BGPPeer(Ipv4Util.toStringIP(this.neighborAddress), rib, mappingService.toPeerRole(neighbor), rpcRegistry);
-            final List<BgpParameters> bgpParameters = getBgpParameters(neighbor, rib, mappingService);
-            final KeyMapping key = OpenConfigMappingUtil.getNeighborKey(neighbor);
-            this.prefs = new BGPSessionPreferences(rib.getLocalAs(), getHoldTimer(neighbor), rib.getBgpIdentifier(), getPeerAs(neighbor, rib),
-                bgpParameters, getPassword(key));
-            this.activeConnection = OpenConfigMappingUtil.isActive(neighbor);
-            this.dispatcher = rib.getDispatcher();
-            this.inetAddress = Ipv4Util.toInetSocketAddress(this.neighborAddress, OpenConfigMappingUtil.getPort(neighbor));
-            this.retryTimer = OpenConfigMappingUtil.getRetryTimer(neighbor);
-            this.key = Optional.fromNullable(key);
-            this.serviceGroupIdentifier = rib.getRibIServiceGroupIdentifier();
-            LOG.info("Peer Singleton Service {} registered", this.serviceGroupIdentifier);
-            this.registration = rib.registerClusterSingletonService(this);
-            this.configurationWriter = configurationWriter;
-        }
 
-        @Override
-        public void close() throws Exception {
-            if (this.registration != null) {
-                this.registration.close();
-                this.registration = null;
+        private BgpPeerSingletonService(final RIB rib, final Neighbor neighbor, final InstanceIdentifier<Bgp> bgpIid,
+                final PeerGroupConfigLoader peerGroupLoader, final BGPTableTypeRegistryConsumer tableTypeRegistry) {
+            neighborAddress = OpenConfigMappingUtil.convertIpAddress(neighbor.getNeighborAddress());
+
+            PeerGroup peerGroup = null;
+            String peerGroupName = null;
+            final Config neighborConfig = neighbor.getConfig();
+            if (neighborConfig != null) {
+                final NeighborPeerGroupConfig pgConfig = neighborConfig.augmentation(NeighborPeerGroupConfig.class);
+                if (pgConfig != null) {
+                    peerGroupName = StringUtils.substringBetween(pgConfig.getPeerGroup(), "=\"", "\"");
+                    peerGroup = peerGroupLoader.getPeerGroup(bgpIid, peerGroupName);
+                }
+            }
+            final AfiSafis afisSafis;
+            if (peerGroup != null && peerGroup.getAfiSafis() != null) {
+                afisSafis = peerGroup.getAfiSafis();
+            } else {
+                afisSafis = requireNonNull(neighbor.getAfiSafis(), "Missing mandatory AFIs/SAFIs");
+            }
+
+            final Set<TablesKey> afiSafisAdvertized = OpenConfigMappingUtil.toTableKey(afisSafis.getAfiSafi(),
+                tableTypeRegistry);
+            final PeerRole role = OpenConfigMappingUtil.toPeerRole(neighbor, peerGroup);
+
+            final ClusterIdentifier clusterId = OpenConfigMappingUtil
+                    .getNeighborClusterIdentifier(neighbor.getRouteReflector(), peerGroup);
+            final int hold = OpenConfigMappingUtil.getHoldTimer(neighbor, peerGroup);
+            gracefulRestartTimer = OpenConfigMappingUtil.getGracefulRestartTimer(neighbor, peerGroup, hold);
+            final Set<TablesKey> gracefulTables = GracefulRestartUtil.getGracefulTables(
+                afisSafis.nonnullAfiSafi().values(), tableTypeRegistry);
+            final Map<TablesKey, Integer> llGracefulTimers = GracefulRestartUtil.getLlGracefulTimers(
+                afisSafis.nonnullAfiSafi().values(), tableTypeRegistry);
+            finalCapabilities = getBgpCapabilities(afisSafis, rib, tableTypeRegistry);
+            final List<BgpParameters> bgpParameters = getInitialBgpParameters(gracefulTables, llGracefulTimers);
+            final KeyMapping keyMapping = OpenConfigMappingUtil.getNeighborKey(neighbor);
+            final IpAddressNoZone neighborLocalAddress = OpenConfigMappingUtil.getLocalAddress(neighbor.getTransport());
+            final AsNumber globalAs = rib.getLocalAs();
+            final AsNumber neighborRemoteAs = OpenConfigMappingUtil
+                    .getRemotePeerAs(neighbor.getConfig(), peerGroup, globalAs);
+            final AsNumber neighborLocalAs;
+            if (role == PeerRole.Ebgp) {
+                neighborLocalAs = OpenConfigMappingUtil.getLocalPeerAs(neighbor.getConfig(), globalAs);
+            } else {
+                neighborLocalAs = globalAs;
             }
+
+            errorHandling = OpenConfigMappingUtil.getRevisedErrorHandling(role, peerGroup, neighbor);
+            bgpPeer = new BGPPeer(tableTypeRegistry, neighborAddress, peerGroupName, rib, role, clusterId,
+                    neighborLocalAs, rpcRegistry, afiSafisAdvertized, gracefulTables, llGracefulTimers,
+                    BgpPeer.this);
+            prefs = new BGPSessionPreferences(neighborLocalAs, hold, rib.getBgpIdentifier(),
+                    neighborRemoteAs, bgpParameters,
+                    keyMapping == null ? Optional.empty()
+                        : Optional.of(Iterables.getOnlyElement(keyMapping.asMap().values())));
+            activeConnection = OpenConfigMappingUtil.isActive(neighbor, peerGroup);
+            retryTimer = OpenConfigMappingUtil.getRetryTimer(neighbor, peerGroup);
+            dispatcher = rib.getDispatcher();
+
+            final PortNumber port = OpenConfigMappingUtil.getPort(neighbor, peerGroup);
+            inetAddress = Ipv4Util.toInetSocketAddress(neighborAddress, port);
+            if (neighborLocalAddress != null) {
+                localAddress = Ipv4Util.toInetSocketAddress(neighborLocalAddress, port);
+            } else {
+                localAddress = null;
+            }
+            keys = keyMapping;
+            LOG.info("New BGP Peer {}:{} AS {} instance for BGP id {} created with activeConnection: {}",
+                    inetAddress, localAddress, neighborRemoteAs, prefs.getBgpId(), activeConnection);
         }
 
-        @Override
-        public void instantiateServiceInstance() {
-            if(this.configurationWriter != null) {
-                this.configurationWriter.apply();
+        private List<BgpParameters> getInitialBgpParameters(final Set<TablesKey> gracefulTables,
+                                                            final Map<TablesKey, Integer> llGracefulTimers) {
+            final Set<BgpPeerUtil.LlGracefulRestartDTO> llGracefulRestarts = llGracefulTimers.entrySet().stream()
+                    .map(entry -> new BgpPeerUtil.LlGracefulRestartDTO(entry.getKey(), entry.getValue(), false))
+                    .collect(Collectors.toSet());
+            return Collections.singletonList(
+                    GracefulRestartUtil.getGracefulBgpParameters(finalCapabilities, gracefulTables,
+                            Collections.emptySet(), gracefulRestartTimer, false, llGracefulRestarts));
+        }
+
+        synchronized void instantiateServiceInstance() {
+            if (isServiceInstantiated) {
+                LOG.warn("Peer {} has already been instantiated", neighborAddress);
+                return;
             }
-            LOG.info("Peer Singleton Service {} instantiated", getIdentifier());
-            this.bgpPeer.instantiateServiceInstance();
-            peerRegistry.addPeer(this.neighborAddress, this.bgpPeer, prefs);
-            if (this.activeConnection) {
-                this.connection = this.dispatcher.createReconnectingClient(this.inetAddress, peerRegistry, this.retryTimer, this.key);
+            isServiceInstantiated = true;
+            LOG.info("Peer instantiated {}", neighborAddress);
+            bgpPeer.instantiateServiceInstance();
+            dispatcher.getBGPPeerRegistry().addPeer(neighborAddress, bgpPeer, prefs);
+            if (activeConnection) {
+                connection = dispatcher.createReconnectingClient(inetAddress, localAddress, retryTimer, keys);
             }
         }
 
-        @Override
-        public ListenableFuture<Void> closeServiceInstance() {
-            LOG.info("Close RIB Singleton Service {}", this.getIdentifier());
-            if (this.connection != null) {
-                this.connection.cancel(true);
-                this.connection = null;
+        synchronized ListenableFuture<?> closeServiceInstance() {
+            if (!isServiceInstantiated) {
+                LOG.info("Peer {} already closed", neighborAddress);
+                return Futures.immediateVoidFuture();
             }
-            this.bgpPeer.close();
-            if(currentConfiguration != null) {
-                peerRegistry.removePeer(currentConfiguration.getNeighborAddress());
+            LOG.info("Close Peer {}", neighborAddress);
+            isServiceInstantiated = false;
+            if (connection != null) {
+                connection.cancel(true);
+                connection = null;
             }
-            return Futures.immediateFuture(null);
+            final var future = bgpPeer.close();
+            removePeer(dispatcher.getBGPPeerRegistry());
+            return future;
         }
 
         @Override
-        public ServiceGroupIdentifier getIdentifier() {
-            return this.serviceGroupIdentifier;
+        public BGPPeerState getPeerState() {
+            return bgpPeer.getPeerState();
         }
+    }
 
-        BGPPeerRuntimeMXBean getPeer() {
-            return this.bgpPeer;
-        }
+    public synchronized List<OptionalCapabilities> getBgpFixedCapabilities() {
+        return bgpPeerSingletonService.finalCapabilities;
+    }
+
+    public synchronized int getGracefulRestartTimer() {
+        return bgpPeerSingletonService.gracefulRestartTimer;
+    }
+
+    public synchronized Optional<RevisedErrorHandlingSupport> getErrorHandling() {
+        return Optional.ofNullable(bgpPeerSingletonService.errorHandling);
     }
 }