X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=bgp%2Frib-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fprotocol%2Fbgp%2Frib%2Fimpl%2FApplicationPeer.java;h=0c4228661bb5e4340609327189315ad9e4d6630a;hb=117ee238c19162335c50ef85114b05e87d50b538;hp=edf71c5c287379db3ca9de316e8fb255d62d0945;hpb=d853b06a5ce3f76ae91022679b3ba6ae685cc84d;p=bgpcep.git diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ApplicationPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ApplicationPeer.java index edf71c5c28..0c4228661b 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ApplicationPeer.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ApplicationPeer.java @@ -8,102 +8,77 @@ package org.opendaylight.protocol.bgp.rib.impl; import com.google.common.base.Preconditions; +import com.google.common.base.Verify; import com.google.common.net.InetAddresses; -import java.util.Map.Entry; -import org.opendaylight.controller.md.sal.binding.api.DataChangeListener; -import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; -import org.opendaylight.protocol.bgp.rib.spi.AbstractAdjRIBs; -import org.opendaylight.protocol.bgp.rib.spi.AdjRIBsIn; -import org.opendaylight.protocol.bgp.rib.spi.Peer; +import java.util.Arrays; +import java.util.Collection; +import org.opendaylight.controller.md.sal.common.api.data.AsyncTransaction; +import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.controller.md.sal.common.api.data.TransactionChain; +import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener; +import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeListener; +import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; +import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.UpdateBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.update.PathAttributesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.BgpTableType; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.PathAttributes1; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.PathAttributes1Builder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.PathAttributes2; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.PathAttributes2Builder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.update.path.attributes.MpReachNlriBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.update.path.attributes.MpUnreachNlriBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.ApplicationRibId; -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.rib.rev130925.PeerRole; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.bgp.rib.rib.Peer; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.bgp.rib.rib.peer.AdjRibIn; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.Tables; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.TablesKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.route.Attributes; -import org.opendaylight.yangtools.yang.binding.DataObject; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +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.tree.DataTreeCandidate; +import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ApplicationPeer implements AutoCloseable, Peer, DataChangeListener { +public class ApplicationPeer implements AutoCloseable, org.opendaylight.protocol.bgp.rib.spi.Peer, DOMDataTreeChangeListener, TransactionChainListener { private static final Logger LOG = LoggerFactory.getLogger(ApplicationPeer.class); private final byte[] rawIdentifier; private final RIBImpl targetRib; private final String name; + private final YangInstanceIdentifier adjRibsInId; + private final DOMTransactionChain chain; + private final DOMTransactionChain writerChain; + + private AdjRibInWriter writer; public ApplicationPeer(final ApplicationRibId applicationRibId, final Ipv4Address ipAddress, final RIBImpl targetRib) { this.name = applicationRibId.getValue().toString(); this.targetRib = Preconditions.checkNotNull(targetRib); this.rawIdentifier = InetAddresses.forString(ipAddress.getValue()).getAddress(); + final NodeIdentifierWithPredicates peerId = IdentifierUtils.domPeerId(RouterIds.createPeerId(ipAddress)); + this.adjRibsInId = this.targetRib.getYangRibId().node(Peer.QNAME).node(peerId).node(AdjRibIn.QNAME).node(Tables.QNAME); + this.chain = this.targetRib.createPeerChain(this); + this.writerChain = this.targetRib.createPeerChain(this); + this.writer = AdjRibInWriter.create(this.targetRib.getYangRibId(), PeerRole.Ibgp, this.writerChain); + // FIXME: set to true, once it's fixed how to skip advertising routes back to AppPeer + this.writer = this.writer.transform(RouterIds.createPeerId(ipAddress), this.targetRib.getRibSupportContext(), this.targetRib.getLocalTablesKeys(), false); } @Override - public void onDataChanged(final AsyncDataChangeEvent, DataObject> change) { - final UpdateBuilder ub = new UpdateBuilder(); - for (final Entry, DataObject> data : change.getCreatedData().entrySet()) { - fillMpReach(ub, data); - } - for (final Entry, DataObject> data : change.getUpdatedData().entrySet()) { - fillMpReach(ub, data); - } - for (final InstanceIdentifier data : change.getRemovedPaths()) { - final MpUnreachNlriBuilder unreachBuilder = new MpUnreachNlriBuilder(); - final TablesKey key = data.firstKeyOf(Tables.class, TablesKey.class); - unreachBuilder.setAfi(key.getAfi()); - unreachBuilder.setSafi(key.getSafi()); - final AbstractAdjRIBs ribsIn = (AbstractAdjRIBs)this.targetRib.getTable(key); - ribsIn.addWith(unreachBuilder, data); - ub.setPathAttributes(new PathAttributesBuilder().addAugmentation(PathAttributes2.class, new PathAttributes2Builder().setMpUnreachNlri(unreachBuilder.build()).build()).build()); - LOG.debug("Updating RIB with {}", ub.build()); - this.targetRib.updateTables(this, ub.build()); - } - - } - - private void fillMpReach(final UpdateBuilder ub, final Entry, DataObject> data) { - if (data.getValue() instanceof Route) { - final Route r = (Route) data.getValue(); - final MpReachNlriBuilder reachBuilder = new MpReachNlriBuilder(); - final TablesKey key = data.getKey().firstKeyOf(Tables.class, TablesKey.class); - reachBuilder.setAfi(key.getAfi()); - reachBuilder.setSafi(key.getSafi()); - final AdjRIBsIn ribsIn = this.targetRib.getTable(key); - ribsIn.addAdvertisement(reachBuilder, (Route)data.getValue()); - final PathAttributesBuilder pa = new PathAttributesBuilder(); - pa.addAugmentation(PathAttributes1.class, new PathAttributes1Builder().setMpReachNlri(reachBuilder.build()).build()); - this.addAttributes(pa, r.getAttributes()); - pa.setCNextHop(reachBuilder.getCNextHop()); - ub.setPathAttributes(pa.build()); - LOG.debug("Updating RIB with {}", ub.build()); - this.targetRib.updateTables(this, ub.build()); - } - } - - private void addAttributes(final PathAttributesBuilder pa, final Attributes a) { - if (a != null) { - pa.setAggregator(a.getAggregator()); - pa.setAsPath(a.getAsPath()); - pa.setAtomicAggregate(a.getAtomicAggregate()); - pa.setClusterId(a.getClusterId()); - pa.setCommunities(a.getCommunities()); - pa.setExtendedCommunities(a.getExtendedCommunities()); - pa.setLocalPref(a.getLocalPref()); - pa.setMultiExitDisc(a.getMultiExitDisc()); - pa.setOrigin(a.getOrigin()); - pa.setOriginatorId(a.getOriginatorId()); + public void onDataTreeChanged(final Collection changes) { + final DOMDataWriteTransaction tx = this.chain.newWriteOnlyTransaction(); + LOG.debug("Received data change to ApplicationRib {}", changes); + for (final DataTreeCandidate tc : changes) { + LOG.debug("Modification Type {}", tc.getRootNode().getModificationType()); + final YangInstanceIdentifier path = tc.getRootPath(); + final PathArgument lastArg = path.getLastPathArgument(); + Verify.verify(lastArg instanceof NodeIdentifierWithPredicates, "Unexpected type %s in path %s", lastArg.getClass(), path); + final NodeIdentifierWithPredicates tableKey = (NodeIdentifierWithPredicates) lastArg; + for (final DataTreeCandidateNode child : tc.getRootNode().getChildNodes()) { + final YangInstanceIdentifier tableId = this.adjRibsInId.node(tableKey).node(child.getIdentifier()); + if (child.getDataAfter().isPresent()) { + LOG.trace("App peer -> AdjRibsIn path : {}", tableId); + LOG.trace("App peer -> AdjRibsIn data : {}", child.getDataAfter().get()); + tx.put(LogicalDatastoreType.OPERATIONAL, tableId, child.getDataAfter().get()); + } + } } + tx.submit(); } @Override @@ -113,13 +88,24 @@ public class ApplicationPeer implements AutoCloseable, Peer, DataChangeListener @Override public void close() { - for (final BgpTableType t : this.targetRib.getLocalTables()) { - this.targetRib.clearTable(this, new TablesKey(t.getAfi(), t.getSafi())); - } + this.writer.cleanTables(this.targetRib.getLocalTablesKeys()); + this.chain.close(); + this.writerChain.close(); } @Override public byte[] getRawIdentifier() { - return this.rawIdentifier; + return Arrays.copyOf(this.rawIdentifier, this.rawIdentifier.length); + } + + @Override + public void onTransactionChainFailed(final TransactionChain chain, final AsyncTransaction transaction, + final Throwable cause) { + LOG.error("Transaction chain failed.", cause); + } + + @Override + public void onTransactionChainSuccessful(final TransactionChain chain) { + LOG.debug("Transaction chain {} successfull.", chain); } }