BUG-731: do not throw Exceptions
[bgpcep.git] / bgp / topology-provider / src / main / java / org / opendaylight / bgpcep / bgp / topology / provider / LinkstateTopologyBuilder.java
index adb8b9e81fa6e57bbc28f1eba1e35409ca8685ff..de014aa3df19bd74af0b1ef3a6fcc45532d2dcfd 100644 (file)
@@ -10,15 +10,21 @@ package org.opendaylight.bgpcep.bgp.topology.provider;
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import org.opendaylight.controller.md.sal.common.api.data.DataModification;
 import org.opendaylight.controller.sal.binding.api.data.DataProviderService;
 import org.opendaylight.protocol.bgp.rib.RibReference;
-import org.opendaylight.protocol.util.ByteArray;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.DomainName;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpPrefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.Ipv4InterfaceIdentifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.Ipv6InterfaceIdentifier;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.NodeFlagBits;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.NodeIdentifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.TopologyIdentifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.bgp.rib.rib.loc.rib.tables.routes.linkstate.routes._case.linkstate.routes.LinkstateRoute;
@@ -31,9 +37,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.link
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.bgp.rib.rib.loc.rib.tables.routes.linkstate.routes._case.linkstate.routes.linkstate.route.object.type.NodeCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.bgp.rib.rib.loc.rib.tables.routes.linkstate.routes._case.linkstate.routes.linkstate.route.object.type.PrefixCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.bgp.rib.rib.loc.rib.tables.routes.linkstate.routes._case.linkstate.routes.linkstate.route.object.type.link._case.LinkDescriptors;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.bgp.rib.rib.loc.rib.tables.routes.linkstate.routes._case.linkstate.routes.linkstate.route.object.type.node._case.NodeDescriptors;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.node.identifier.CRouterIdentifier;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.node.identifier.c.router.identifier.IsisNodeCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.node.identifier.c.router.identifier.IsisPseudonodeCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.node.identifier.c.router.identifier.OspfNodeCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.node.identifier.c.router.identifier.OspfPseudonodeCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.node.identifier.c.router.identifier.isis.node._case.IsisNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.node.identifier.c.router.identifier.isis.pseudonode._case.IsisPseudonode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.node.identifier.c.router.identifier.ospf.pseudonode._case.OspfPseudonode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.route.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.concepts.rev131125.Bandwidth;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.isis.topology.rev131021.IsoPseudonodeId;
@@ -50,8 +62,10 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TpId;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.link.attributes.DestinationBuilder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.link.attributes.SourceBuilder;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Link;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.LinkBuilder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.LinkKey;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.TopologyTypesBuilder;
@@ -68,6 +82,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.TopologyTypes1Builder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.link.attributes.IgpLinkAttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.node.attributes.IgpNodeAttributesBuilder;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.node.attributes.igp.node.attributes.Prefix;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.node.attributes.igp.node.attributes.PrefixBuilder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.node.attributes.igp.node.attributes.PrefixKey;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.termination.point.attributes.IgpTerminationPointAttributesBuilder;
@@ -78,22 +93,170 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.Prefix1Builder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.ospf.link.attributes.OspfLinkAttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.ospf.node.attributes.OspfNodeAttributesBuilder;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.ospf.node.attributes.ospf.node.attributes.router.type.AbrBuilder;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.ospf.node.attributes.ospf.node.attributes.router.type.InternalBuilder;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.ospf.node.attributes.ospf.node.attributes.router.type.PseudonodeBuilder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.ospf.prefix.attributes.OspfPrefixAttributesBuilder;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdentifierBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Collections2;
 import com.google.common.collect.Lists;
