Clean up RibSupport registration
[bgpcep.git] / bgp / rib-impl / src / main / java / org / opendaylight / protocol / bgp / rib / impl / EffectiveRibInWriter.java
index b657428940350a16de11268808ee22b85f5c38ad..3e89777836aaa35c9fbbde4c84768d406bf168aa 100644 (file)
@@ -8,11 +8,16 @@
 package org.opendaylight.protocol.bgp.rib.impl;
 
 import static com.google.common.base.Verify.verify;
+import static com.google.common.base.Verify.verifyNotNull;
 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 +33,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 +50,37 @@ 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.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidate;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidateNode;
+import org.opendaylight.yangtools.yang.data.tree.api.ModificationType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -87,22 +96,25 @@ 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
+ *
+ * <p>
+ * This class is NOT thread-safe.
  */
-@NotThreadSafe
 final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesInstalledCounters,
         AutoCloseable, ClusteredDOMDataTreeChangeListener {
 
     private static final Logger LOG = LoggerFactory.getLogger(EffectiveRibInWriter.class);
-    private static final TablesKey IVP4_VPN_TABLE_KEY = new TablesKey(Ipv4AddressFamily.class,
-            MplsLabeledVpnSubsequentAddressFamily.class);
-    private static final TablesKey IVP6_VPN_TABLE_KEY = new TablesKey(Ipv6AddressFamily.class,
-            MplsLabeledVpnSubsequentAddressFamily.class);
-    private static final ImmutableList<Communities> STALE_LLGR_COMMUNUTIES = ImmutableList.of(
-        StaleCommunities.STALE_LLGR);
+    private static final TablesKey IVP4_VPN_TABLE_KEY =
+        new TablesKey(Ipv4AddressFamily.VALUE, MplsLabeledVpnSubsequentAddressFamily.VALUE);
+    private static final TablesKey IVP6_VPN_TABLE_KEY =
+        new TablesKey(Ipv6AddressFamily.VALUE, MplsLabeledVpnSubsequentAddressFamily.VALUE);
+    private static final ImmutableList<Communities> 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;
@@ -131,26 +143,26 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn
             final BGPTableTypeRegistryConsumer tableTypeRegistry,
             final List<RouteTarget> rtMemberships,
             final ClientRouteTargetContrainCache rtCache) {
-        this.registry = requireNonNull(rib.getRibSupportContext());
+        registry = requireNonNull(rib.getRibSupportContext());
         this.chain = requireNonNull(chain);
         this.peerIId = requireNonNull(peerIId);
-        this.effRibTables = this.peerIId.node(EFFRIBIN);
-        this.prefixesInstalled = buildPrefixesTables(tables);
-        this.prefixesReceived = buildPrefixesTables(tables);
-        this.ribPolicies = requireNonNull(rib.getRibPolicies());
-        this.service = requireNonNull(rib.getService());
+        effRibTables = this.peerIId.node(EFFRIBIN_NID);
+        prefixesInstalled = buildPrefixesTables(tables);
+        prefixesReceived = buildPrefixesTables(tables);
+        ribPolicies = requireNonNull(rib.getRibPolicies());
+        service = requireNonNull(rib.getService());
         this.tableTypeRegistry = requireNonNull(tableTypeRegistry);
-        this.peerImportParameters = peer;
+        peerImportParameters = peer;
         this.rtMemberships = rtMemberships;
         this.rtCache = rtCache;
-        this.vpnTableRefresher = rib;
+        vpnTableRefresher = rib;
     }
 
     public void init() {
         final DOMDataTreeIdentifier treeId = new DOMDataTreeIdentifier(LogicalDatastoreType.OPERATIONAL,
-            this.peerIId.node(ADJRIBIN).node(TABLES));
-        LOG.debug("Registered Effective RIB on {}", this.peerIId);
-        this.reg = requireNonNull(this.service).registerDataTreeChangeListener(treeId, this);
+            peerIId.node(ADJRIBIN_NID).node(TABLES_NID));
+        LOG.debug("Registered Effective RIB on {}", peerIId);
+        reg = requireNonNull(service).registerDataTreeChangeListener(treeId, this);
     }
 
     private static Map<TablesKey, LongAdder> buildPrefixesTables(final Set<TablesKey> tables) {
@@ -160,20 +172,25 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn
     }
 
     @Override
