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%2FEffectiveRibInWriter.java;h=993b34f6938e3bbabb38eb5893491d7e3bd3dbf8;hb=0fdeddbe3d072a88428599421191f0f60b2864e4;hp=b657428940350a16de11268808ee22b85f5c38ad;hpb=26dda3a9a7c63da4c071d6ad80bcc268cd781cc8;p=bgpcep.git diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java index b657428940..993b34f693 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java @@ -9,10 +9,14 @@ package org.opendaylight.protocol.bgp.rib.impl; import static com.google.common.base.Verify.verify; import static java.util.Objects.requireNonNull; -import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.ADJRIBIN; -import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.EFFRIBIN; -import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.ROUTES; -import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.TABLES; +import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.ADJRIBIN_ATTRIBUTES_AID; +import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.ADJRIBIN_NID; +import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.ATTRIBUTES_NID; +import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.EFFRIBIN_NID; +import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.LLGR_STALE_NID; +import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.ROUTES_NID; +import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.TABLES_NID; +import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.UPTODATE_NID; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -28,16 +32,15 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.LongAdder; -import javax.annotation.Nonnull; -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.NotThreadSafe; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.dom.api.ClusteredDOMDataTreeChangeListener; -import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeService; -import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeIdentifier; -import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; -import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain; +import org.checkerframework.checker.lock.qual.GuardedBy; +import org.checkerframework.checker.lock.qual.Holding; import org.opendaylight.mdsal.common.api.CommitInfo; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.mdsal.dom.api.ClusteredDOMDataTreeChangeListener; +import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeService; +import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; +import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; +import org.opendaylight.mdsal.dom.api.DOMTransactionChain; import org.opendaylight.protocol.bgp.openconfig.spi.BGPTableTypeRegistryConsumer; import org.opendaylight.protocol.bgp.parser.impl.message.update.CommunityUtil; import org.opendaylight.protocol.bgp.rib.impl.spi.RIB; @@ -46,32 +49,38 @@ import org.opendaylight.protocol.bgp.rib.impl.spi.RIBSupportContextRegistry; import org.opendaylight.protocol.bgp.rib.impl.spi.RibOutRefresh; import org.opendaylight.protocol.bgp.rib.impl.state.peer.PrefixesInstalledCounters; import org.opendaylight.protocol.bgp.rib.impl.state.peer.PrefixesReceivedCounters; +import org.opendaylight.protocol.bgp.rib.spi.RIBNormalizedNodes; import org.opendaylight.protocol.bgp.rib.spi.RIBSupport; import org.opendaylight.protocol.bgp.rib.spi.policy.BGPRibRoutingPolicy; import org.opendaylight.protocol.bgp.rib.spi.policy.BGPRouteEntryImportParameters; import org.opendaylight.protocol.bgp.route.targetcontrain.spi.ClientRouteTargetContrainCache; import org.opendaylight.protocol.bgp.route.targetcontrain.spi.RouteTargetMembeshipUtil; import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.AfiSafiType; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.Communities; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.Attributes; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.attributes.Communities; 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.route.target.constrain.rev180618.RouteTargetConstrainSubsequentAddressFamily; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.route.target.constrain.rev180618.route.target.constrain.routes.route.target.constrain.routes.RouteTargetConstrainRoute; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.Ipv4AddressFamily; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.Ipv6AddressFamily; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.MplsLabeledVpnSubsequentAddressFamily; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.RouteTarget; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.Ipv4AddressFamily; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.Ipv6AddressFamily; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.MplsLabeledVpnSubsequentAddressFamily; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.RouteTarget; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; +import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; +import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; +import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; +import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType; +import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -87,8 +96,10 @@ import org.slf4j.LoggerFactory; * 2) check if a route is admissible based on attributes attached to it, as well as the * advertising peer's role * 3) output admitting routes with edited attributes into /bgp-rib/rib/peer/effective-rib-in/tables/routes + * + *