-import com.google.common.primitives.UnsignedInteger;
 
 public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<LinkstateRoute> {
+       private static final class TpHolder {
+               private final Set<LinkId> local = new HashSet<>();
+               private final Set<LinkId> remote = new HashSet<>();
+
+               private final TerminationPoint tp;
+
+               private TpHolder(final TerminationPoint tp) {
+                       this.tp = Preconditions.checkNotNull(tp);
+               }
+
+               private synchronized void addLink(final LinkId id, final boolean isRemote) {
+                       if (isRemote) {
+                               this.remote.add(id);
+                       } else {
+                               this.local.add(id);
+                       }
+               }
+
+               private synchronized boolean removeLink(final LinkId id, final boolean isRemote) {
+                       final boolean removed;
+                       if (isRemote) {
+                               removed = this.remote.remove(id);
+                       } else {
+                               removed = this.local.remove(id);
+                       }
+                       if (!removed) {
+                               LOG.warn("Removed non-reference link {} from TP {} isRemote {}", this.tp.getTpId(), id, isRemote);
+                       }
+
+                       return this.local.isEmpty() && this.remote.isEmpty();
+               }
+
+               private TerminationPoint getTp() {
+                       return this.tp;
+               }
+       }
+
+       private final class NodeHolder {
+               private final Map<PrefixKey, Prefix> prefixes = new HashMap<>();
+               private final Map<TpId, TpHolder> tps = new HashMap<>();
+               private boolean advertized = false;
+               private IgpNodeAttributesBuilder inab;
+               private NodeBuilder nb;
+
+               private NodeHolder(final NodeId id) {
+                       this.inab = new IgpNodeAttributesBuilder();
+                       this.nb = new NodeBuilder().setKey(new NodeKey(id)).setNodeId(id);
+               }
+
+               /**
+                * Synchronized in-core state of a node into the backing store using the transaction
+                *
+                * @param trans data modification transaction which to use
+                * @return True if the node has been purged, false otherwise.
+                */
+               private boolean syncState(final DataModification<InstanceIdentifier<?>, DataObject> trans) {
+                       final InstanceIdentifier<Node> nid = getInstanceIdentifier().child(
+                                       org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node.class,
+                                       this.nb.getKey());
+
+                       /*
+                        * Transaction's putOperationalData() does a merge. Force it onto a replace
+                        * by removing the data. If we decide to remove the node -- we just skip the put.
+                        */
+                       trans.removeOperationalData(nid);
+
+                       if (!this.advertized) {
+                               if (this.tps.isEmpty() && this.prefixes.isEmpty()) {
+                                       LOG.debug("Removing unadvertized unused node {}", this.nb.getNodeId());
+                                       return true;
+                               }
+
+                               LOG.debug("Node {} is still implied by {} TPs and {} prefixes", this.nb.getNodeId(), this.tps.size(), this.prefixes.size());
+                       }
+
+                       // Re-generate termination points
+                       this.nb.setTerminationPoint(Lists.newArrayList(Collections2.transform(this.tps.values(),
+                                       new Function<TpHolder, TerminationPoint>() {
+                               @Override
+                               public TerminationPoint apply(final TpHolder input) {
+                                       return input.getTp();
+                               }
+                       })));
+
+                       // Re-generate prefixes
+                       this.inab.setPrefix(Lists.newArrayList(this.prefixes.values()));
+
+                       // Write the node out
+                       final Node n = this.nb.addAugmentation(Node1.class, new Node1Builder().setIgpNodeAttributes(this.inab.build()).build()).build();
+                       trans.putOperationalData(nid, n);
+                       LOG.debug("Created node {} at {}", n, nid);
+                       return false;
+               }
+
+               private synchronized void removeTp(final TpId tp, final LinkId link, final boolean isRemote) {
+                       final TpHolder h = this.tps.get(tp);
+                       if (h != null) {
+                               if (h.removeLink(link, isRemote)) {
+                                       this.tps.remove(tp);
+                                       LOG.debug("Removed TP {}", tp);
+                               }
+                       } else {
+                               LOG.warn("Removed non-present TP {} by link {}", tp, link);
+                       }
+               }
+
+               private void addTp(final TerminationPoint tp, final LinkId link, final boolean isRemote) {
+                       TpHolder h = this.tps.get(tp.getTpId());
+                       if (h == null) {
+                               h = new TpHolder(tp);
+                               this.tps.put(tp.getTpId(), h);
+                       }
+
+                       h.addLink(link, isRemote);
+               }
+
+               private void addPrefix(final Prefix pfx) {
+                       this.prefixes.put(pfx.getKey(), pfx);
+               }
+
+               private void removePrefix(final PrefixCase p) {
+                       this.prefixes.remove(new PrefixKey(p.getIpReachabilityInformation()));
+               }
+
+               private void unadvertized() {
+                       this.inab = new IgpNodeAttributesBuilder();
+                       this.nb = new NodeBuilder().setKey(this.nb.getKey()).setNodeId(this.nb.getNodeId());
+                       this.advertized = false;
+                       LOG.debug("Node {} is unadvertized", this.nb.getNodeId());
+               }
+
+               private void advertized(final NodeBuilder nb, final IgpNodeAttributesBuilder inab) {
+                       this.nb = Preconditions.checkNotNull(nb);
+                       this.inab = Preconditions.checkNotNull(inab);
+                       this.advertized = true;
+                       LOG.debug("Node {} is advertized", nb.getNodeId());
+               }
+
+               private Object getNodeId() {
+                       return this.nb.getNodeId();
+               }
+       }
+
        private static final Logger LOG = LoggerFactory.getLogger(LinkstateTopologyBuilder.class);
+       private final Map<NodeId, NodeHolder> nodes = new HashMap<>();
 
        public LinkstateTopologyBuilder(final DataProviderService dataProvider, final RibReference locRibReference, final TopologyId topologyId) {
-               super(dataProvider, locRibReference, topologyId,
-                               new TopologyTypesBuilder().addAugmentation(TopologyTypes1.class, new TopologyTypes1Builder().build()).build(), LinkstateRoute.class);
+               super(dataProvider, locRibReference, topologyId, new TopologyTypesBuilder().addAugmentation(TopologyTypes1.class,
+                               new TopologyTypes1Builder().build()).build(), LinkstateRoute.class);
        }
 
        private LinkId buildLinkId(final UriBuilder base, final LinkCase link) {
@@ -104,12 +267,25 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
                return new NodeId(new UriBuilder(base, "node").add("", node).toString());
        }
 
-       private TpId buildTpId(final UriBuilder base, final TopologyIdentifier topologyIdentifier, final Ipv4InterfaceIdentifier ipv4InterfaceIdentifier, final Ipv6InterfaceIdentifier ipv6InterfaceIdentifier, final byte[] bs) {
-               return new TpId(new UriBuilder(base, "tp").add("mt", topologyIdentifier).add("ipv4", ipv4InterfaceIdentifier).add("ipv6", ipv6InterfaceIdentifier).add("id", bs).toString());
+       private TpId buildTpId(final UriBuilder base, final TopologyIdentifier topologyIdentifier,
+                       final Ipv4InterfaceIdentifier ipv4InterfaceIdentifier, final Ipv6InterfaceIdentifier ipv6InterfaceIdentifier, final Long id) {
+               final UriBuilder b = new UriBuilder(base, "tp");
+               if (topologyIdentifier != null) {
+                       b.add("mt", topologyIdentifier.getValue());
+               }
+               if (ipv4InterfaceIdentifier != null) {
+                       b.add("ipv4", ipv4InterfaceIdentifier.getValue());
+               }
+               if (ipv6InterfaceIdentifier != null) {
+                       b.add("ipv6", ipv6InterfaceIdentifier.getValue());
+               }
+
+               return new TpId(b.add("id", id).toString());
        }
 
        private TpId buildLocalTpId(final UriBuilder base, final LinkDescriptors linkDescriptors) {
-               return buildTpId(base, linkDescriptors.getMultiTopologyId(), linkDescriptors.getIpv4InterfaceAddress(), linkDescriptors.getIpv6InterfaceAddress(), linkDescriptors.getLinkLocalIdentifier());
+               return buildTpId(base, linkDescriptors.getMultiTopologyId(), linkDescriptors.getIpv4InterfaceAddress(),
+                               linkDescriptors.getIpv6InterfaceAddress(), linkDescriptors.getLinkLocalIdentifier());
        }
 
        private TerminationPoint buildTp(final TpId id, final TerminationPointType type) {
@@ -118,16 +294,19 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
                stpb.setTpId(id);
 
                if (type != null) {
-                       stpb.addAugmentation(TerminationPoint1.class, new TerminationPoint1Builder().setIgpTerminationPointAttributes(new IgpTerminationPointAttributesBuilder().setTerminationPointType(null).build()).build());
+                       stpb.addAugmentation(
+                                       TerminationPoint1.class,
+                                       new TerminationPoint1Builder().setIgpTerminationPointAttributes(
+                                                       new IgpTerminationPointAttributesBuilder().setTerminationPointType(null).build()).build());
                }
 
                return stpb.build();
        }
 
-       private final TerminationPointType getTpType(final Ipv4InterfaceIdentifier ipv4InterfaceIdentifier, final Ipv6InterfaceIdentifier ipv6InterfaceIdentifier, final byte[] bs) {
+       private TerminationPointType getTpType(final Ipv4InterfaceIdentifier ipv4InterfaceIdentifier,
+                       final Ipv6InterfaceIdentifier ipv6InterfaceIdentifier, final Long id) {
                // Order of preference: Unnumbered first, then IP
-               if (bs != null) {
-                       final long id = UnsignedInteger.fromIntBits(ByteArray.bytesToInt(bs)).longValue();
+               if (id != null) {
                        LOG.debug("Unnumbered termination point type: {}", id);
                        return new UnnumberedBuilder().setUnnumberedId(id).build();
                }
@@ -151,26 +330,29 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
 
        private TerminationPoint buildLocalTp(final UriBuilder base, final LinkDescriptors linkDescriptors) {
                final TpId id = buildLocalTpId(base, linkDescriptors);
-               final TerminationPointType t = getTpType(linkDescriptors.getIpv4InterfaceAddress(), linkDescriptors.getIpv6InterfaceAddress(), linkDescriptors.getLinkLocalIdentifier());
+               final TerminationPointType t = getTpType(linkDescriptors.getIpv4InterfaceAddress(), linkDescriptors.getIpv6InterfaceAddress(),
+                               linkDescriptors.getLinkLocalIdentifier());
 
                return buildTp(id, t);
        }
 
        private TpId buildRemoteTpId(final UriBuilder base, final LinkDescriptors linkDescriptors) {
-               return buildTpId(base, linkDescriptors.getMultiTopologyId(), linkDescriptors.getIpv4NeighborAddress(), linkDescriptors.getIpv6NeighborAddress(), linkDescriptors.getLinkRemoteIdentifier());
+               return buildTpId(base, linkDescriptors.getMultiTopologyId(), linkDescriptors.getIpv4NeighborAddress(),
+                               linkDescriptors.getIpv6NeighborAddress(), linkDescriptors.getLinkRemoteIdentifier());
        }
 
        private TerminationPoint buildRemoteTp(final UriBuilder base, final LinkDescriptors linkDescriptors) {
                final TpId id = buildRemoteTpId(base, linkDescriptors);
-               final TerminationPointType t = getTpType(linkDescriptors.getIpv4NeighborAddress(), linkDescriptors.getIpv6NeighborAddress(), linkDescriptors.getLinkRemoteIdentifier());
+               final TerminationPointType t = getTpType(linkDescriptors.getIpv4NeighborAddress(), linkDescriptors.getIpv6NeighborAddress(),
+                               linkDescriptors.getLinkRemoteIdentifier());
 
                return buildTp(id, t);
        }
 
-       private InstanceIdentifier<?> buildLinkIdentifier(final UriBuilder base, final LinkCase l) {
-               return InstanceIdentifier.builder(getInstanceIdentifier()).child(
+       private InstanceIdentifier<?> buildLinkIdentifier(final UriBuilder base, final LinkId id) {
+               return getInstanceIdentifier().child(
                                org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Link.class,
-                               new LinkKey(buildLinkId(base, l))).toInstance();
+                               new LinkKey(id));
        }
 
        private static Float bandwidthToFloat(final Bandwidth bandwidth) {
@@ -197,20 +379,22 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
                        final TopologyIdentifier topologyIdentifier, final LinkAttributes la) {
                final org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.isis.topology.rev131021.isis.link.attributes.isis.link.attributes.TedBuilder tb = new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.isis.topology.rev131021.isis.link.attributes.isis.link.attributes.TedBuilder();
 
-               if (la.getAdminGroup() != null) {
-                       tb.setColor(la.getAdminGroup().getValue());
-               }
-               if (la.getTeMetric() != null) {
-                       tb.setTeDefaultMetric(la.getTeMetric().getValue());
-               }
-               if (la.getUnreservedBandwidth() != null) {
-                       tb.setUnreservedBandwidth(unreservedBandwidthList(la.getUnreservedBandwidth()));
-               }
-               if (la.getMaxLinkBandwidth() != null) {
-                       tb.setMaxLinkBandwidth(bandwidthToBigDecimal(la.getMaxLinkBandwidth()));
-               }
-               if (la.getMaxReservableBandwidth() != null) {
-                       tb.setMaxResvLinkBandwidth(bandwidthToBigDecimal(la.getMaxReservableBandwidth()));
+               if (la != null) {
+                       if (la.getAdminGroup() != null) {
+                               tb.setColor(la.getAdminGroup().getValue());
+                       }
+                       if (la.getTeMetric() != null) {
+                               tb.setTeDefaultMetric(la.getTeMetric().getValue());
+                       }
+                       if (la.getUnreservedBandwidth() != null) {
+                               tb.setUnreservedBandwidth(unreservedBandwidthList(la.getUnreservedBandwidth()));
+                       }
+                       if (la.getMaxLinkBandwidth() != null) {
+                               tb.setMaxLinkBandwidth(bandwidthToBigDecimal(la.getMaxLinkBandwidth()));
+                       }
+                       if (la.getMaxReservableBandwidth() != null) {
+                               tb.setMaxResvLinkBandwidth(bandwidthToBigDecimal(la.getMaxReservableBandwidth()));
+                       }
                }
 
                final IsisLinkAttributesBuilder ilab = new IsisLinkAttributesBuilder();
@@ -219,27 +403,30 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
                        ilab.setMultiTopologyId(topologyIdentifier.getValue().shortValue());
                }
 
-               return new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.isis.topology.rev131021.IgpLinkAttributes1Builder().setIsisLinkAttributes(ilab.build()).build();
+               return new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.isis.topology.rev131021.IgpLinkAttributes1Builder().setIsisLinkAttributes(
+                               ilab.build()).build();
        }
 
        private org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.IgpLinkAttributes1 ospfLinkAttributes(
                        final TopologyIdentifier topologyIdentifier, final LinkAttributes la) {
                final org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.ospf.link.attributes.ospf.link.attributes.TedBuilder tb = new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.ospf.link.attributes.ospf.link.attributes.TedBuilder();
 
-               if (la.getAdminGroup() != null) {
-                       tb.setColor(la.getAdminGroup().getValue());
-               }
-               if (la.getTeMetric() != null) {
-                       tb.setTeDefaultMetric(la.getTeMetric().getValue());
-               }
-               if (la.getUnreservedBandwidth() != null) {
-                       tb.setUnreservedBandwidth(unreservedBandwidthList(la.getUnreservedBandwidth()));
-               }
-               if (la.getMaxLinkBandwidth() != null) {
-                       tb.setMaxLinkBandwidth(bandwidthToBigDecimal(la.getMaxLinkBandwidth()));
-               }
-               if (la.getMaxReservableBandwidth() != null) {
-                       tb.setMaxResvLinkBandwidth(bandwidthToBigDecimal(la.getMaxReservableBandwidth()));
+               if (la != null) {
+                       if (la.getAdminGroup() != null) {
+                               tb.setColor(la.getAdminGroup().getValue());
+                       }
+                       if (la.getTeMetric() != null) {
+                               tb.setTeDefaultMetric(la.getTeMetric().getValue());
+                       }
+                       if (la.getUnreservedBandwidth() != null) {
+                               tb.setUnreservedBandwidth(unreservedBandwidthList(la.getUnreservedBandwidth()));
+                       }
+                       if (la.getMaxLinkBandwidth() != null) {
+                               tb.setMaxLinkBandwidth(bandwidthToBigDecimal(la.getMaxLinkBandwidth()));
+                       }
+                       if (la.getMaxReservableBandwidth() != null) {
+                               tb.setMaxResvLinkBandwidth(bandwidthToBigDecimal(la.getMaxReservableBandwidth()));
+                       }
                }
 
                final OspfLinkAttributesBuilder ilab = new OspfLinkAttributesBuilder();
@@ -248,17 +435,39 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
                        ilab.setMultiTopologyId(topologyIdentifier.getValue().shortValue());
                }
 
-               return new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.IgpLinkAttributes1Builder().setOspfLinkAttributes(ilab.build()).build();
+               return new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.IgpLinkAttributes1Builder().setOspfLinkAttributes(
+                               ilab.build()).build();
+       }
+
+       private NodeHolder getNode(final NodeId id) {
+               if (this.nodes.containsKey(id)) {
+                       LOG.debug("Node {} is already present", id);
+                       return this.nodes.get(id);
+               }
+
+               final NodeHolder ret = new NodeHolder(id);
+               this.nodes.put(id, ret);
+               return ret;
+       }
+
+       private void putNode(final DataModification<InstanceIdentifier<?>, DataObject> trans, final NodeHolder holder) {
+               if (holder.syncState(trans)) {
+                       this.nodes.remove(holder.getNodeId());
+               }
        }
 
-       private void createLink(final DataModification<InstanceIdentifier<?>, DataObject> trans, final UriBuilder base, final LinkstateRoute value,
-                       final LinkCase l, final Attributes attributes) {
-               final LinkAttributes la =
-                               ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.bgp.rib.rib.loc.rib.tables.routes.linkstate.routes._case.linkstate.routes.linkstate.route.attributes.attribute.type.LinkCase) attributes.getAugmentation(Attributes1.class).getAttributeType()).getLinkAttributes();
+       private void createLink(final DataModification<InstanceIdentifier<?>, DataObject> trans, final UriBuilder base,
+                       final LinkstateRoute value, final LinkCase l, final Attributes attributes) {
+               final LinkAttributes la = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.bgp.rib.rib.loc.rib.tables.routes.linkstate.routes._case.linkstate.routes.linkstate.route.attributes.attribute.type.LinkCase) attributes.getAugmentation(
+                               Attributes1.class).getAttributeType()).getLinkAttributes();
 
                final IgpLinkAttributesBuilder ilab = new IgpLinkAttributesBuilder();
-               ilab.setMetric(la.getMetric().getValue());
-               ilab.setName(la.getLinkName());
+               if (la != null) {
+                       if (la.getMetric() != null) {
+                               ilab.setMetric(la.getMetric().getValue());
+                       }
+                       ilab.setName(la.getLinkName());
+               }
 
                switch (value.getProtocolId()) {
                case Direct:
@@ -282,54 +491,94 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
                lb.addAugmentation(Link1.class, new Link1Builder().setIgpLinkAttributes(ilab.build()).build());
 
                final NodeId srcNode = buildNodeId(base, l.getLocalNodeDescriptors());
+               LOG.debug("Link {} implies source node {}", l, srcNode);
+
                final NodeId dstNode = buildNodeId(base, l.getRemoteNodeDescriptors());
+               LOG.debug("Link {} implies destination node {}", l, dstNode);
+
                final TerminationPoint srcTp = buildLocalTp(base, l.getLinkDescriptors());
+               LOG.debug("Link {} implies source TP {}", l, srcTp);
+
                final TerminationPoint dstTp = buildRemoteTp(base, l.getLinkDescriptors());
+               LOG.debug("Link {} implies destination TP {}", l, dstTp);
 
                lb.setSource(new SourceBuilder().setSourceNode(srcNode).setSourceTp(srcTp.getTpId()).build());
                lb.setDestination(new DestinationBuilder().setDestNode(dstNode).setDestTp(dstTp.getTpId()).build());
 
-               trans.putOperationalData(buildTpIdentifier(srcNode, srcTp.getKey()), srcTp);
-               trans.putOperationalData(buildTpIdentifier(dstNode, dstTp.getKey()), dstTp);
-               trans.putOperationalData(buildLinkIdentifier(base, l), lb.build());
-               LOG.debug("Created link {}", l);
+               final NodeHolder snh = getNode(srcNode);
+               snh.addTp(srcTp, lb.getLinkId(), false);
+               LOG.debug("Created TP {} as link source", srcTp);
+               putNode(trans, snh);
+
+               final NodeHolder dnh = getNode(dstNode);
+               dnh.addTp(dstTp, lb.getLinkId(), true);
+               LOG.debug("Created TP {} as link destination", dstTp);
+               putNode(trans, dnh);
+
+               final InstanceIdentifier<?> lid = buildLinkIdentifier(base, lb.getLinkId());
+               final Link link = lb.build();
+
+               /*
+                * Transaction's putOperationalData() does a merge. Force it onto a replace
+                * by removing the data.
+                */
+               trans.removeOperationalData(lid);
+               trans.putOperationalData(lid, link);
+               LOG.debug("Created link {} at {} for {}", link, lid, l);
        }
 
-       private void removeLink(final DataModification<InstanceIdentifier<?>, DataObject> trans, final UriBuilder base, final LinkCase l) {
-               trans.removeOperationalData(buildLinkIdentifier(base, l));
+       private void removeTp(final DataModification<InstanceIdentifier<?>, DataObject> trans, final NodeId node, final TpId tp,
+                       final LinkId link, final boolean isRemote) {
+               final NodeHolder nh = this.nodes.get(node);
+               if (nh != null) {
+                       nh.removeTp(tp, link, isRemote);
+                       putNode(trans, nh);
+               } else {
+                       LOG.warn("Removed non-existent node {}", node);
+               }
        }
 
-       private InstanceIdentifierBuilder<org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node> nodeIdentifierBuilder(
-                       final UriBuilder base, final NodeIdentifier node) {
-               return InstanceIdentifier.builder(getInstanceIdentifier()).child(
-                               org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node.class,
-                               new NodeKey(buildNodeId(base, node)));
+       private void removeLink(final DataModification<InstanceIdentifier<?>, DataObject> trans, final UriBuilder base, final LinkCase l) {
+               final LinkId id = buildLinkId(base, l);
+               final InstanceIdentifier<?> lid = buildLinkIdentifier(base, id);
+               trans.removeOperationalData(lid);
+               LOG.debug("Removed link {}", lid);
+
+               removeTp(trans, buildNodeId(base, l.getLocalNodeDescriptors()), buildLocalTpId(base, l.getLinkDescriptors()), id, false);
+               removeTp(trans, buildNodeId(base, l.getRemoteNodeDescriptors()), buildRemoteTpId(base, l.getLinkDescriptors()), id, true);
        }
 
-       private InstanceIdentifier<TerminationPoint> buildTpIdentifier(final NodeId node, final TerminationPointKey key) {
-               return InstanceIdentifier.builder(getInstanceIdentifier()).child(
-                               org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node.class,
-                               new NodeKey(node)).child(TerminationPoint.class, key).build();
+       private List<Short> nodeMultiTopology(final List<TopologyIdentifier> list) {
+               final List<Short> ret = new ArrayList<>(list.size());
+               for (final TopologyIdentifier id : list) {
+                       ret.add(id.getValue().shortValue());
+               }
+               return ret;
        }
 
        private org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.isis.topology.rev131021.IgpNodeAttributes1 isisNodeAttributes(
                        final NodeIdentifier node, final NodeAttributes na) {
                final org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.isis.topology.rev131021.isis.node.attributes.isis.node.attributes.TedBuilder tb = new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.isis.topology.rev131021.isis.node.attributes.isis.node.attributes.TedBuilder();
-               if (na.getIpv4RouterId() != null) {
-                       tb.setTeRouterIdIpv4(na.getIpv4RouterId());
-               }
-               if (na.getIpv6RouterId() != null) {
-                       tb.setTeRouterIdIpv6(na.getIpv6RouterId());
+               final IsisNodeAttributesBuilder ab = new IsisNodeAttributesBuilder();
+
+               if (na != null) {
+                       if (na.getIpv4RouterId() != null) {
+                               tb.setTeRouterIdIpv4(na.getIpv4RouterId());
+                       }
+                       if (na.getIpv6RouterId() != null) {
+                               tb.setTeRouterIdIpv6(na.getIpv6RouterId());
+                       }
+                       if (na.getTopologyIdentifier() != null) {
+                               ab.setMultiTopologyId(nodeMultiTopology(na.getTopologyIdentifier()));
+                       }
                }
 
-               final IsisNodeAttributesBuilder ab = new IsisNodeAttributesBuilder();
                final CRouterIdentifier ri = node.getCRouterIdentifier();
-
-               if (ri instanceof IsisPseudonode) {
-                       final IsisPseudonode pn = (IsisPseudonode) ri;
+               if (ri instanceof IsisPseudonodeCase) {
+                       final IsisPseudonode pn = ((IsisPseudonodeCase) ri).getIsisPseudonode();
                        ab.setIso(new IsoBuilder().setIsoPseudonodeId(new IsoPseudonodeId(pn.toString())).build());
-               } else if (ri instanceof IsisNode) {
-                       final IsisNode in = (IsisNode) ri;
+               } else if (ri instanceof IsisNodeCase) {
+                       final IsisNode in = ((IsisNodeCase) ri).getIsisNode();
                        ab.setIso(new IsoBuilder().setIsoSystemId(new IsoSystemId(in.getIsoSystemId().toString())).build());
                }
 
@@ -340,31 +589,69 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
        }
 
        private org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.IgpNodeAttributes1 ospfNodeAttributes(
-                       final NodeAttributes na) {
+                       final NodeDescriptors node, final NodeAttributes na) {
                final org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.ospf.node.attributes.ospf.node.attributes.TedBuilder tb = new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.ospf.node.attributes.ospf.node.attributes.TedBuilder();
-
                final OspfNodeAttributesBuilder ab = new OspfNodeAttributesBuilder();
 
+               if (na != null) {
+                       if (na.getIpv4RouterId() != null) {
+                               tb.setTeRouterIdIpv4(na.getIpv4RouterId());
+                       }
+                       if (na.getIpv6RouterId() != null) {
+                               tb.setTeRouterIdIpv6(na.getIpv6RouterId());
+                       }
+                       if (na.getTopologyIdentifier() != null) {
+                               ab.setMultiTopologyId(nodeMultiTopology(na.getTopologyIdentifier()));
+                       }
+               }
+
+               final CRouterIdentifier ri = node.getCRouterIdentifier();
+               if (ri instanceof OspfPseudonodeCase) {
+                       final OspfPseudonode pn = ((OspfPseudonodeCase) ri).getOspfPseudonode();
+
+                       ab.setRouterType(new PseudonodeBuilder().setPseudonode(Boolean.TRUE).build());
+                       ab.setDrInterfaceId(pn.getLanInterface().getValue());
+               } else if (ri instanceof OspfNodeCase) {
+                       // TODO: what should we do with in.getOspfRouterId()?
+                       // final OspfNode in = ((OspfNodeCase) ri).getOspfNode();
+
+                       if (na != null) {
+                               final NodeFlagBits nf = na.getNodeFlags();
+                               if (nf != null) {
+                                       if (nf.isAbr()) {
+                                               ab.setRouterType(new AbrBuilder().setAbr(Boolean.TRUE).build());
+                                       } else if (!nf.isExternal()) {
+                                               ab.setRouterType(new InternalBuilder().setInternal(Boolean.TRUE).build());
+                                       }
+                               }
+                       }
+               }
+
                ab.setTed(tb.build());
 
                return new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.IgpNodeAttributes1Builder().setOspfNodeAttributes(
                                ab.build()).build();
        }
 
-       private void createNode(final DataModification<InstanceIdentifier<?>, DataObject> trans, final UriBuilder base, final LinkstateRoute value,
-                       final NodeCase n, final Attributes attributes) {
-               final NodeAttributes na =
-                               ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.bgp.rib.rib.loc.rib.tables.routes.linkstate.routes._case.linkstate.routes.linkstate.route.attributes.attribute.type.NodeCase) attributes.getAugmentation(Attributes1.class).getAttributeType()).getNodeAttributes();
+       private void createNode(final DataModification<InstanceIdentifier<?>, DataObject> trans, final UriBuilder base,
+                       final LinkstateRoute value, final NodeCase n, final Attributes attributes) {
+               final NodeAttributes na = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.bgp.rib.rib.loc.rib.tables.routes.linkstate.routes._case.linkstate.routes.linkstate.route.attributes.attribute.type.NodeCase) attributes.getAugmentation(
+                               Attributes1.class).getAttributeType()).getNodeAttributes();
+               final IgpNodeAttributesBuilder inab = new IgpNodeAttributesBuilder();
 
                final List<IpAddress> ids = new ArrayList<>();
-               if (na.getIpv4RouterId() != null) {
-                       ids.add(new IpAddress(na.getIpv4RouterId()));
-               }
-               if (na.getIpv6RouterId() != null) {
-                       ids.add(new IpAddress(na.getIpv6RouterId()));
+               if (na != null) {
+                       if (na.getIpv4RouterId() != null) {
+                               ids.add(new IpAddress(na.getIpv4RouterId()));
+                       }
+                       if (na.getIpv6RouterId() != null) {
+                               ids.add(new IpAddress(na.getIpv6RouterId()));
+                       }
+                       if (na.getDynamicHostname() != null) {
+                               inab.setName(new DomainName(na.getDynamicHostname()));
+                       }
                }
 
-               final IgpNodeAttributesBuilder inab = new IgpNodeAttributesBuilder();
                if (!ids.isEmpty()) {
                        inab.setRouterId(ids);
                }
@@ -382,38 +669,54 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
                        break;
                case Ospf:
                        inab.addAugmentation(org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.IgpNodeAttributes1.class,
-                                       ospfNodeAttributes(na));
+                                       ospfNodeAttributes(n.getNodeDescriptors(), na));
                        break;
                }
 
+               final NodeId nid = buildNodeId(base, n.getNodeDescriptors());
+               final NodeHolder nh = getNode(nid);
+
+               /*
+                *  Eventhough the the holder creates a dummy structure, we need to duplicate it here,
+                *  as that is the API requirement. The reason for it is the possible presence of supporting
+                *  node -- something which the holder does not track.
+                */
                final NodeBuilder nb = new NodeBuilder();
-               nb.setNodeId(buildNodeId(base, n.getNodeDescriptors()));
-               nb.addAugmentation(Node1.class, new Node1Builder().setIgpNodeAttributes(inab.build()).build());
+               nb.setNodeId(nid);
+               nb.setKey(new NodeKey(nb.getNodeId()));
 
-               trans.putOperationalData(nodeIdentifierBuilder(base, n.getNodeDescriptors()).toInstance(), nb.build());
-               LOG.debug("Created node {}", n);
+               nh.advertized(nb, inab);
+               putNode(trans, nh);
        }
 
        private void removeNode(final DataModification<InstanceIdentifier<?>, DataObject> trans, final UriBuilder base, final NodeCase n) {
-               trans.removeOperationalData(nodeIdentifierBuilder(base, n.getNodeDescriptors()).toInstance());
-       }
-
-       private InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.node.attributes.igp.node.attributes.Prefix> prefixIdentifier(
-                       final UriBuilder base, final PrefixCase p) {
-               return nodeIdentifierBuilder(base, p.getAdvertisingNodeDescriptors()).augmentation(Node1.class).child(
-                               org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.node.attributes.IgpNodeAttributes.class).child(
-                                               org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.node.attributes.igp.node.attributes.Prefix.class,
-                                               new PrefixKey(p.getIpReachabilityInformation())).toInstance();
+               final NodeId id = buildNodeId(base, n.getNodeDescriptors());
+               final NodeHolder nh = this.nodes.get(id);
+               if (nh != null) {
+                       nh.unadvertized();
+                       putNode(trans, nh);
+               } else {
+                       LOG.warn("Node {} does not have a holder", id);
+               }
        }
 
        private void createPrefix(final DataModification<InstanceIdentifier<?>, DataObject> trans, final UriBuilder base,
                        final LinkstateRoute value, final PrefixCase p, final Attributes attributes) {
-               final PrefixAttributes pa =
-                               ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.bgp.rib.rib.loc.rib.tables.routes.linkstate.routes._case.linkstate.routes.linkstate.route.attributes.attribute.type.PrefixCase) attributes.getAugmentation(Attributes1.class).getAttributeType()).getPrefixAttributes();
+               final IpPrefix ippfx = p.getIpReachabilityInformation();
+               if (ippfx == null) {
+                       LOG.warn("IP reachability not present in prefix {} route {}, skipping it", p, value);
+                       return;
+               }
 
                final PrefixBuilder pb = new PrefixBuilder();
-               pb.setPrefix(p.getIpReachabilityInformation());
-               pb.setMetric(pa.getPrefixMetric().getValue());
+               pb.setKey(new PrefixKey(ippfx));
+               pb.setPrefix(ippfx);
+
+               final PrefixAttributes pa = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.bgp.rib.rib.loc.rib.tables.routes.linkstate.routes._case.linkstate.routes.linkstate.route.attributes.attribute.type.PrefixCase) attributes.getAugmentation(
+                               Attributes1.class).getAttributeType()).getPrefixAttributes();
+               if (pa != null) {
+                       pb.setMetric(pa.getPrefixMetric().getValue());
+               }
 
                switch (value.getProtocolId()) {
                case Direct:
@@ -423,19 +726,37 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
                case Unknown:
                        break;
                case Ospf:
-                       pb.addAugmentation(
-                                       Prefix1.class,
-                                       new Prefix1Builder().setOspfPrefixAttributes(
-                                                       new OspfPrefixAttributesBuilder().setForwardingAddress(pa.getOspfForwardingAddress()).build()).build());
+                       if (pa != null) {
+                               pb.addAugmentation(
+                                               Prefix1.class,
+                                               new Prefix1Builder().setOspfPrefixAttributes(
+                                                               new OspfPrefixAttributesBuilder().setForwardingAddress(pa.getOspfForwardingAddress().getIpv4Address()).build()).build());
+                       }
                        break;
                }
 
-               trans.putOperationalData(prefixIdentifier(base, p), pb.build());
-               LOG.debug("Created prefix {}", p);
+               final Prefix pfx = pb.build();
+
+               /*
+                * All set, but... the hosting node may not exist, we may need to fake it.
+                */
+               final NodeId node = buildNodeId(base, p.getAdvertisingNodeDescriptors());
+               final NodeHolder nh = getNode(node);
+               nh.addPrefix(pfx);
+               LOG.debug("Created prefix {} for {}", pfx, p);
+               putNode(trans, nh);
        }
 
        private void removePrefix(final DataModification<InstanceIdentifier<?>, DataObject> trans, final UriBuilder base, final PrefixCase p) {
-               trans.removeOperationalData(prefixIdentifier(base, p));
+               final NodeId node = buildNodeId(base, p.getAdvertisingNodeDescriptors());
+               final NodeHolder nh = this.nodes.get(node);
+               if (nh != null) {
+                       nh.removePrefix(p);
+                       LOG.debug("Removed prefix {}", p);
+                       putNode(trans, nh);
+               } else {
+                       LOG.warn("Removing prefix from non-existing node {}", node);
+               }
        }
 
        @Override