Spell out termination points being created 79/4479/1
authorRobert Varga <rovarga@cisco.com>
Mon, 20 Jan 2014 17:04:11 +0000 (18:04 +0100)
committerRobert Varga <rovarga@cisco.com>
Mon, 20 Jan 2014 17:04:11 +0000 (18:04 +0100)
Change-Id: Id447e4409c9d1aee0b7eb19e3c6cdb295cf7c7a8
Signed-off-by: Robert Varga <rovarga@cisco.com>
bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java

index 73e6c978d4feff74b75708d711a68a2b90dce89f..9cd3fa0d16169e46074f3a62e6fb3a09e8c193ca 100644 (file)
@@ -18,6 +18,7 @@ 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;
@@ -322,8 +323,13 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
                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);
+               final InstanceIdentifier<TerminationPoint> stpId = buildTpIdentifier(srcNode, srcTp.getKey());
+               trans.putOperationalData(stpId, srcTp);
+               LOG.debug("Created TP {} at {} as link source", srcTp, stpId);
+
+               final InstanceIdentifier<TerminationPoint> dtpId = buildTpIdentifier(dstNode, dstTp.getKey());
+               trans.putOperationalData(dtpId, dstTp);
+               LOG.debug("Created TP {} at {} as link destination", dstTp, dtpId);
 
                final InstanceIdentifier<?> lid = buildLinkIdentifier(base, l);
                final Link link = lb.build();
@@ -502,7 +508,9 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
                                Attributes1.class).getAttributeType()).getPrefixAttributes();
 
                final PrefixBuilder pb = new PrefixBuilder();
-               pb.setPrefix(p.getIpReachabilityInformation());
+               final IpPrefix ippfx = p.getIpReachabilityInformation();
+               pb.setKey(new PrefixKey(ippfx));
+               pb.setPrefix(ippfx);
                if (pa != null) {
                        pb.setMetric(pa.getPrefixMetric().getValue());
                }