X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=bgp%2Ftopology-provider%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fbgpcep%2Fbgp%2Ftopology%2Fprovider%2FAbstractReachabilityTopologyBuilder.java;h=b11ea16f5085349725b08218f8b39af48be84d7a;hb=0fdeddbe3d072a88428599421191f0f60b2864e4;hp=fd65369b90137f7bea9309dc45357d78eb0dcd5e;hpb=a0768a91898dae3d6311fb6600c2c0622214e854;p=bgpcep.git diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java index fd65369b90..b11ea16f50 100644 --- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java +++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java @@ -7,25 +7,30 @@ */ package org.opendaylight.bgpcep.bgp.topology.provider; -import com.google.common.base.Optional; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import java.util.Collections; import java.util.HashMap; +import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.concurrent.ExecutionException; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.ReadTransaction; -import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.ReadOperations; +import org.opendaylight.mdsal.binding.api.ReadWriteTransaction; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.protocol.bgp.rib.RibReference; -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.message.rev130919.path.attributes.Attributes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.Route; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.CNextHop; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.Ipv4NextHopCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.Ipv6NextHopCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.ipv4.next.hop._case.Ipv4NextHop; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.ipv6.next.hop._case.Ipv6NextHop; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix; +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.rib.rev180329.Route; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.AddressFamily; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.SubsequentAddressFamily; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.next.hop.CNextHop; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.next.hop.c.next.hop.Ipv4NextHopCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.next.hop.c.next.hop.Ipv6NextHopCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.next.hop.c.next.hop.ipv4.next.hop._case.Ipv4NextHop; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.next.hop.c.next.hop.ipv6.next.hop._case.Ipv6NextHop; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; @@ -45,9 +50,6 @@ import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * - */ abstract class AbstractReachabilityTopologyBuilder extends AbstractTopologyBuilder { private static final Logger LOG = LoggerFactory.getLogger(AbstractReachabilityTopologyBuilder.class); private final Map nodes = new HashMap<>(); @@ -57,18 +59,22 @@ abstract class AbstractReachabilityTopologyBuilder extends Abst private int useCount = 1; NodeUsage(final InstanceIdentifier attrId) { - this.attrId = Preconditions.checkNotNull(attrId); + this.attrId = requireNonNull(attrId); } } protected AbstractReachabilityTopologyBuilder(final DataBroker dataProvider, final RibReference locRibReference, - final TopologyId topologyId, final TopologyTypes topologyTypes) { - super(dataProvider, locRibReference, topologyId, topologyTypes); + final TopologyId topologyId, final TopologyTypes topologyTypes, final Class afi, + final Class safi) { + super(dataProvider, locRibReference, topologyId, topologyTypes, afi, safi); } - private NodeId advertizingNode(final Attributes attrs) { + private static NodeId advertizingNode(final Attributes attrs) { final CNextHop nh = attrs.getCNextHop(); - if (nh instanceof Ipv4NextHopCase) { + if (nh == null) { + LOG.warn("Next hop value is null"); + return null; + } else if (nh instanceof Ipv4NextHopCase) { final Ipv4NextHop ipv4 = ((Ipv4NextHopCase) nh).getIpv4NextHop(); return new NodeId(ipv4.getGlobal().getValue()); @@ -77,7 +83,7 @@ abstract class AbstractReachabilityTopologyBuilder extends Abst return new NodeId(ipv6.getGlobal().getValue()); } else { - LOG.warn("Unhandled next hop class {}", nh.getImplementedInterface()); + LOG.warn("Unhandled next hop class {}", nh.implementedInterface()); return null; } } @@ -86,16 +92,16 @@ abstract class AbstractReachabilityTopologyBuilder extends Abst return getInstanceIdentifier().child(Node.class, new NodeKey(ni)); } - private static T read(final ReadTransaction t, final InstanceIdentifier id) { - final Optional o; + private static T read(final ReadOperations rt, final InstanceIdentifier id) { + final Optional optional; try { - o = t.read(LogicalDatastoreType.OPERATIONAL, id).get(); + optional = rt.read(LogicalDatastoreType.OPERATIONAL, id).get(); } catch (InterruptedException | ExecutionException e) { LOG.warn("Failed to read {}, assuming non-existent", id, e); return null; } - return o.orNull(); + return optional.orElse(null); } private InstanceIdentifier ensureNodePresent(final ReadWriteTransaction trans, final NodeId ni) { @@ -105,35 +111,47 @@ abstract class AbstractReachabilityTopologyBuilder extends Abst } final KeyedInstanceIdentifier nii = nodeInstanceId(ni); - final InstanceIdentifier ret = nii.builder().augmentation(Node1.class).child(IgpNodeAttributes.class).build(); + final InstanceIdentifier ret = nii.builder().augmentation(Node1.class) + .child(IgpNodeAttributes.class).build(); - trans.merge(LogicalDatastoreType.OPERATIONAL, nii, new NodeBuilder().setKey(nii.getKey()).setNodeId(ni) + trans.merge(LogicalDatastoreType.OPERATIONAL, nii, new NodeBuilder().withKey(nii.getKey()).setNodeId(ni) .addAugmentation(Node1.class, new Node1Builder().setIgpNodeAttributes( - new IgpNodeAttributesBuilder().setPrefix(Collections.emptyList()).build()).build()).build()); + new IgpNodeAttributesBuilder().setPrefix(Collections.emptyList()).build()).build()).build()); this.nodes.put(ni, new NodeUsage(ret)); return ret; } - protected abstract Attributes getAttributes(final T value); + protected abstract Attributes getAttributes(T value); - protected abstract IpPrefix getPrefix(final T value); + protected abstract IpPrefix getPrefix(T value); @Override protected final void createObject(final ReadWriteTransaction trans, final InstanceIdentifier id, final T value) { final NodeId ni = advertizingNode(getAttributes(value)); + if (ni == null) { + return; + } final InstanceIdentifier nii = ensureNodePresent(trans, ni); final IpPrefix prefix = getPrefix(value); final PrefixKey pk = new PrefixKey(prefix); trans.put(LogicalDatastoreType.OPERATIONAL, - nii.child(Prefix.class, pk), new PrefixBuilder().setKey(pk).setPrefix(prefix).build()); + nii.child(Prefix.class, pk), new PrefixBuilder().withKey(pk).setPrefix(prefix).build()); } @Override protected final void removeObject(final ReadWriteTransaction trans, final InstanceIdentifier id, final T value) { + if (value == null) { + LOG.error("Empty before-data received in delete data change notification for instance id {}", id); + return; + } + final NodeId ni = advertizingNode(getAttributes(value)); + if (ni == null) { + return; + } final NodeUsage present = this.nodes.get(ni); Preconditions.checkState(present != null, "Removing prefix from non-existent node %s", present); @@ -154,12 +172,20 @@ abstract class AbstractReachabilityTopologyBuilder extends Abst if (present.useCount == 0) { final IgpNodeAttributes attrs = read(trans, present.attrId); if (attrs != null) { - present.useCount = attrs.getPrefix().size(); - if (present.useCount == 0) { - trans.delete(LogicalDatastoreType.OPERATIONAL, nodeInstanceId(ni)); - this.nodes.remove(ni); - } + final List prefix = attrs.getPrefix(); + present.useCount = prefix == null ? 0 : prefix.size(); + } else { + present.useCount = 0; + } + if (present.useCount == 0) { + trans.delete(LogicalDatastoreType.OPERATIONAL, nodeInstanceId(ni)); + this.nodes.remove(ni); } } } + + @Override + protected void clearTopology() { + this.nodes.clear(); + } }