+ * This class is NOT thread-safe. */ -@NotThreadSafe final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesInstalledCounters, AutoCloseable, ClusteredDOMDataTreeChangeListener { @@ -100,9 +111,10 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn private static final ImmutableList STALE_LLGR_COMMUNUTIES = ImmutableList.of( StaleCommunities.STALE_LLGR); private static final Attributes STALE_LLGR_ATTRIBUTES = new org.opendaylight.yang.gen.v1.urn.opendaylight.params - .xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder() + .xml.ns.yang.bgp.message.rev200120.path.attributes.AttributesBuilder() .setCommunities(STALE_LLGR_COMMUNUTIES) .build(); + private static final ChoiceNode EMPTY_ROUTES = Builders.choiceBuilder().withNodeIdentifier(ROUTES_NID).build(); private final RIBSupportContextRegistry registry; private final YangInstanceIdentifier peerIId; @@ -134,7 +146,7 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn this.registry = requireNonNull(rib.getRibSupportContext()); this.chain = requireNonNull(chain); this.peerIId = requireNonNull(peerIId); - this.effRibTables = this.peerIId.node(EFFRIBIN); + this.effRibTables = this.peerIId.node(EFFRIBIN_NID); this.prefixesInstalled = buildPrefixesTables(tables); this.prefixesReceived = buildPrefixesTables(tables); this.ribPolicies = requireNonNull(rib.getRibPolicies()); @@ -148,7 +160,7 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn public void init() { final DOMDataTreeIdentifier treeId = new DOMDataTreeIdentifier(LogicalDatastoreType.OPERATIONAL, - this.peerIId.node(ADJRIBIN).node(TABLES)); + this.peerIId.node(ADJRIBIN_NID).node(TABLES_NID)); LOG.debug("Registered Effective RIB on {}", this.peerIId); this.reg = requireNonNull(this.service).registerDataTreeChangeListener(treeId, this); } @@ -160,14 +172,14 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn } @Override - public synchronized void onDataTreeChanged(@Nonnull final Collection changes) { + public synchronized void onDataTreeChanged(final Collection changes) { if (this.chain == null) { LOG.trace("Chain closed. Ignoring Changes : {}", changes); return; } LOG.trace("Data changed called to effective RIB. Change : {}", changes); - DOMDataWriteTransaction tx = null; + DOMDataTreeWriteTransaction tx = null; for (final DataTreeCandidate tc : changes) { final YangInstanceIdentifier rootPath = tc.getRootPath(); final DataTreeCandidateNode root = tc.getRootNode(); @@ -203,8 +215,62 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn } } - @GuardedBy("this") - private void changeDataTree(final DOMDataWriteTransaction tx, final YangInstanceIdentifier rootPath, + @Override + public synchronized void close() { + if (this.reg != null) { + this.reg.close(); + this.reg = null; + } + if (this.submitted != null) { + try { + this.submitted.get(); + } catch (final InterruptedException | ExecutionException throwable) { + LOG.error("Write routes failed", throwable); + } + } + if (this.chain != null) { + this.chain.close(); + this.chain = null; + } + this.prefixesReceived.values().forEach(LongAdder::reset); + this.prefixesInstalled.values().forEach(LongAdder::reset); + } + + @Override + public long getPrefixedReceivedCount(final TablesKey tablesKey) { + final LongAdder counter = this.prefixesReceived.get(tablesKey); + if (counter == null) { + return 0; + } + return counter.longValue(); + } + + @Override + public Set getTableKeys() { + return ImmutableSet.copyOf(this.prefixesReceived.keySet()); + } + + @Override + public boolean isSupported(final TablesKey tablesKey) { + return this.prefixesReceived.containsKey(tablesKey); + } + + @Override + public long getPrefixedInstalledCount(final TablesKey tablesKey) { + final LongAdder counter = this.prefixesInstalled.get(tablesKey); + if (counter == null) { + return 0; + } + return counter.longValue(); + } + + @Override + public long getTotalPrefixesInstalled() { + return this.prefixesInstalled.values().stream().mapToLong(LongAdder::longValue).sum(); + } + + @Holding("this") + private void changeDataTree(final DOMDataTreeWriteTransaction tx, final YangInstanceIdentifier rootPath, final DataTreeCandidateNode root, final DataTreeCandidateNode table) { final PathArgument lastArg = table.getIdentifier(); verify(lastArg instanceof NodeIdentifierWithPredicates, "Unexpected type %s in path %s", lastArg.getClass(), @@ -240,111 +306,149 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn } } - private void deleteTable(final DOMDataWriteTransaction tx, final RIBSupportContext ribContext, + private void deleteTable(final DOMDataTreeWriteTransaction tx, final RIBSupportContext ribContext, final YangInstanceIdentifier effectiveTablePath, final DataTreeCandidateNode table) { - processTableChildren(tx, ribContext.getRibSupport(), effectiveTablePath, table.getChildNodes()); LOG.debug("Delete Effective Table {}", effectiveTablePath); + onDeleteTable(ribContext.getRibSupport(), effectiveTablePath, table.getDataBefore()); tx.delete(LogicalDatastoreType.OPERATIONAL, effectiveTablePath); } - private void modifyTable(final DOMDataWriteTransaction tx, final RIBSupportContext ribContext, + private void modifyTable(final DOMDataTreeWriteTransaction tx, final RIBSupportContext ribContext, final YangInstanceIdentifier effectiveTablePath, final DataTreeCandidateNode table) { LOG.debug("Modify Effective Table {}", effectiveTablePath); - processTableChildren(tx, ribContext.getRibSupport(), effectiveTablePath, table.getChildNodes()); - } - private void writeTable(final DOMDataWriteTransaction tx, final RIBSupportContext ribContext, - final YangInstanceIdentifier effectiveTablePath, final DataTreeCandidateNode table) { - LOG.debug("Write Effective Table {}", effectiveTablePath); - ribContext.createEmptyTableStructure(tx, effectiveTablePath); - processTableChildren(tx, ribContext.getRibSupport(), effectiveTablePath, table.getChildNodes()); - } - - private void processTableChildren(final DOMDataWriteTransaction tx, final RIBSupport ribSupport, - final YangInstanceIdentifier effectiveTablePath, final Collection children) { - for (final DataTreeCandidateNode child : children) { - final PathArgument childIdentifier = child.getIdentifier(); - final ModificationType childModType = child.getModificationType(); - final Optional> childDataAfter = child.getDataAfter(); - LOG.debug("Process table {} type {}, dataAfter {}, dataBefore {}", childIdentifier, childModType, - childDataAfter, child.getDataBefore()); - final YangInstanceIdentifier routesPath = effectiveTablePath.node(childIdentifier); - switch (childModType) { + final boolean wasLongLivedStale = isLongLivedStaleTable(table.getDataBefore()); + final boolean longLivedStale = isLongLivedStaleTable(table.getDataAfter()); + if (wasLongLivedStale != longLivedStale) { + LOG.debug("LLGR_STALE flag flipped {}, overwriting table {}", longLivedStale ? "ON" : "OFF", + effectiveTablePath); + writeTable(tx, ribContext, effectiveTablePath, table); + return; + } + + table.getModifiedChild(ATTRIBUTES_NID).ifPresent(modifiedAttrs -> { + final YangInstanceIdentifier effAttrsPath = effectiveTablePath.node(ATTRIBUTES_NID); + final Optional> optAttrsAfter = modifiedAttrs.getDataAfter(); + if (optAttrsAfter.isPresent()) { + tx.put(LogicalDatastoreType.OPERATIONAL, effAttrsPath, effectiveAttributes( + NormalizedNodes.findNode(optAttrsAfter.get(), UPTODATE_NID))); + } else { + tx.delete(LogicalDatastoreType.OPERATIONAL, effAttrsPath); + } + }); + + table.getModifiedChild(ROUTES_NID).ifPresent(modifiedRoutes -> { + final RIBSupport ribSupport = ribContext.getRibSupport(); + switch (modifiedRoutes.getModificationType()) { + case APPEARED: + case WRITE: + deleteRoutesBefore(tx, ribSupport, effectiveTablePath, modifiedRoutes); + // XXX: YANG Tools seems to have an issue stacking DELETE with child WRITE + tx.put(LogicalDatastoreType.OPERATIONAL, effectiveTablePath.node(ROUTES_NID), EMPTY_ROUTES); + writeRoutesAfter(tx, ribSupport, effectiveTablePath, modifiedRoutes.getDataAfter(), longLivedStale); + break; case DELETE: case DISAPPEARED: - processTableChildrenDelete(child, childIdentifier, tx, ribSupport, routesPath); - break; - case UNMODIFIED: - // No-op + deleteRoutesBefore(tx, ribSupport, effectiveTablePath, modifiedRoutes); + tx.delete(LogicalDatastoreType.OPERATIONAL, effectiveTablePath.node(ROUTES_NID)); break; case SUBTREE_MODIFIED: - processModifiedRouteTables(child, childIdentifier, tx, ribSupport, routesPath, childDataAfter); - break; - case APPEARED: - case WRITE: - writeRouteTables(child, childIdentifier, tx, ribSupport, routesPath, childDataAfter); + for (DataTreeCandidateNode modifiedRoute : ribSupport.changedRoutes(modifiedRoutes)) { + processRoute(tx, ribSupport, effectiveTablePath, modifiedRoute, longLivedStale); + } break; + case UNMODIFIED: + // No-op + return; default: - LOG.warn("Ignoring unhandled child {}", child); + LOG.warn("Ignoring modified routes {}", modifiedRoutes); break; } - } + }); } - private void processTableChildrenDelete(final DataTreeCandidateNode child, final PathArgument childIdentifier, - final DOMDataWriteTransaction tx, final RIBSupport ribSupport, - final YangInstanceIdentifier routesPath) { - if (ROUTES.equals(childIdentifier)) { - for (final DataTreeCandidateNode route : ribSupport.changedRoutes(child)) { - final Optional> routeBefore = route.getDataBefore(); - if (routeBefore.isPresent()) { - final YangInstanceIdentifier routePath = ribSupport.routePath(routesPath, route.getIdentifier()); - handleRouteTarget(ModificationType.DELETE, ribSupport, routePath, routeBefore.get()); - final TablesKey tablesKey = ribSupport.getTablesKey(); - CountersUtil.decrement(this.prefixesInstalled.get(tablesKey), tablesKey); - } + private void writeTable(final DOMDataTreeWriteTransaction tx, final RIBSupportContext ribContext, + final YangInstanceIdentifier effectiveTablePath, final DataTreeCandidateNode table) { + LOG.debug("Write Effective Table {}", effectiveTablePath); + onDeleteTable(ribContext.getRibSupport(), effectiveTablePath, table.getDataBefore()); + + final Optional> maybeTableAfter = table.getDataAfter(); + if (maybeTableAfter.isPresent()) { + final MapEntryNode tableAfter = extractMapEntry(maybeTableAfter); + ribContext.createEmptyTableStructure(tx, effectiveTablePath); + + final Optional> maybeAttrsAfter = tableAfter.getChild(ATTRIBUTES_NID); + final boolean longLivedStale; + if (maybeAttrsAfter.isPresent()) { + final ContainerNode attrsAfter = extractContainer(maybeAttrsAfter); + longLivedStale = isLongLivedStale(attrsAfter); + tx.put(LogicalDatastoreType.OPERATIONAL, effectiveTablePath.node(ATTRIBUTES_NID), + effectiveAttributes(attrsAfter.getChild(UPTODATE_NID))); + } else { + longLivedStale = false; } + + writeRoutesAfter(tx, ribContext.getRibSupport(), effectiveTablePath, + NormalizedNodes.findNode(tableAfter, ROUTES_NID), longLivedStale); } - tx.delete(LogicalDatastoreType.OPERATIONAL, routesPath); } - private void processModifiedRouteTables(final DataTreeCandidateNode child, final PathArgument childIdentifier, - final DOMDataWriteTransaction tx, final RIBSupport ribSupport, - final YangInstanceIdentifier routesPath, final Optional> childDataAfter) { - if (ROUTES.equals(childIdentifier)) { - for (final DataTreeCandidateNode route : ribSupport.changedRoutes(child)) { - processRoute(tx, ribSupport, routesPath.getParent(), route); + // Performs house-keeping when the contents of a table is deleted + private void onDeleteTable(final RIBSupport ribSupport, final YangInstanceIdentifier effectiveTablePath, + final Optional> tableBefore) { + // Routes are special in that we need to process the to keep our counters accurate + final Optional> maybeRoutesBefore = findRoutesMap(ribSupport, + NormalizedNodes.findNode(tableBefore, ROUTES_NID)); + if (maybeRoutesBefore.isPresent()) { + onRoutesDeleted(ribSupport, effectiveTablePath, extractMap(maybeRoutesBefore).getValue()); + } + } + + private void deleteRoutesBefore(final DOMDataTreeWriteTransaction tx, final RIBSupport ribSupport, + final YangInstanceIdentifier effectiveTablePath, final DataTreeCandidateNode modifiedRoutes) { + final Optional> maybeRoutesBefore = NormalizedNodes.findNode( + modifiedRoutes.getDataBefore(), ribSupport.relativeRoutesPath()); + if (maybeRoutesBefore.isPresent()) { + onRoutesDeleted(ribSupport, effectiveTablePath, extractMap(maybeRoutesBefore).getValue()); + } + } + + private void writeRoutesAfter(final DOMDataTreeWriteTransaction tx, final RIBSupport ribSupport, + final YangInstanceIdentifier effectiveTablePath, final Optional> routesAfter, + final boolean longLivedStale) { + final Optional> maybeRoutesAfter = NormalizedNodes.findNode(routesAfter, + ribSupport.relativeRoutesPath()); + if (maybeRoutesAfter.isPresent()) { + final YangInstanceIdentifier routesPath = routeMapPath(ribSupport, effectiveTablePath); + for (MapEntryNode routeAfter : extractMap(maybeRoutesAfter).getValue()) { + writeRoute(tx, ribSupport, routesPath.node(routeAfter.getIdentifier()), Optional.empty(), routeAfter, + longLivedStale); } - } else { - tx.put(LogicalDatastoreType.OPERATIONAL, routesPath, childDataAfter.get()); } } - private void writeRouteTables(final DataTreeCandidateNode child, final PathArgument childIdentifier, - final DOMDataWriteTransaction tx, final RIBSupport ribSupport, - final YangInstanceIdentifier routesPath, final Optional> childDataAfter) { - if (ROUTES.equals(childIdentifier)) { - final Collection changedRoutes = ribSupport.changedRoutes(child); - if (!changedRoutes.isEmpty()) { - tx.put(LogicalDatastoreType.OPERATIONAL, routesPath, childDataAfter.get()); - // Routes are special, as they may end up being filtered. The previous put conveniently - // ensured that we have them in at target, so a subsequent delete will not fail :) - for (final DataTreeCandidateNode route : changedRoutes) { - processRoute(tx, ribSupport, routesPath.getParent(), route); - } + private void onRoutesDeleted(final RIBSupport ribSupport, + final YangInstanceIdentifier effectiveTablePath, final Collection deletedRoutes) { + if (ribSupport.getSafi() == RouteTargetConstrainSubsequentAddressFamily.class) { + final YangInstanceIdentifier routesPath = routeMapPath(ribSupport, effectiveTablePath); + for (final MapEntryNode routeBefore : deletedRoutes) { + deleteRouteTarget(ribSupport, routesPath.node(routeBefore.getIdentifier()), routeBefore); } + this.rtMembershipsUpdated = true; } + + final TablesKey tablesKey = ribSupport.getTablesKey(); + CountersUtil.add(prefixesInstalled.get(tablesKey), tablesKey, -deletedRoutes.size()); } - private void processRoute(final DOMDataWriteTransaction tx, final RIBSupport ribSupport, - final YangInstanceIdentifier routesPath, final DataTreeCandidateNode route) { + private void processRoute(final DOMDataTreeWriteTransaction tx, final RIBSupport ribSupport, + final YangInstanceIdentifier routesPath, final DataTreeCandidateNode route, final boolean longLivedStale) { LOG.debug("Process route {}", route.getIdentifier()); final YangInstanceIdentifier routePath = ribSupport.routePath(routesPath, route.getIdentifier()); - final TablesKey tablesKey = ribSupport.getTablesKey(); switch (route.getModificationType()) { case DELETE: case DISAPPEARED: - deleteRoute(tx, ribSupport, routePath, route.getDataBefore().orElse(null), tablesKey); + deleteRoute(tx, ribSupport, routePath, route.getDataBefore().orElse(null)); break; case UNMODIFIED: // No-op @@ -352,44 +456,8 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn case APPEARED: case SUBTREE_MODIFIED: case WRITE: - CountersUtil.increment(this.prefixesReceived.get(tablesKey), tablesKey); - // Lookup per-table attributes from RIBSupport - final ContainerNode advertisedAttrs = (ContainerNode) NormalizedNodes.findNode(route.getDataAfter(), - ribSupport.routeAttributesIdentifier()).orElse(null); - final Attributes routeAttrs = ribSupport.attributeFromContainerNode(advertisedAttrs); - final Optional optEffAtt; - // In case we want to add LLGR_STALE we do not process route through policies since it may be - // considered as received with LLGR_STALE from peer which is not true. - final boolean longLivedStale = false; - if (longLivedStale) { - // LLGR procedures are in effect. If the route is tagged with NO_LLGR, it needs to be removed. - final List effCommunities = routeAttrs.getCommunities(); - if (effCommunities != null && effCommunities.contains(CommunityUtil.NO_LLGR)) { - deleteRoute(tx, ribSupport, routePath, route.getDataBefore().orElse(null), tablesKey); - return; - } - optEffAtt = Optional.of(wrapLongLivedStale(routeAttrs)); - } else { - final Class afiSafiType - = tableTypeRegistry.getAfiSafiType(ribSupport.getTablesKey()).get(); - optEffAtt = this.ribPolicies - .applyImportPolicies(this.peerImportParameters, routeAttrs, afiSafiType); - } - if (!optEffAtt.isPresent()) { - deleteRoute(tx, ribSupport, routePath, route.getDataBefore().orElse(null), tablesKey); - return; - } - final NormalizedNode routeChanged = route.getDataAfter().get(); - handleRouteTarget(ModificationType.WRITE, ribSupport, routePath, routeChanged); - tx.put(LogicalDatastoreType.OPERATIONAL, routePath, routeChanged); - CountersUtil.increment(this.prefixesInstalled.get(tablesKey), tablesKey); - - final YangInstanceIdentifier attPath = routePath.node(ribSupport.routeAttributesIdentifier()); - final Attributes attToStore = optEffAtt.get(); - if(!attToStore.equals(routeAttrs)) { - final ContainerNode finalAttribute = ribSupport.attributeToContainerNode(attPath, attToStore); - tx.put(LogicalDatastoreType.OPERATIONAL, attPath, finalAttribute); - } + writeRoute(tx, ribSupport, routePath, route.getDataBefore(), route.getDataAfter().get(), + longLivedStale); break; default: LOG.warn("Ignoring unhandled route {}", route); @@ -397,30 +465,87 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn } } - private void deleteRoute(final DOMDataWriteTransaction tx, final RIBSupport ribSupport, - final YangInstanceIdentifier routeIdPath, final NormalizedNode route, final TablesKey tablesKey) { + private void deleteRoute(final DOMDataTreeWriteTransaction tx, final RIBSupport ribSupport, + final YangInstanceIdentifier routeIdPath, final NormalizedNode route) { handleRouteTarget(ModificationType.DELETE, ribSupport, routeIdPath, route); tx.delete(LogicalDatastoreType.OPERATIONAL, routeIdPath); LOG.debug("Route deleted. routeId={}", routeIdPath); + final TablesKey tablesKey = ribSupport.getTablesKey(); CountersUtil.decrement(this.prefixesInstalled.get(tablesKey), tablesKey); } + private void writeRoute(final DOMDataTreeWriteTransaction tx, final RIBSupport ribSupport, + final YangInstanceIdentifier routePath, final Optional> routeBefore, + final NormalizedNode routeAfter, final boolean longLivedStale) { + final TablesKey tablesKey = ribSupport.getTablesKey(); + CountersUtil.increment(this.prefixesReceived.get(tablesKey), tablesKey); + // Lookup per-table attributes from RIBSupport + final ContainerNode advertisedAttrs = (ContainerNode) NormalizedNodes.findNode(routeAfter, + ribSupport.routeAttributesIdentifier()).orElse(null); + final Attributes routeAttrs = ribSupport.attributeFromContainerNode(advertisedAttrs); + final Optional optEffAtt; + // In case we want to add LLGR_STALE we do not process route through policies since it may be + // considered as received with LLGR_STALE from peer which is not true. + if (longLivedStale) { + // LLGR procedures are in effect. If the route is tagged with NO_LLGR, it needs to be removed. + final List effCommunities = routeAttrs.getCommunities(); + if (effCommunities != null && effCommunities.contains(CommunityUtil.NO_LLGR)) { + deleteRoute(tx, ribSupport, routePath, routeBefore.orElse(null)); + return; + } + optEffAtt = Optional.of(wrapLongLivedStale(routeAttrs)); + } else { + final Class afiSafiType + = tableTypeRegistry.getAfiSafiType(ribSupport.getTablesKey()).get(); + optEffAtt = this.ribPolicies + .applyImportPolicies(this.peerImportParameters, routeAttrs, afiSafiType); + } + if (!optEffAtt.isPresent()) { + deleteRoute(tx, ribSupport, routePath, routeBefore.orElse(null)); + return; + } + handleRouteTarget(ModificationType.WRITE, ribSupport, routePath, routeAfter); + tx.put(LogicalDatastoreType.OPERATIONAL, routePath, routeAfter); + CountersUtil.increment(this.prefixesInstalled.get(tablesKey), tablesKey); + + final YangInstanceIdentifier attPath = routePath.node(ribSupport.routeAttributesIdentifier()); + final Attributes attToStore = optEffAtt.get(); + if (!attToStore.equals(routeAttrs)) { + final ContainerNode finalAttribute = ribSupport.attributeToContainerNode(attPath, attToStore); + tx.put(LogicalDatastoreType.OPERATIONAL, attPath, finalAttribute); + } + } + + private void addRouteTarget(final RouteTargetConstrainRoute rtc) { + final RouteTarget rtMembership = RouteTargetMembeshipUtil.getRT(rtc); + if (PeerRole.Ebgp != this.peerImportParameters.getFromPeerRole()) { + this.rtCache.cacheRoute(rtc); + } + this.rtMemberships.add(rtMembership); + } + + private void deleteRouteTarget(final RIBSupport ribSupport, final YangInstanceIdentifier routeIdPath, + final NormalizedNode route) { + deleteRouteTarget((RouteTargetConstrainRoute) ribSupport.fromNormalizedNode(routeIdPath, route)); + } + + private void deleteRouteTarget(final RouteTargetConstrainRoute rtc) { + final RouteTarget rtMembership = RouteTargetMembeshipUtil.getRT(rtc); + if (PeerRole.Ebgp != this.peerImportParameters.getFromPeerRole()) { + this.rtCache.uncacheRoute(rtc); + } + this.rtMemberships.remove(rtMembership); + } + private void handleRouteTarget(final ModificationType modificationType, final RIBSupport ribSupport, final YangInstanceIdentifier routeIdPath, final NormalizedNode route) { if (ribSupport.getSafi() == RouteTargetConstrainSubsequentAddressFamily.class) { final RouteTargetConstrainRoute rtc = (RouteTargetConstrainRoute) ribSupport.fromNormalizedNode(routeIdPath, route); - final RouteTarget rtMembership = RouteTargetMembeshipUtil.getRT(rtc); if (ModificationType.DELETE == modificationType) { - if (PeerRole.Ebgp != this.peerImportParameters.getFromPeerRole()) { - this.rtCache.uncacheRoute(rtc); - } - this.rtMemberships.remove(rtMembership); + deleteRouteTarget(rtc); } else { - if (PeerRole.Ebgp != this.peerImportParameters.getFromPeerRole()) { - this.rtCache.cacheRoute(rtc); - } - this.rtMemberships.add(rtMembership); + addRouteTarget(rtc); } this.rtMembershipsUpdated = true; } @@ -443,65 +568,66 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn newCommunities = STALE_LLGR_COMMUNUTIES; } - return new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329 + return new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120 .path.attributes.AttributesBuilder(attrs).setCommunities(newCommunities).build(); } + // XXX: this should be moved to YangInstanceIdentifier at some point + private static YangInstanceIdentifier concat(final YangInstanceIdentifier parent, final List args) { + YangInstanceIdentifier ret = parent; + for (PathArgument arg : args) { + ret = ret.node(arg); + } + return ret; + } + private YangInstanceIdentifier effectiveTablePath(final NodeIdentifierWithPredicates tableKey) { - return this.effRibTables.node(TABLES).node(tableKey); + return this.effRibTables.node(TABLES_NID).node(tableKey); } - @Override - public synchronized void close() { - if (this.reg != null) { - this.reg.close(); - this.reg = null; - } - if (this.submitted != null) { - try { - this.submitted.get(); - } catch (final InterruptedException | ExecutionException throwable) { - LOG.error("Write routes failed", throwable); - } - } - if (this.chain != null) { - this.chain.close(); - this.chain = null; - } - this.prefixesReceived.values().forEach(LongAdder::reset); - this.prefixesInstalled.values().forEach(LongAdder::reset); + private static YangInstanceIdentifier routeMapPath(final RIBSupport ribSupport, + final YangInstanceIdentifier tablePath) { + return concat(tablePath.node(ROUTES_NID), ribSupport.relativeRoutesPath()); } - @Override - public long getPrefixedReceivedCount(final TablesKey tablesKey) { - final LongAdder counter = this.prefixesReceived.get(tablesKey); - if (counter == null) { - return 0; - } - return counter.longValue(); + private static Optional> findRoutesMap(final RIBSupport ribSupport, + final Optional> optRoutes) { + return NormalizedNodes.findNode(optRoutes, ribSupport.relativeRoutesPath()); } - @Override - public Set getTableKeys() { - return ImmutableSet.copyOf(this.prefixesReceived.keySet()); + private static ContainerNode extractContainer(final Optional> optNode) { + final NormalizedNode node = optNode.get(); + verify(node instanceof ContainerNode, "Expected ContainerNode, got %s", node); + return (ContainerNode) node; } - @Override - public boolean isSupported(final TablesKey tablesKey) { - return this.prefixesReceived.containsKey(tablesKey); + private static MapNode extractMap(final Optional> optNode) { + final NormalizedNode node = optNode.get(); + verify(node instanceof MapNode, "Expected MapNode, got %s", node); + return (MapNode) node; } - @Override - public long getPrefixedInstalledCount(final TablesKey tablesKey) { - final LongAdder counter = this.prefixesInstalled.get(tablesKey); - if (counter == null) { - return 0; - } - return counter.longValue(); + private static MapEntryNode extractMapEntry(final Optional> optNode) { + final NormalizedNode node = optNode.get(); + verify(node instanceof MapEntryNode, "Expected MapEntryNode, got %s", node); + return (MapEntryNode) node; } - @Override - public long getTotalPrefixesInstalled() { - return this.prefixesInstalled.values().stream().mapToLong(LongAdder::longValue).sum(); + private static boolean isLongLivedStale(final ContainerNode attributes) { + return NormalizedNodes.findNode(attributes, ADJRIBIN_ATTRIBUTES_AID, LLGR_STALE_NID).isPresent(); + } + + private static boolean isLongLivedStaleTable(final Optional> optTable) { + final Optional> optAttributes = NormalizedNodes.findNode(optTable, ATTRIBUTES_NID); + return optAttributes.isPresent() ? isLongLivedStale(extractContainer(optAttributes)) : false; + } + + private static ContainerNode effectiveAttributes(final Optional> optUptodate) { + return optUptodate.map(leaf -> { + final Object value = leaf.getValue(); + verify(value instanceof Boolean, "Expected boolean uptodate, got %s", value); + return ((Boolean) value).booleanValue() ? RIBNormalizedNodes.UPTODATE_ATTRIBUTES + : RIBNormalizedNodes.NOT_UPTODATE_ATTRIBUTES; + }).orElse(RIBNormalizedNodes.NOT_UPTODATE_ATTRIBUTES); } }