-    public synchronized void onDataTreeChanged(@Nonnull final Collection<DataTreeCandidate> changes) {
-        if (this.chain == null) {
+    public synchronized void onInitialData() {
+        // FIXME: update as if root was deleted
+    }
+
+    @Override
+    public synchronized void onDataTreeChanged(final List<DataTreeCandidate> changes) {
+        if (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();
             for (final DataTreeCandidateNode table : root.getChildNodes()) {
                 if (tx == null) {
-                    tx = this.chain.newWriteOnlyTransaction();
+                    tx = chain.newWriteOnlyTransaction();
                 }
                 changeDataTree(tx, rootPath, root, table);
             }
@@ -181,7 +198,7 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn
 
         if (tx != null) {
             final FluentFuture<? extends CommitInfo> future = tx.commit();
-            this.submitted = future;
+            submitted = future;
             future.addCallback(new FutureCallback<CommitInfo>() {
                 @Override
                 public void onSuccess(final CommitInfo result) {
@@ -196,21 +213,75 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn
         }
 
         //Refresh VPN Table if RT Memberships were updated
-        if (this.rtMembershipsUpdated) {
-            this.vpnTableRefresher.refreshTable(IVP4_VPN_TABLE_KEY, this.peerImportParameters.getFromPeerId());
-            this.vpnTableRefresher.refreshTable(IVP6_VPN_TABLE_KEY, this.peerImportParameters.getFromPeerId());
-            this.rtMembershipsUpdated = false;
+        if (rtMembershipsUpdated) {
+            vpnTableRefresher.refreshTable(IVP4_VPN_TABLE_KEY, peerImportParameters.getFromPeerId());
+            vpnTableRefresher.refreshTable(IVP6_VPN_TABLE_KEY, peerImportParameters.getFromPeerId());
+            rtMembershipsUpdated = false;
         }
     }
 
-    @GuardedBy("this")
-    private void changeDataTree(final DOMDataWriteTransaction tx, final YangInstanceIdentifier rootPath,
+    @Override
+    public synchronized void close() {
+        if (reg != null) {
+            reg.close();
+            reg = null;
+        }
+        if (submitted != null) {
+            try {
+                submitted.get();
+            } catch (final InterruptedException | ExecutionException throwable) {
+                LOG.error("Write routes failed", throwable);
+            }
+        }
+        if (chain != null) {
+            chain.close();
+            chain = null;
+        }
+        prefixesReceived.values().forEach(LongAdder::reset);
+        prefixesInstalled.values().forEach(LongAdder::reset);
+    }
+
+    @Override
+    public long getPrefixedReceivedCount(final TablesKey tablesKey) {
+        final LongAdder counter = prefixesReceived.get(tablesKey);
+        if (counter == null) {
+            return 0;
+        }
+        return counter.longValue();
+    }
+
+    @Override
+    public Set<TablesKey> getTableKeys() {
+        return ImmutableSet.copyOf(prefixesReceived.keySet());
+    }
+
+    @Override
+    public boolean isSupported(final TablesKey tablesKey) {
+        return prefixesReceived.containsKey(tablesKey);
+    }
+
+    @Override
+    public long getPrefixedInstalledCount(final TablesKey tablesKey) {
+        final LongAdder counter = prefixesInstalled.get(tablesKey);
+        if (counter == null) {
+            return 0;
+        }
+        return counter.longValue();
+    }
+
+    @Override
+    public long getTotalPrefixesInstalled() {
+        return 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(),
             rootPath);
         final NodeIdentifierWithPredicates tableKey = (NodeIdentifierWithPredicates) lastArg;
-        final RIBSupportContext ribContext = this.registry.getRIBSupportContext(tableKey);
+        final RIBSupportContext ribContext = registry.getRIBSupportContext(tableKey);
         if (ribContext == null) {
             LOG.warn("Table {} is not supported, ignoring event", tableKey);
             return;
@@ -240,111 +311,151 @@ 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<DataTreeCandidateNode> children) {
-        for (final DataTreeCandidateNode child : children) {
-            final PathArgument childIdentifier = child.getIdentifier();
-            final ModificationType childModType = child.getModificationType();
-            final Optional<NormalizedNode<?, ?>> 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<NormalizedNode> optAttrsAfter = modifiedAttrs.getDataAfter();
+            if (optAttrsAfter.isPresent()) {
+                tx.put(LogicalDatastoreType.OPERATIONAL, effAttrsPath,
+                    effectiveAttributes(extractContainer(optAttrsAfter.orElseThrow())));
+            } 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<NormalizedNode<?, ?>> 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<NormalizedNode> maybeTableAfter = table.getDataAfter();
+        if (maybeTableAfter.isPresent()) {
+            final NormalizedNode node = maybeTableAfter.orElseThrow();
+            verify(node instanceof MapEntryNode, "Expected MapEntryNode, got %s", node);
+            final MapEntryNode tableAfter = (MapEntryNode) node;
+            ribContext.createEmptyTableStructure(tx, effectiveTablePath);
+
+            final DataContainerChild maybeAttrsAfter = tableAfter.childByArg(ATTRIBUTES_NID);
+            final boolean longLivedStale;
+            if (maybeAttrsAfter != null) {
+                final ContainerNode attrsAfter = extractContainer(maybeAttrsAfter);
+                longLivedStale = isLongLivedStale(attrsAfter);
+                tx.put(LogicalDatastoreType.OPERATIONAL, effectiveTablePath.node(ATTRIBUTES_NID),
+                    effectiveAttributes(attrsAfter));
+            } 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<NormalizedNode<?, ?>> 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<NormalizedNode> tableBefore) {
+        // Routes are special in that we need to process the to keep our counters accurate
+        final Optional<NormalizedNode> maybeRoutesBefore = findRoutesMap(ribSupport,
+                NormalizedNodes.findNode(tableBefore, ROUTES_NID));
+        if (maybeRoutesBefore.isPresent()) {
+            onRoutesDeleted(ribSupport, effectiveTablePath, extractMap(maybeRoutesBefore).body());
+        }
+    }
+
+    private void deleteRoutesBefore(final DOMDataTreeWriteTransaction tx, final RIBSupport<?, ?> ribSupport,
+            final YangInstanceIdentifier effectiveTablePath, final DataTreeCandidateNode modifiedRoutes) {
+        final Optional<NormalizedNode> maybeRoutesBefore = NormalizedNodes.findNode(
+            modifiedRoutes.getDataBefore(), ribSupport.relativeRoutesPath());
+        if (maybeRoutesBefore.isPresent()) {
+            onRoutesDeleted(ribSupport, effectiveTablePath, extractMap(maybeRoutesBefore).body());
+        }
+    }
+
+    private void writeRoutesAfter(final DOMDataTreeWriteTransaction tx, final RIBSupport<?, ?> ribSupport,
+            final YangInstanceIdentifier effectiveTablePath, final Optional<NormalizedNode> routesAfter,
+            final boolean longLivedStale) {
+        final Optional<NormalizedNode> maybeRoutesAfter = NormalizedNodes.findNode(routesAfter,
+            ribSupport.relativeRoutesPath());
+        if (maybeRoutesAfter.isPresent()) {
+            final YangInstanceIdentifier routesPath = routeMapPath(ribSupport, effectiveTablePath);
+            for (MapEntryNode routeAfter : extractMap(maybeRoutesAfter).body()) {
+                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<NormalizedNode<?, ?>> childDataAfter) {
-        if (ROUTES.equals(childIdentifier)) {
-            final Collection<DataTreeCandidateNode> 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<MapEntryNode> deletedRoutes) {
+        if (RouteTargetConstrainSubsequentAddressFamily.VALUE.equals(ribSupport.getTablesKey().getSafi())) {
+            final YangInstanceIdentifier routesPath = routeMapPath(ribSupport, effectiveTablePath);
+            for (final MapEntryNode routeBefore : deletedRoutes) {
+                deleteRouteTarget(ribSupport, routesPath.node(routeBefore.getIdentifier()), routeBefore);
             }
+            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 +463,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<Attributes> 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<Communities> 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<? extends AfiSafiType> 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().orElseThrow(),
+                    longLivedStale);
                 break;
             default:
                 LOG.warn("Ignoring unhandled route {}", route);
@@ -397,32 +472,86 @@ 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);
-        CountersUtil.decrement(this.prefixesInstalled.get(tablesKey), tablesKey);
+        final TablesKey tablesKey = ribSupport.getTablesKey();
+        CountersUtil.decrement(prefixesInstalled.get(tablesKey), tablesKey);
     }
 
-    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);
+    private void writeRoute(final DOMDataTreeWriteTransaction tx, final RIBSupport<?, ?> ribSupport,
+            final YangInstanceIdentifier routePath, final Optional<NormalizedNode> routeBefore,
+            final NormalizedNode routeAfter, final boolean longLivedStale) {
+        final TablesKey tablesKey = ribSupport.getTablesKey();
+        CountersUtil.increment(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<Attributes> 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<Communities> 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 {
+            optEffAtt = ribPolicies.applyImportPolicies(peerImportParameters, routeAttrs,
+                verifyNotNull(tableTypeRegistry.getAfiSafiType(ribSupport.getTablesKey())));
+        }
+        if (optEffAtt.isEmpty()) {
+            deleteRoute(tx, ribSupport, routePath, routeBefore.orElse(null));
+            return;
+        }
+        handleRouteTarget(ModificationType.WRITE, ribSupport, routePath, routeAfter);
+        tx.put(LogicalDatastoreType.OPERATIONAL, routePath, routeAfter);
+        CountersUtil.increment(prefixesInstalled.get(tablesKey), tablesKey);
+
+        final Attributes attToStore = optEffAtt.orElseThrow();
+        if (!attToStore.equals(routeAttrs)) {
+            final YangInstanceIdentifier attPath = routePath.node(ribSupport.routeAttributesIdentifier());
+            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 != peerImportParameters.getFromPeerRole()) {
+            rtCache.cacheRoute(rtc);
+        }
+        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 != peerImportParameters.getFromPeerRole()) {
+            rtCache.uncacheRoute(rtc);
+        }
+        rtMemberships.remove(rtMembership);
+    }
+
+    private void handleRouteTarget(final ModificationType modificationType, final RIBSupport<?, ?> ribSupport,
+            final YangInstanceIdentifier routeIdPath, final NormalizedNode route) {
+        if (RouteTargetConstrainSubsequentAddressFamily.VALUE.equals(ribSupport.getTablesKey().getSafi())) {
+            final var rtc = (RouteTargetConstrainRoute) ribSupport.fromNormalizedNode(routeIdPath, route);
             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;
+            rtMembershipsUpdated = true;
         }
     }
 
@@ -443,65 +572,62 @@ 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<PathArgument> 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 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<NormalizedNode> findRoutesMap(final RIBSupport<?, ?> ribSupport,
+            final Optional<NormalizedNode> optRoutes) {
+        return NormalizedNodes.findNode(optRoutes, ribSupport.relativeRoutesPath());
     }
 
-    @Override
-    public Set<TablesKey> getTableKeys() {
-        return ImmutableSet.copyOf(this.prefixesReceived.keySet());
+    private static ContainerNode extractContainer(final NormalizedNode node) {
+        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<? extends NormalizedNode> optNode) {
+        final NormalizedNode node = optNode.orElseThrow();
+        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 boolean isLongLivedStale(final ContainerNode attributes) {
+        return NormalizedNodes.findNode(attributes, ADJRIBIN_ATTRIBUTES_AID, LLGR_STALE_NID).isPresent();
     }
 
-    @Override
-    public long getTotalPrefixesInstalled() {
-        return this.prefixesInstalled.values().stream().mapToLong(LongAdder::longValue).sum();
+    private static boolean isLongLivedStaleTable(final Optional<NormalizedNode> optTable) {
+        final Optional<NormalizedNode> optAttributes = NormalizedNodes.findNode(optTable, ATTRIBUTES_NID);
+        return optAttributes.isPresent() && isLongLivedStale(extractContainer(optAttributes.orElseThrow()));
+    }
+
+    private static ContainerNode effectiveAttributes(final ContainerNode attrs) {
+        final var upToDate = attrs.childByArg(UPTODATE_NID);
+        if (upToDate != null) {
+            final Object value = upToDate.body();
+            verify(value instanceof Boolean, "Expected boolean uptodate, got %s", value);
+            if ((Boolean) value) {
+                return RIBNormalizedNodes.UPTODATE_ATTRIBUTES;
+            }
+        }
+        return RIBNormalizedNodes.NOT_UPTODATE_ATTRIBUTES;
     }
 }