X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=bgp%2Frib-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fprotocol%2Fbgp%2Frib%2Fimpl%2FBGPPeer.java;h=4cbcd0cef849d7c73af7e4259ba06e723b38b0ff;hb=refs%2Fheads%2Fstable%2Fboron;hp=336f36f7f6586ac6350d062a9b985b443d08b45c;hpb=1fabc0a22906be5c41420c5f3b573088091f9459;p=bgpcep.git diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java index 336f36f7f6..4cbcd0cef8 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java @@ -7,38 +7,55 @@ */ package org.opendaylight.protocol.bgp.rib.impl; +import static org.opendaylight.protocol.bgp.rib.impl.AdjRibInWriter.isAnnounceNone; +import static org.opendaylight.protocol.bgp.rib.impl.AdjRibInWriter.isLearnNone; + import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; +import com.google.common.collect.ImmutableMap; import com.google.common.net.InetAddresses; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; import javax.annotation.concurrent.GuardedBy; import org.opendaylight.controller.config.yang.bgp.rib.impl.BGPPeerRuntimeMXBean; import org.opendaylight.controller.config.yang.bgp.rib.impl.BGPPeerRuntimeRegistration; import org.opendaylight.controller.config.yang.bgp.rib.impl.BGPPeerRuntimeRegistrator; import org.opendaylight.controller.config.yang.bgp.rib.impl.BgpPeerState; import org.opendaylight.controller.config.yang.bgp.rib.impl.BgpSessionState; -import org.opendaylight.controller.config.yang.bgp.rib.impl.RouteTable; import org.opendaylight.controller.md.sal.common.api.data.AsyncTransaction; import org.opendaylight.controller.md.sal.common.api.data.TransactionChain; import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener; import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain; -import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionStatistics; +import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration; +import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; +import org.opendaylight.protocol.bgp.parser.BGPDocumentedException; +import org.opendaylight.protocol.bgp.parser.BGPError; +import org.opendaylight.protocol.bgp.parser.impl.message.update.LocalPreferenceAttributeParser; +import org.opendaylight.protocol.bgp.parser.spi.MessageUtil; import org.opendaylight.protocol.bgp.rib.impl.spi.RIB; import org.opendaylight.protocol.bgp.rib.impl.spi.RIBSupportContext; +import org.opendaylight.protocol.bgp.rib.impl.stats.peer.BGPPeerStats; +import org.opendaylight.protocol.bgp.rib.impl.stats.peer.BGPPeerStatsImpl; +import org.opendaylight.protocol.bgp.rib.impl.stats.peer.BGPSessionStats; import org.opendaylight.protocol.bgp.rib.spi.BGPSession; import org.opendaylight.protocol.bgp.rib.spi.BGPSessionListener; import org.opendaylight.protocol.bgp.rib.spi.BGPTerminationReason; +import org.opendaylight.protocol.bgp.rib.spi.ExportPolicyPeerTracker; +import org.opendaylight.protocol.bgp.rib.spi.IdentifierUtils; import org.opendaylight.protocol.bgp.rib.spi.Peer; import org.opendaylight.protocol.bgp.rib.spi.RouterIds; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix; +import org.opendaylight.protocol.concepts.AbstractRegistration; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.ipv4.prefixes.DestinationIpv4Builder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.ipv4.prefixes.destination.ipv4.Ipv4Prefixes; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.ipv4.prefixes.destination.ipv4.Ipv4PrefixesBuilder; @@ -46,10 +63,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.Update; 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.AttributesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.Attributes1; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.Attributes2; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.BgpAddPathTableType; 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.RouteRefresh; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.SendReceive; 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.multiprotocol.rev130919.update.attributes.MpReachNlri; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.update.attributes.MpReachNlriBuilder; @@ -57,14 +74,20 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mult import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.update.attributes.MpUnreachNlriBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.update.attributes.mp.reach.nlri.AdvertizedRoutesBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.update.attributes.mp.unreach.nlri.WithdrawnRoutesBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.peer.rpc.rev160322.BgpPeerRpcService; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.peer.rpc.rev160322.PeerContext; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.PeerId; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.PeerRole; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.SimpleRoutingPolicy; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.bgp.rib.rib.PeerKey; 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.AddressFamily; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.Ipv4AddressFamily; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.SubsequentAddressFamily; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.UnicastSubsequentAddressFamily; +import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; import org.opendaylight.yangtools.yang.binding.Notification; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,7 +95,7 @@ import org.slf4j.LoggerFactory; * Class representing a peer. We have a single instance for each peer, which provides translation from BGP events into * RIB actions. */ -public class BGPPeer implements BGPSessionListener, Peer, AutoCloseable, BGPPeerRuntimeMXBean, TransactionChainListener { +public class BGPPeer implements BGPSessionListener, Peer, BGPPeerRuntimeMXBean, TransactionChainListener { private static final Logger LOG = LoggerFactory.getLogger(BGPPeer.class); @@ -86,33 +109,52 @@ public class BGPPeer implements BGPSessionListener, Peer, AutoCloseable, BGPPeer private DOMTransactionChain chain; @GuardedBy("this") private AdjRibInWriter ribWriter; + @GuardedBy("this") + private EffectiveRibInWriter effRibInWriter; private final RIB rib; private final String name; private BGPPeerRuntimeRegistrator registrator; private BGPPeerRuntimeRegistration runtimeReg; - private long sessionEstablishedCounter = 0L; private final Map adjRibOutListenerSet = new HashMap(); - - public BGPPeer(final String name, final RIB rib) { - this(name, rib, PeerRole.Ibgp); - } - - public BGPPeer(final String name, final RIB rib, final PeerRole role) { + private final RpcProviderRegistry rpcRegistry; + private RoutedRpcRegistration rpcRegistration; + private final PeerRole peerRole; + private final Optional simpleRoutingPolicy; + private final BGPPeerStats peerStats; + private YangInstanceIdentifier peerIId; + private final Set tableRegistration = new HashSet<>(); + + public BGPPeer(final String name, final RIB rib, final PeerRole role, final SimpleRoutingPolicy peerStatus, final RpcProviderRegistry rpcRegistry) { + this.peerRole = role; + this.simpleRoutingPolicy = Optional.ofNullable(peerStatus); this.rib = Preconditions.checkNotNull(rib); this.name = name; + this.rpcRegistry = rpcRegistry; + this.peerStats = new BGPPeerStatsImpl(this.name, this.tables); this.chain = rib.createPeerChain(this); - this.ribWriter = AdjRibInWriter.create(rib.getYangRibId(), role, this.chain); } + public BGPPeer(final String name, final RIB rib, final PeerRole role, final RpcProviderRegistry rpcRegistry) { + this(name, rib, role, null, rpcRegistry); + } + + public void instantiateServiceInstance() { + // add current peer to "configured BGP peer" stats + this.rib.getRenderStats().getConfiguredPeerCounter().increaseCount(); + this.ribWriter = AdjRibInWriter.create(this.rib.getYangRibId(), this.peerRole, this.simpleRoutingPolicy, this.chain); + } + + // FIXME ListenableFuture should be used once closeServiceInstance uses wildcard too @Override - public synchronized void close() { - releaseConnection(); + public synchronized ListenableFuture close() { + final ListenableFuture future = releaseConnection(); this.chain.close(); + return future; } @Override - public void onMessage(final BGPSession session, final Notification msg) { + public void onMessage(final BGPSession session, final Notification msg) throws BGPDocumentedException { if (!(msg instanceof Update) && !(msg instanceof RouteRefresh)) { LOG.info("Ignoring unhandled message class {}", msg.getClass()); return; @@ -132,22 +174,48 @@ public class BGPPeer implements BGPSessionListener, Peer, AutoCloseable, BGPPeer final AdjRibOutListener listener = this.adjRibOutListenerSet.get(key); if (listener != null) { listener.close(); - this.adjRibOutListenerSet.remove(listener); - createAdjRibOutListener(RouterIds.createPeerId(session.getBgpId()), key, true); + this.adjRibOutListenerSet.remove(key); + createAdjRibOutListener(RouterIds.createPeerId(session.getBgpId()), key, listener.isMpSupported()); } else { LOG.info("Ignoring RouteRefresh message. Afi/Safi is not supported: {}, {}.", rrAfi, rrSafi); } } - private void onUpdateMessage(final Update message) { + /** + * Check for presence of well known mandatory attribute LOCAL_PREF in Update message + * + * @param message Update message + * @throws BGPDocumentedException + */ + private void checkMandatoryAttributesPresence(final Update message) throws BGPDocumentedException { + if (MessageUtil.isAnyNlriPresent(message)) { + final Attributes attrs = message.getAttributes(); + if (this.peerRole == PeerRole.Ibgp && (attrs == null || attrs.getLocalPref() == null)) { + throw new BGPDocumentedException(BGPError.MANDATORY_ATTR_MISSING_MSG + "LOCAL_PREF", + BGPError.WELL_KNOWN_ATTR_MISSING, + new byte[] { LocalPreferenceAttributeParser.TYPE }); + } + } + } + + /** + * Process Update message received. + * Calls {@link #checkMandatoryAttributesPresence(Update)} to check for presence of mandatory attributes. + * + * @param message Update message + * @throws BGPDocumentedException + */ + private void onUpdateMessage(final Update message) throws BGPDocumentedException { + checkMandatoryAttributesPresence(message); + // update AdjRibs final Attributes attrs = message.getAttributes(); MpReachNlri mpReach = null; final boolean isAnyNlriAnnounced = message.getNlri() != null; if (isAnyNlriAnnounced) { mpReach = prefixesToMpReach(message); - } else if (attrs != null && attrs.getAugmentation(Attributes1.class) != null) { - mpReach = attrs.getAugmentation(Attributes1.class).getMpReachNlri(); + } else { + mpReach = MessageUtil.getMpReachNlri(attrs); } if (mpReach != null) { this.ribWriter.updateRoutes(mpReach, nextHopToAttribute(attrs, mpReach)); @@ -155,8 +223,8 @@ public class BGPPeer implements BGPSessionListener, Peer, AutoCloseable, BGPPeer MpUnreachNlri mpUnreach = null; if (message.getWithdrawnRoutes() != null) { mpUnreach = prefixesToMpUnreach(message, isAnyNlriAnnounced); - } else if (attrs != null && attrs.getAugmentation(Attributes2.class) != null) { - mpUnreach = attrs.getAugmentation(Attributes2.class).getMpUnreachNlri(); + } else { + mpUnreach = MessageUtil.getMpUnreachNlri(attrs); } if (mpUnreach != null) { this.ribWriter.removeRoutes(mpUnreach); @@ -184,10 +252,10 @@ public class BGPPeer implements BGPSessionListener, Peer, AutoCloseable, BGPPeer prefixes.add(new Ipv4PrefixesBuilder().setPrefix(p).build()); } final MpReachNlriBuilder b = new MpReachNlriBuilder().setAfi(Ipv4AddressFamily.class).setSafi( - UnicastSubsequentAddressFamily.class).setAdvertizedRoutes( - new AdvertizedRoutesBuilder().setDestinationType( - new DestinationIpv4CaseBuilder().setDestinationIpv4( - new DestinationIpv4Builder().setIpv4Prefixes(prefixes).build()).build()).build()); + UnicastSubsequentAddressFamily.class).setAdvertizedRoutes( + new AdvertizedRoutesBuilder().setDestinationType( + new DestinationIpv4CaseBuilder().setDestinationIpv4( + new DestinationIpv4Builder().setIpv4Prefixes(prefixes).build()).build()).build()); if (message.getAttributes() != null) { b.setCNextHop(message.getAttributes().getCNextHop()); } @@ -215,42 +283,69 @@ public class BGPPeer implements BGPSessionListener, Peer, AutoCloseable, BGPPeer } return new MpUnreachNlriBuilder().setAfi(Ipv4AddressFamily.class).setSafi(UnicastSubsequentAddressFamily.class).setWithdrawnRoutes( new WithdrawnRoutesBuilder().setDestinationType( - new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationIpv4CaseBuilder().setDestinationIpv4( - new DestinationIpv4Builder().setIpv4Prefixes(prefixes).build()).build()).build()).build(); + new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationIpv4CaseBuilder().setDestinationIpv4( + new DestinationIpv4Builder().setIpv4Prefixes(prefixes).build()).build()).build()).build(); } @Override public synchronized void onSessionUp(final BGPSession session) { final List addPathTablesType = session.getAdvertisedAddPathTableTypes(); - LOG.info("Session with peer {} went up with tables {} and Add Path tables {}", this.name, addPathTablesType, - session.getAdvertisedAddPathTableTypes()); + final Set advertizedTableTypes = session.getAdvertisedTableTypes(); + LOG.info("Session with peer {} went up with tables {} and Add Path tables {}", this.name, advertizedTableTypes, addPathTablesType); this.session = session; + this.rawIdentifier = InetAddresses.forString(session.getBgpId().getValue()).getAddress(); final PeerId peerId = RouterIds.createPeerId(session.getBgpId()); - createAdjRibOutListener(peerId); - this.ribWriter = this.ribWriter.transform(peerId, this.rib.getRibSupportContext(), this.tables, addPathTablesType, false); - this.sessionEstablishedCounter++; + this.tables.addAll(advertizedTableTypes.stream().map(t -> new TablesKey(t.getAfi(), t.getSafi())).collect(Collectors.toList())); + final boolean announceNone = isAnnounceNone(this.simpleRoutingPolicy); + final Map addPathTableMaps = mapTableTypesFamilies(addPathTablesType); + this.peerIId = this.rib.getYangRibId().node(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.bgp.rib.rib.Peer.QNAME) + .node(IdentifierUtils.domPeerId(peerId)); + + if(!announceNone) { + createAdjRibOutListener(peerId); + } + this.tables.forEach(tablesKey -> { + final ExportPolicyPeerTracker exportTracker = this.rib.getExportPolicyPeerTracker(tablesKey); + if (exportTracker != null) { + this.tableRegistration.add(exportTracker.registerPeer(peerId, addPathTableMaps.get(tablesKey), this.peerIId, this.peerRole, + this.simpleRoutingPolicy)); + } + }); + addBgp4Support(peerId, announceNone); + + if(!isLearnNone(this.simpleRoutingPolicy)) { + this.effRibInWriter = EffectiveRibInWriter.create(this.rib.getService(), this.rib.createPeerChain(this), this.peerIId, + this.rib.getImportPolicyPeerTracker(), this.rib.getRibSupportContext(), this.peerRole, + this.peerStats.getEffectiveRibInRouteCounters(), this.peerStats.getAdjRibInRouteCounters()); + } + this.ribWriter = this.ribWriter.transform(peerId, this.rib.getRibSupportContext(), this.tables, addPathTableMaps); + + // register BGP Peer stats + this.peerStats.getSessionEstablishedCounter().increaseCount(); if (this.registrator != null) { this.runtimeReg = this.registrator.register(this); } - } - private void createAdjRibOutListener(final PeerId peerId) { - for (final BgpTableType t : this.session.getAdvertisedTableTypes()) { - final TablesKey key = new TablesKey(t.getAfi(), t.getSafi()); - if (this.tables.add(key)) { - createAdjRibOutListener(peerId, key, true); - } + if (this.rpcRegistry != null) { + this.rpcRegistration = this.rpcRegistry.addRoutedRpcImplementation(BgpPeerRpcService.class, new BgpPeerRpc(session, this.tables)); + final KeyedInstanceIdentifier path = + this.rib.getInstanceIdentifier().child(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.bgp.rib.rib.Peer.class, new PeerKey(peerId)); + this.rpcRegistration.registerPath(PeerContext.class, path); } - addBgp4Support(peerId); + this.rib.getRenderStats().getConnectedPeerCounter().increaseCount(); + } + + private void createAdjRibOutListener(final PeerId peerId) { + this.tables.forEach(key->createAdjRibOutListener(peerId, key, true)); } //try to add a support for old-school BGP-4, if peer did not advertise IPv4-Unicast MP capability - private void addBgp4Support(final PeerId peerId) { + private void addBgp4Support(final PeerId peerId, final boolean announceNone) { final TablesKey key = new TablesKey(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class); - if (this.tables.add(key)) { + if (this.tables.add(key) && !announceNone) { createAdjRibOutListener(peerId, key, false); } } @@ -261,18 +356,23 @@ public class BGPPeer implements BGPSessionListener, Peer, AutoCloseable, BGPPeer // not particularly nice if (context != null && this.session instanceof BGPSessionImpl) { this.adjRibOutListenerSet.put(key, AdjRibOutListener.create(peerId, key, this.rib.getYangRibId(), this.rib.getCodecsRegistry(), - context.getRibSupport(), ((RIBImpl) this.rib).getService(), ((BGPSessionImpl) this.session).getLimiter(), mpSupport)); + context.getRibSupport(), this.rib.getService(), ((BGPSessionImpl) this.session).getLimiter(), mpSupport, + this.peerStats.getAdjRibOutRouteCounters().init(key))); } } - private synchronized void cleanup() { + private ListenableFuture cleanup() { // FIXME: BUG-196: support graceful - for (final AdjRibOutListener adjRibOutListener : this.adjRibOutListenerSet.values()) { - adjRibOutListener.close(); - } + this.adjRibOutListenerSet.values().forEach(AdjRibOutListener::close); this.adjRibOutListenerSet.clear(); - this.ribWriter.removePeer(); + if (this.effRibInWriter != null) { + this.effRibInWriter.close(); + } this.tables.clear(); + if (this.ribWriter != null) { + return this.ribWriter.removePeer(); + } + return Futures.immediateFuture(null); } @Override @@ -308,19 +408,23 @@ public class BGPPeer implements BGPSessionListener, Peer, AutoCloseable, BGPPeer } @Override - public void releaseConnection() { - addPeerToDisconnectedSharedList(); - cleanup(); + public synchronized ListenableFuture releaseConnection() { + if (this.rpcRegistration != null) { + this.rpcRegistration.close(); + } + closeRegistration(); + final ListenableFuture future = cleanup(); dropConnection(); + return future; } - private void addPeerToDisconnectedSharedList() { - if(this.session != null) { - this.rib.getCacheDisconnectedPeers().insertDesconectedPeer(this.session.getBgpId()); + private void closeRegistration() { + for (final AbstractRegistration tableCloseable : this.tableRegistration) { + tableCloseable.close(); } + this.tableRegistration.clear(); } - @GuardedBy("this") private void dropConnection() { if (this.runtimeReg != null) { this.runtimeReg.close(); @@ -333,12 +437,9 @@ public class BGPPeer implements BGPSessionListener, Peer, AutoCloseable, BGPPeer LOG.warn("Error closing session with peer", e); } this.session = null; - } - } - @Override - public boolean isSessionActive() { - return this.session != null; + this.rib.getRenderStats().getConnectedPeerCounter().decreaseCount(); + } } @Override @@ -353,44 +454,31 @@ public class BGPPeer implements BGPSessionListener, Peer, AutoCloseable, BGPPeer @Override public void resetStats() { - if (this.session instanceof BGPSessionStatistics) { - ((BGPSessionStatistics) this.session).resetSessionStats(); + if (this.session instanceof BGPSessionStats) { + ((BGPSessionStats) this.session).resetBgpSessionStats(); } } - public synchronized void registerRootRuntimeBean(final BGPPeerRuntimeRegistrator registrator) { - this.registrator = registrator; - } - @Override public BgpSessionState getBgpSessionState() { - if (this.session instanceof BGPSessionStatistics) { - return ((BGPSessionStatistics) this.session).getBgpSesionState(); + if (this.session instanceof BGPSessionStats) { + return ((BGPSessionStats) this.session).getBgpSessionState(); } return new BgpSessionState(); } @Override public synchronized BgpPeerState getBgpPeerState() { - final BgpPeerState peerState = new BgpPeerState(); - final List routes = Lists.newArrayList(); - for (final TablesKey tablesKey : this.tables) { - final RouteTable routeTable = new RouteTable(); - routeTable.setTableType("afi=" + tablesKey.getAfi().getSimpleName() + ",safi=" + tablesKey.getSafi().getSimpleName()); - routeTable.setRoutesCount(this.rib.getRoutesCount(tablesKey)); - routes.add(routeTable); - } - peerState.setRouteTable(routes); - peerState.setSessionEstablishedCount(this.sessionEstablishedCounter); - return peerState; + return this.peerStats.getBgpPeerState(); } @Override public void onTransactionChainFailed(final TransactionChain chain, final AsyncTransaction transaction, final Throwable cause) { LOG.error("Transaction chain failed.", cause); - releaseConnection(); this.chain.close(); this.chain = this.rib.createPeerChain(this); + this.ribWriter = AdjRibInWriter.create(this.rib.getYangRibId(), this.peerRole, this.simpleRoutingPolicy, this.chain); + releaseConnection(); } @Override @@ -402,4 +490,9 @@ public class BGPPeer implements BGPSessionListener, Peer, AutoCloseable, BGPPeer public void markUptodate(final TablesKey tablesKey) { this.ribWriter.markTableUptodate(tablesKey); } + + private static Map mapTableTypesFamilies(final List addPathTablesType) { + return ImmutableMap.copyOf(addPathTablesType.stream().collect(Collectors.toMap(af -> new TablesKey(af.getAfi(), af.getSafi()), + BgpAddPathTableType::getSendReceive))); + } }