Extract TopologySessionListener as an interface 21/4621/2
authorRobert Varga <rovarga@cisco.com>
Thu, 23 Jan 2014 02:59:39 +0000 (03:59 +0100)
committerRobert Varga <rovarga@cisco.com>
Thu, 23 Jan 2014 14:14:17 +0000 (15:14 +0100)
This removes coupling between ServerSessionManager and the interface
that per-model listeners need to implement.

Change-Id: Ibdf6d91b571943edf205e8486d06dba50dbd7c10
Signed-off-by: Robert Varga <rovarga@cisco.com>
pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java
pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java [new file with mode: 0644]
pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologySessionListener.java
pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologySessionRPCs.java [new file with mode: 0644]

index 9272f2914342e996f5fb6e46dda4619bfead1ecc..7413f436807e4b93840465dbca5b60464b0751fd 100644 (file)
@@ -47,7 +47,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 /**
  *
  */
-final class ServerSessionManager implements SessionListenerFactory<PCEPSessionListener>, AutoCloseable {
+final class ServerSessionManager implements SessionListenerFactory<PCEPSessionListener>, AutoCloseable, TopologySessionRPCs {
        private static final Logger LOG = LoggerFactory.getLogger(ServerSessionManager.class);
        private static final long DEFAULT_HOLD_STATE_NANOS = TimeUnit.MINUTES.toNanos(5);
 
@@ -109,10 +109,11 @@ final class ServerSessionManager implements SessionListenerFactory<PCEPSessionLi
 
        @Override
        public PCEPSessionListener getSessionListener() {
-               return new TopologySessionListener(this);
+               return new Stateful07TopologySessionListener(this);
        }
 
-       synchronized ListenableFuture<OperationResult> addLsp(final AddLspArgs input) {
+       @Override
+       public synchronized ListenableFuture<OperationResult> addLsp(final AddLspArgs input) {
                // Get the listener corresponding to the node
                final TopologySessionListener l = this.nodes.get(input.getNode());
                if (l == null) {
@@ -123,7 +124,8 @@ final class ServerSessionManager implements SessionListenerFactory<PCEPSessionLi
                return l.addLsp(input);
        }
 
-       synchronized ListenableFuture<OperationResult> removeLsp(final RemoveLspArgs input) {
+       @Override
+       public synchronized ListenableFuture<OperationResult> removeLsp(final RemoveLspArgs input) {
                // Get the listener corresponding to the node
                final TopologySessionListener l = this.nodes.get(input.getNode());
                if (l == null) {
@@ -134,7 +136,8 @@ final class ServerSessionManager implements SessionListenerFactory<PCEPSessionLi
                return l.removeLsp(input);
        }
 
-       synchronized ListenableFuture<OperationResult> updateLsp(final UpdateLspArgs input) {
+       @Override
+       public synchronized ListenableFuture<OperationResult> updateLsp(final UpdateLspArgs input) {
                // Get the listener corresponding to the node
                final TopologySessionListener l = this.nodes.get(input.getNode());
                if (l == null) {
@@ -145,7 +148,8 @@ final class ServerSessionManager implements SessionListenerFactory<PCEPSessionLi
                return l.updateLsp(input);
        }
 
-       synchronized ListenableFuture<OperationResult> ensureLspOperational(final EnsureLspOperationalInput input) {
+       @Override
+       public synchronized ListenableFuture<OperationResult> ensureLspOperational(final EnsureLspOperationalInput input) {
                // Get the listener corresponding to the node
                final TopologySessionListener l = this.nodes.get(input.getNode());
                if (l == null) {
diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java
new file mode 100644 (file)
index 0000000..5dc8466
--- /dev/null
@@ -0,0 +1,522 @@
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.bgpcep.pcep.topology.provider;
+
+import io.netty.util.concurrent.FutureListener;
+
+import java.net.InetAddress;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import javax.annotation.concurrent.GuardedBy;
+
+import org.opendaylight.controller.md.sal.common.api.TransactionStatus;
+import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction;
+import org.opendaylight.protocol.pcep.PCEPSession;
+import org.opendaylight.protocol.pcep.PCEPSessionListener;
+import org.opendaylight.protocol.pcep.PCEPTerminationReason;
+import org.opendaylight.protocol.pcep.TerminationReason;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddressBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev131126.PcinitiateBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev131126.pcinitiate.message.PcinitiateMessageBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev131126.pcinitiate.message.pcinitiate.message.RequestsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.PcrptMessage;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.PcupdBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.PlspId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.SrpIdNumber;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.Tlvs2;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.lsp.object.Lsp;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.lsp.object.LspBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.lsp.object.lsp.TlvsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.pcrpt.message.pcrpt.message.Reports;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.pcupd.message.PcupdMessageBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.pcupd.message.pcupd.message.UpdatesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.pcupd.message.pcupd.message.updates.PathBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.srp.object.Srp;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.srp.object.SrpBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.stateful.capability.tlv.Stateful;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.symbolic.path.name.tlv.SymbolicPathName;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.symbolic.path.name.tlv.SymbolicPathNameBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.Pcerr;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.PcerrBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Message;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.MessageHeader;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.ProtocolVersion;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.open.object.open.Tlvs;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcerr.message.PcerrMessageBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.AddLspArgs;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.EnsureLspOperationalInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.Node1;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.Node1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.OperationResult;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.PccSyncState;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.RemoveLspArgs;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.UpdateLspArgs;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.lsp.metadata.Metadata;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.pcep.client.attributes.PathComputationClient;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.pcep.client.attributes.PathComputationClientBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.pcep.client.attributes.path.computation.client.ReportedLsp;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.pcep.client.attributes.path.computation.client.ReportedLspBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.pcep.client.attributes.path.computation.client.ReportedLspKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.pcep.client.attributes.path.computation.client.StatefulTlvBuilder;
+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.network.topology.Topology;
+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.yangtools.yang.binding.DataContainer;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdentifierBuilder;
+import org.opendaylight.yangtools.yang.common.RpcResult;
+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.ImmutableList;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.JdkFutureAdapters;
+import com.google.common.util.concurrent.ListenableFuture;
+
+final class Stateful07TopologySessionListener implements PCEPSessionListener, TopologySessionListener {
+       private static final Logger LOG = LoggerFactory.getLogger(Stateful07TopologySessionListener.class);
+       private static final MessageHeader MESSAGE_HEADER = new MessageHeader() {
+               private final ProtocolVersion version = new ProtocolVersion((short) 1);
+
+               @Override
+               public Class<? extends DataContainer> getImplementedInterface() {
+                       return MessageHeader.class;
+               }
+
+               @Override
+               public ProtocolVersion getVersion() {
+                       return this.version;
+               }
+       };
+       private static final Pcerr UNHANDLED_MESSAGE_ERROR = new PcerrBuilder().setPcerrMessage(
+                       new PcerrMessageBuilder().setErrorType(null).build()).build();
+       private final ServerSessionManager serverSessionManager;
+
+       /**
+        * @param serverSessionManager
+        */
+       Stateful07TopologySessionListener(final ServerSessionManager serverSessionManager) {
+               this.serverSessionManager = Preconditions.checkNotNull(serverSessionManager);
+       }
+
+       private final Map<SrpIdNumber, PCEPRequest> waitingRequests = new HashMap<>();
+       private final Map<SrpIdNumber, PCEPRequest> sendingRequests = new HashMap<>();
+       private final Map<PlspId, SymbolicPathName> lsps = new HashMap<>();
+       private PathComputationClientBuilder pccBuilder;
+       private InstanceIdentifier<Node1> topologyAugment;
+       private InstanceIdentifier<Node> topologyNode;
+       private Node1Builder topologyAugmentBuilder;
+       private boolean ownsTopology = false;
+       private boolean synced = false;
+       private PCEPSession session;
+
+       @GuardedBy("this")
+       private long requestId = 1;
+       private TopologyNodeState nodeState;
+
+       private static String createNodeId(final InetAddress addr) {
+               return "pcc://" + addr.getHostAddress();
+       }
+
+       private Node topologyNode(final DataModificationTransaction trans, final InetAddress address) {
+               final String pccId = createNodeId(address);
+               final Topology topo = (Topology) trans.readOperationalData(this.serverSessionManager.getTopology());
+
+               for (final Node n : topo.getNode()) {
+                       LOG.debug("Matching topology node {} to id {}", n, pccId);
+                       if (n.getNodeId().getValue().equals(pccId)) {
+                               this.topologyNode =
+                                               InstanceIdentifier.builder(this.serverSessionManager.getTopology()).child(Node.class, n.getKey()).toInstance();
+                               LOG.debug("Reusing topology node {} for id {} at {}", n, pccId, this.topologyNode);
+                               return n;
+                       }
+               }
+
+               /*
+                * We failed to find a matching node. Let's create a dynamic one
+                * and note that we are the owner (so we clean it up afterwards).
+                */
+               final NodeId id = new NodeId(pccId);
+               final NodeKey nk = new NodeKey(id);
+               final InstanceIdentifier<Node> nti = InstanceIdentifier.builder(this.serverSessionManager.getTopology()).child(Node.class, nk).toInstance();
+
+               final Node ret = new NodeBuilder().setKey(nk).setNodeId(id).build();
+
+               trans.putOperationalData(nti, ret);
+               LOG.debug("Created topology node {} for id {} at {}", ret, pccId, nti);
+               this.ownsTopology = true;
+               this.topologyNode = nti;
+               return ret;
+       }
+
+       @Override
+       public synchronized void onSessionUp(final PCEPSession session) {
+               /*
+                * The session went up. Look up the router in Inventory model,
+                * create it if it is not there (marking that fact for later
+                * deletion), and mark it as synchronizing. Also create it in
+                * the topology model, with empty LSP list.
+                */
+               final InetAddress peerAddress = session.getRemoteAddress();
+               final DataModificationTransaction trans = this.serverSessionManager.beginTransaction();
+
+               final Node topoNode = topologyNode(trans, peerAddress);
+               LOG.debug("Peer {} resolved to topology node {}", peerAddress, topoNode);
+
+               // Our augmentation in the topology node
+               this.synced = false;
+               this.pccBuilder = new PathComputationClientBuilder();
+               this.pccBuilder.setIpAddress(IpAddressBuilder.getDefaultInstance(peerAddress.getHostAddress()));
+
+               final Tlvs tlvs = session.getRemoteTlvs();
+               if (tlvs.getAugmentation(Tlvs2.class) != null) {
+                       final Stateful stateful = tlvs.getAugmentation(Tlvs2.class).getStateful();
+                       if (stateful != null) {
+                               this.pccBuilder.setReportedLsp(Collections.<ReportedLsp> emptyList());
+                               this.pccBuilder.setStatefulTlv(new StatefulTlvBuilder().setStateful(stateful).build());
+                               this.pccBuilder.setStateSync(PccSyncState.InitialResync);
+                       } else {
+                               LOG.debug("Peer {} does not advertise stateful TLV", peerAddress);
+                       }
+               } else {
+                       LOG.debug("Peer {} does not advertise stateful TLV", peerAddress);
+               }
+
+               this.topologyAugmentBuilder = new Node1Builder().setPathComputationClient(this.pccBuilder.build());
+               this.topologyAugment = InstanceIdentifier.builder(this.topologyNode).augmentation(Node1.class).toInstance();
+               final Node1 ta = topologyAugmentBuilder.build();
+
+               trans.putOperationalData(this.topologyAugment, ta);
+               LOG.debug("Peer data {} set to {}", this.topologyAugment, ta);
+
+               // All set, commit the modifications
+               final ListenableFuture<RpcResult<TransactionStatus>> f = JdkFutureAdapters.listenInPoolThread(trans.commit());
+               Futures.addCallback(f, new FutureCallback<RpcResult<TransactionStatus>>() {
+                       @Override
+                       public void onSuccess(final RpcResult<TransactionStatus> result) {
+                               LOG.trace("Internal state for session {} updated successfully", session);
+                       }
+
+                       @Override
+                       public void onFailure(final Throwable t) {
+                               LOG.error("Failed to update internal state for session {}, terminating it", session, t);
+                               session.close(TerminationReason.Unknown);
+                       }
+               });
+
+               this.nodeState = this.serverSessionManager.takeNodeState(topoNode.getNodeId(), this);
+               this.session = session;
+               LOG.info("Session with {} attached to topology node {}", session.getRemoteAddress(), topoNode.getNodeId());
+       }
+
+       @GuardedBy("this")
+       private void tearDown(final PCEPSession session) {
+               this.serverSessionManager.releaseNodeState(this.nodeState);
+               this.nodeState = null;
+               this.session = null;
+
+               final DataModificationTransaction trans = this.serverSessionManager.beginTransaction();
+
+               // The session went down. Undo all the Topology changes we have done.
+               trans.removeOperationalData(this.topologyAugment);
+               if (this.ownsTopology) {
+                       trans.removeOperationalData(this.topologyNode);
+               }
+
+               Futures.addCallback(JdkFutureAdapters.listenInPoolThread(trans.commit()), new FutureCallback<RpcResult<TransactionStatus>>() {
+                       @Override
+                       public void onSuccess(final RpcResult<TransactionStatus> result) {
+                               LOG.trace("Internal state for session {} cleaned up successfully", session);
+                       }
+
+                       @Override
+                       public void onFailure(final Throwable t) {
+                               LOG.error("Failed to cleanup internal state for session {}", session, t);
+                       }
+               });
+
+               // Clear all requests which have not been sent to the peer: they result in cancellation
+               for (final Entry<SrpIdNumber, PCEPRequest> e : this.sendingRequests.entrySet()) {
+                       LOG.debug("Request {} was not sent when session went down, cancelling the instruction", e.getKey());
+                       e.getValue().setResult(OperationResults.UNSENT);
+               }
+               this.sendingRequests.clear();
+
+               // CLear all requests which have not been acked by the peer: they result in failure
+               for (final Entry<SrpIdNumber, PCEPRequest> e : this.waitingRequests.entrySet()) {
+                       LOG.info("Request {} was incomplete when session went down, failing the instruction", e.getKey());
+                       e.getValue().setResult(OperationResults.NOACK);
+               }
+               this.waitingRequests.clear();
+       }
+
+       @Override
+       public synchronized void onSessionDown(final PCEPSession session, final Exception e) {
+               LOG.warn("Session {} went down unexpectedly", e);
+               tearDown(session);
+       }
+
+       @Override
+       public synchronized void onSessionTerminated(final PCEPSession session, final PCEPTerminationReason reason) {
+               LOG.info("Session {} terminated by peer with reason {}", session, reason);
+               tearDown(session);
+       }
+
+       private InstanceIdentifierBuilder<ReportedLsp> lspIdentifier(final ReportedLspKey key) {
+               return InstanceIdentifier.builder(this.topologyAugment).child(PathComputationClient.class).child(ReportedLsp.class, key);
+       }
+
+       @Override
+       public synchronized void onMessage(final PCEPSession session, final Message message) {
+               if (!(message instanceof PcrptMessage)) {
+                       LOG.info("Unhandled message {} on session {}", message, session);
+                       session.sendMessage(UNHANDLED_MESSAGE_ERROR);
+               }
+
+               final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.pcrpt.message.PcrptMessage rpt = ((PcrptMessage) message).getPcrptMessage();
+
+               final DataModificationTransaction trans = this.serverSessionManager.beginTransaction();
+
+               for (final Reports r : rpt.getReports()) {
+                       final Lsp lsp = r.getLsp();
+
+                       if (!lsp.isSync() && !this.synced) {
+                               // Update synchronization flag
+                               this.synced = true;
+                               this.topologyAugmentBuilder.setPathComputationClient(this.pccBuilder.setStateSync(PccSyncState.Synchronized).build());
+                               final Node1 ta = this.topologyAugmentBuilder.build();
+                               trans.putOperationalData(this.topologyAugment, ta);
+                               LOG.debug("Peer data {} set to {}", this.topologyAugment, ta);
+
+                               // The node has completed synchronization, cleanup metadata no longer reported back
+                               this.nodeState.cleanupExcept(Collections2.transform(
+                                               this.lsps.values(),
+                                               new Function<SymbolicPathName, org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.SymbolicPathName>() {
+                                                       @Override
+                                                       public org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.SymbolicPathName apply(
+                                                                       final SymbolicPathName input) {
+                                                               return input.getPathName();
+                                                       }
+                                               }));
+                               LOG.debug("Session {} achieved synchronized state", session);
+                               continue;
+                       }
+
+                       final ReportedLspBuilder rlb = new ReportedLspBuilder(r);
+                       boolean solicited = false;
+
+                       final Srp srp = r.getSrp();
+                       if (srp != null) {
+                               final SrpIdNumber id = srp.getOperationId();
+                               if (id.getValue() != 0) {
+                                       solicited = true;
+
+                                       switch (lsp.getOperational()) {
+                                       case Active:
+                                       case Down:
+                                       case Up:
+                                               final PCEPRequest req = this.waitingRequests.remove(id);
+                                               if (req != null) {
+                                                       LOG.debug("Request {} resulted in LSP operational state {}", id, lsp.getOperational());
+                                                       rlb.setMetadata(req.getMetadata());
+                                                       req.setResult(OperationResults.SUCCESS);
+                                               } else {
+                                                       LOG.warn("Request ID {} not found in outstanding DB", id);
+                                               }
+                                               break;
+                                       case GoingDown:
+                                       case GoingUp:
+                                               // These are transitive states, so we don't have to do anything, as they will be followed
+                                               // up...
+                                               break;
+                                       }
+                               }
+                       }
+
+                       final PlspId id = lsp.getPlspId();
+                       if (lsp.isRemove()) {
+                               final SymbolicPathName name = this.lsps.remove(id);
+                               if (name != null) {
+                                       this.nodeState.removeLspMetadata(name.getPathName());
+                                       trans.removeOperationalData(lspIdentifier(new ReportedLspKey(name.getPathName())).build());
+                               }
+
+                               LOG.debug("LSP {} removed", lsp);
+                       } else {
+                               if (!this.lsps.containsKey(id)) {
+                                       LOG.debug("PLSPID {} not known yet, looking for a symbolic name", id);
+
+                                       final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.lsp.object.lsp.Tlvs tlvs = r.getLsp().getTlvs();
+                                       if (tlvs != null && tlvs.getSymbolicPathName() != null) {
+                                               this.lsps.put(id, tlvs.getSymbolicPathName());
+                                       } else {
+                                               LOG.error("PLSPID {} seen for the first time, not reporting the LSP", id);
+                                               continue;
+                                       }
+                               }
+
+                               rlb.setKey(new ReportedLspKey(this.lsps.get(id).getPathName()));
+
+                               // If this is an unsolicited update. We need to make sure we retain the metadata already present
+                               if (solicited) {
+                                       this.nodeState.setLspMetadata(rlb.getName(), rlb.getMetadata());
+                               } else {
+                                       rlb.setMetadata(this.nodeState.getLspMetadata(rlb.getName()));
+                               }
+
+                               trans.putOperationalData(lspIdentifier(rlb.getKey()).build(), rlb.build());
+
+                               LOG.debug("LSP {} updated", lsp);
+                       }
+               }
+
+               Futures.addCallback(JdkFutureAdapters.listenInPoolThread(trans.commit()), new FutureCallback<RpcResult<TransactionStatus>>() {
+                       @Override
+                       public void onSuccess(final RpcResult<TransactionStatus> result) {
+                               LOG.trace("Internal state for session {} updated successfully", session);
+                       }
+
+                       @Override
+                       public void onFailure(final Throwable t) {
+                               LOG.error("Failed to update internal state for session {}, closing it", session, t);
+                               session.close(TerminationReason.Unknown);
+                       }
+               });
+       }
+
+       @GuardedBy("this")
+       private SrpIdNumber nextRequest() {
+               return new SrpIdNumber(this.requestId++);
+       }
+
+       private synchronized void messageSendingComplete(final SrpIdNumber requestId, final io.netty.util.concurrent.Future<Void> future) {
+               final PCEPRequest req = this.sendingRequests.remove(requestId);
+
+               if (future.isSuccess()) {
+                       this.waitingRequests.put(requestId, req);
+               } else {
+                       LOG.info("Failed to send request {}, instruction cancelled", requestId, future.cause());
+                       req.setResult(OperationResults.UNSENT);
+               }
+       }
+
+       synchronized ListenableFuture<OperationResult> sendMessage(final Message message, final SrpIdNumber requestId,
+                       final Metadata metadata) {
+               final io.netty.util.concurrent.Future<Void> f = this.session.sendMessage(message);
+               final PCEPRequest req = new PCEPRequest(metadata);
+
+               this.sendingRequests.put(requestId, req);
+
+               f.addListener(new FutureListener<Void>() {
+                       @Override
+                       public void operationComplete(final io.netty.util.concurrent.Future<Void> future) {
+                               messageSendingComplete(requestId, future);
+                       }
+               });
+
+               return req.getFuture();
+       }
+
+       @Override
+       public synchronized ListenableFuture<OperationResult> addLsp(final AddLspArgs input) {
+               // Make sure there is no such LSP
+               final InstanceIdentifier<ReportedLsp> lsp = InstanceIdentifier.builder(topologyAugment).child(PathComputationClient.class).child(
+                               ReportedLsp.class, new ReportedLspKey(input.getName())).toInstance();
+               if (serverSessionManager.readOperationalData(lsp) != null) {
+                       LOG.debug("Node {} already contains lsp {} at {}", input.getNode(), input.getName(), lsp);
+                       return OperationResults.UNSENT.future();
+               }
+
+               // Build the request
+               final RequestsBuilder rb = new RequestsBuilder();
+               rb.fieldsFrom(input.getArguments());
+               rb.setSrp(new SrpBuilder().setOperationId(nextRequest()).setProcessingRule(Boolean.TRUE).build());
+               rb.setLsp(new LspBuilder().setAdministrative(input.getArguments().isAdministrative()).setDelegate(Boolean.TRUE).setTlvs(
+                               new TlvsBuilder().setSymbolicPathName(new SymbolicPathNameBuilder().setPathName(input.getName()).build()).build()).build());
+
+               final PcinitiateMessageBuilder ib = new PcinitiateMessageBuilder(MESSAGE_HEADER);
+               ib.setRequests(ImmutableList.of(rb.build()));
+
+               // Send the message
+               return sendMessage(new PcinitiateBuilder().setPcinitiateMessage(ib.build()).build(), rb.getSrp().getOperationId(),
+                               input.getArguments().getMetadata());
+       }
+
+       @Override
+       public synchronized ListenableFuture<OperationResult> removeLsp(final RemoveLspArgs input) {
+               // Make sure the LSP exists, we need it for PLSP-ID
+               final InstanceIdentifier<ReportedLsp> lsp = InstanceIdentifier.builder(topologyAugment).child(PathComputationClient.class).child(
+                               ReportedLsp.class, new ReportedLspKey(input.getName())).toInstance();
+               final ReportedLsp rep = serverSessionManager.readOperationalData(lsp);
+               if (rep == null) {
+                       LOG.debug("Node {} does not contain LSP {}", input.getNode(), input.getName());
+                       return OperationResults.UNSENT.future();
+               }
+
+               // Build the request and send it
+               final RequestsBuilder rb = new RequestsBuilder();
+               rb.setSrp(new SrpBuilder().setOperationId(nextRequest()).setProcessingRule(Boolean.TRUE).build());
+               rb.setLsp(new LspBuilder().setRemove(Boolean.TRUE).setPlspId(rep.getLsp().getPlspId()).setDelegate(Boolean.TRUE).build());
+
+               final PcinitiateMessageBuilder ib = new PcinitiateMessageBuilder(MESSAGE_HEADER);
+               ib.setRequests(ImmutableList.of(rb.build()));
+               return sendMessage(new PcinitiateBuilder().setPcinitiateMessage(ib.build()).build(), rb.getSrp().getOperationId(), null);
+       }
+
+       @Override
+       public synchronized ListenableFuture<OperationResult> updateLsp(final UpdateLspArgs input) {
+               // Make sure the LSP exists
+               final InstanceIdentifier<ReportedLsp> lsp = InstanceIdentifier.builder(topologyAugment).child(PathComputationClient.class).child(
+                               ReportedLsp.class, new ReportedLspKey(input.getName())).toInstance();
+               final ReportedLsp rep = serverSessionManager.readOperationalData(lsp);
+               if (rep == null) {
+                       LOG.debug("Node {} does not contain LSP {}", input.getNode(), input.getName());
+                       return OperationResults.UNSENT.future();
+               }
+
+               // Build the PCUpd request and send it
+               final UpdatesBuilder rb = new UpdatesBuilder();
+               rb.setSrp(new SrpBuilder().setOperationId(nextRequest()).setProcessingRule(Boolean.TRUE).build());
+               rb.setLsp(new LspBuilder().setPlspId(rep.getLsp().getPlspId()).setDelegate(Boolean.TRUE).build());
+               final PathBuilder pb = new PathBuilder();
+               rb.setPath(pb.setEro(input.getArguments().getEro()).build());
+
+               final PcupdMessageBuilder ub = new PcupdMessageBuilder(MESSAGE_HEADER);
+               ub.setUpdates(ImmutableList.of(rb.build()));
+               return sendMessage(new PcupdBuilder().setPcupdMessage(ub.build()).build(), rb.getSrp().getOperationId(),
+                               input.getArguments().getMetadata());
+       }
+
+       @Override
+       public synchronized ListenableFuture<OperationResult> ensureLspOperational(final EnsureLspOperationalInput input) {
+               // Make sure the LSP exists
+               final InstanceIdentifier<ReportedLsp> lsp = InstanceIdentifier.builder(topologyAugment).child(PathComputationClient.class).child(
+                               ReportedLsp.class, new ReportedLspKey(input.getName())).toInstance();
+               LOG.debug("Checking if LSP {} has operational state {}", lsp, input.getArguments().getOperational());
+               final ReportedLsp rep = serverSessionManager.readOperationalData(lsp);
+               if (rep == null) {
+                       LOG.debug("Node {} does not contain LSP {}", input.getNode(), input.getName());
+                       return OperationResults.UNSENT.future();
+               }
+
+               if (rep.getLsp().getOperational().equals(input.getArguments().getOperational())) {
+                       return OperationResults.SUCCESS.future();
+               } else {
+                       return OperationResults.UNSENT.future();
+               }
+       }
+}
\ No newline at end of file
index 45bff48e11fb9b9e27574c2a5ff3039fe4cf3949..c3e90e7e2b30d8c67c15fb4b8733718b1f0b7aaf 100644 (file)
@@ -7,512 +7,6 @@
  */
 package org.opendaylight.bgpcep.pcep.topology.provider;
 
-import io.netty.util.concurrent.FutureListener;
+interface TopologySessionListener extends TopologySessionRPCs {
 
-import java.net.InetAddress;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.annotation.concurrent.GuardedBy;
-
-import org.opendaylight.controller.md.sal.common.api.TransactionStatus;
-import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction;
-import org.opendaylight.protocol.pcep.PCEPSession;
-import org.opendaylight.protocol.pcep.PCEPSessionListener;
-import org.opendaylight.protocol.pcep.PCEPTerminationReason;
-import org.opendaylight.protocol.pcep.TerminationReason;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddressBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev131126.PcinitiateBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev131126.pcinitiate.message.PcinitiateMessageBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev131126.pcinitiate.message.pcinitiate.message.RequestsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.PcrptMessage;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.PcupdBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.PlspId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.SrpIdNumber;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.Tlvs2;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.lsp.object.Lsp;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.lsp.object.LspBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.lsp.object.lsp.TlvsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.pcrpt.message.pcrpt.message.Reports;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.pcupd.message.PcupdMessageBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.pcupd.message.pcupd.message.UpdatesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.pcupd.message.pcupd.message.updates.PathBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.srp.object.Srp;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.srp.object.SrpBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.stateful.capability.tlv.Stateful;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.symbolic.path.name.tlv.SymbolicPathName;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.symbolic.path.name.tlv.SymbolicPathNameBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.Pcerr;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.PcerrBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Message;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.MessageHeader;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.ProtocolVersion;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.open.object.open.Tlvs;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcerr.message.PcerrMessageBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.AddLspArgs;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.EnsureLspOperationalInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.Node1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.Node1Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.OperationResult;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.PccSyncState;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.RemoveLspArgs;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.UpdateLspArgs;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.lsp.metadata.Metadata;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.pcep.client.attributes.PathComputationClient;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.pcep.client.attributes.PathComputationClientBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.pcep.client.attributes.path.computation.client.ReportedLsp;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.pcep.client.attributes.path.computation.client.ReportedLspBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.pcep.client.attributes.path.computation.client.ReportedLspKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.pcep.client.attributes.path.computation.client.StatefulTlvBuilder;
-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.network.topology.Topology;
-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.yangtools.yang.binding.DataContainer;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdentifierBuilder;
-import org.opendaylight.yangtools.yang.common.RpcResult;
-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.ImmutableList;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.JdkFutureAdapters;
-import com.google.common.util.concurrent.ListenableFuture;
-
-final class TopologySessionListener implements PCEPSessionListener {
-       private static final Logger LOG = LoggerFactory.getLogger(TopologySessionListener.class);
-       private static final MessageHeader MESSAGE_HEADER = new MessageHeader() {
-               private final ProtocolVersion version = new ProtocolVersion((short) 1);
-
-               @Override
-               public Class<? extends DataContainer> getImplementedInterface() {
-                       return MessageHeader.class;
-               }
-
-               @Override
-               public ProtocolVersion getVersion() {
-                       return this.version;
-               }
-       };
-       private static final Pcerr UNHANDLED_MESSAGE_ERROR = new PcerrBuilder().setPcerrMessage(
-                       new PcerrMessageBuilder().setErrorType(null).build()).build();
-       private final ServerSessionManager serverSessionManager;
-
-       /**
-        * @param serverSessionManager
-        */
-       TopologySessionListener(final ServerSessionManager serverSessionManager) {
-               this.serverSessionManager = Preconditions.checkNotNull(serverSessionManager);
-       }
-
-       private final Map<SrpIdNumber, PCEPRequest> waitingRequests = new HashMap<>();
-       private final Map<SrpIdNumber, PCEPRequest> sendingRequests = new HashMap<>();
-       private final Map<PlspId, SymbolicPathName> lsps = new HashMap<>();
-       private PathComputationClientBuilder pccBuilder;
-       private InstanceIdentifier<Node1> topologyAugment;
-       private InstanceIdentifier<Node> topologyNode;
-       private Node1Builder topologyAugmentBuilder;
-       private boolean ownsTopology = false;
-       private boolean synced = false;
-       private PCEPSession session;
-
-       @GuardedBy("this")
-       private long requestId = 1;
-       private TopologyNodeState nodeState;
-
-       private static String createNodeId(final InetAddress addr) {
-               return "pcc://" + addr.getHostAddress();
-       }
-
-       private Node topologyNode(final DataModificationTransaction trans, final InetAddress address) {
-               final String pccId = createNodeId(address);
-               final Topology topo = (Topology) trans.readOperationalData(this.serverSessionManager.getTopology());
-
-               for (final Node n : topo.getNode()) {
-                       LOG.debug("Matching topology node {} to id {}", n, pccId);
-                       if (n.getNodeId().getValue().equals(pccId)) {
-                               this.topologyNode =
-                                               InstanceIdentifier.builder(this.serverSessionManager.getTopology()).child(Node.class, n.getKey()).toInstance();
-                               LOG.debug("Reusing topology node {} for id {} at {}", n, pccId, this.topologyNode);
-                               return n;
-                       }
-               }
-
-               /*
-                * We failed to find a matching node. Let's create a dynamic one
-                * and note that we are the owner (so we clean it up afterwards).
-                */
-               final NodeId id = new NodeId(pccId);
-               final NodeKey nk = new NodeKey(id);
-               final InstanceIdentifier<Node> nti = InstanceIdentifier.builder(this.serverSessionManager.getTopology()).child(Node.class, nk).toInstance();
-
-               final Node ret = new NodeBuilder().setKey(nk).setNodeId(id).build();
-
-               trans.putOperationalData(nti, ret);
-               LOG.debug("Created topology node {} for id {} at {}", ret, pccId, nti);
-               this.ownsTopology = true;
-               this.topologyNode = nti;
-               return ret;
-       }
-
-       @Override
-       public synchronized void onSessionUp(final PCEPSession session) {
-               /*
-                * The session went up. Look up the router in Inventory model,
-                * create it if it is not there (marking that fact for later
-                * deletion), and mark it as synchronizing. Also create it in
-                * the topology model, with empty LSP list.
-                */
-               final InetAddress peerAddress = session.getRemoteAddress();
-               final DataModificationTransaction trans = this.serverSessionManager.beginTransaction();
-
-               final Node topoNode = topologyNode(trans, peerAddress);
-               LOG.debug("Peer {} resolved to topology node {}", peerAddress, topoNode);
-
-               // Our augmentation in the topology node
-               this.synced = false;
-               this.pccBuilder = new PathComputationClientBuilder();
-               this.pccBuilder.setIpAddress(IpAddressBuilder.getDefaultInstance(peerAddress.getHostAddress()));
-
-               final Tlvs tlvs = session.getRemoteTlvs();
-               if (tlvs.getAugmentation(Tlvs2.class) != null) {
-                       final Stateful stateful = tlvs.getAugmentation(Tlvs2.class).getStateful();
-                       if (stateful != null) {
-                               this.pccBuilder.setReportedLsp(Collections.<ReportedLsp> emptyList());
-                               this.pccBuilder.setStatefulTlv(new StatefulTlvBuilder().setStateful(stateful).build());
-                               this.pccBuilder.setStateSync(PccSyncState.InitialResync);
-                       } else {
-                               LOG.debug("Peer {} does not advertise stateful TLV", peerAddress);
-                       }
-               } else {
-                       LOG.debug("Peer {} does not advertise stateful TLV", peerAddress);
-               }
-
-               this.topologyAugmentBuilder = new Node1Builder().setPathComputationClient(this.pccBuilder.build());
-               this.topologyAugment = InstanceIdentifier.builder(this.topologyNode).augmentation(Node1.class).toInstance();
-               final Node1 ta = topologyAugmentBuilder.build();
-
-               trans.putOperationalData(this.topologyAugment, ta);
-               LOG.debug("Peer data {} set to {}", this.topologyAugment, ta);
-
-               // All set, commit the modifications
-               final ListenableFuture<RpcResult<TransactionStatus>> f = JdkFutureAdapters.listenInPoolThread(trans.commit());
-               Futures.addCallback(f, new FutureCallback<RpcResult<TransactionStatus>>() {
-                       @Override
-                       public void onSuccess(final RpcResult<TransactionStatus> result) {
-                               LOG.trace("Internal state for session {} updated successfully", session);
-                       }
-
-                       @Override
-                       public void onFailure(final Throwable t) {
-                               LOG.error("Failed to update internal state for session {}, terminating it", session, t);
-                               session.close(TerminationReason.Unknown);
-                       }
-               });
-
-               this.nodeState = this.serverSessionManager.takeNodeState(topoNode.getNodeId(), this);
-               this.session = session;
-               LOG.info("Session with {} attached to topology node {}", session.getRemoteAddress(), topoNode.getNodeId());
-       }
-
-       @GuardedBy("this")
-       private void tearDown(final PCEPSession session) {
-               this.serverSessionManager.releaseNodeState(this.nodeState);
-               this.nodeState = null;
-               this.session = null;
-
-               final DataModificationTransaction trans = this.serverSessionManager.beginTransaction();
-
-               // The session went down. Undo all the Topology changes we have done.
-               trans.removeOperationalData(this.topologyAugment);
-               if (this.ownsTopology) {
-                       trans.removeOperationalData(this.topologyNode);
-               }
-
-               Futures.addCallback(JdkFutureAdapters.listenInPoolThread(trans.commit()), new FutureCallback<RpcResult<TransactionStatus>>() {
-                       @Override
-                       public void onSuccess(final RpcResult<TransactionStatus> result) {
-                               LOG.trace("Internal state for session {} cleaned up successfully", session);
-                       }
-
-                       @Override
-                       public void onFailure(final Throwable t) {
-                               LOG.error("Failed to cleanup internal state for session {}", session, t);
-                       }
-               });
-
-               // Clear all requests which have not been sent to the peer: they result in cancellation
-               for (final Entry<SrpIdNumber, PCEPRequest> e : this.sendingRequests.entrySet()) {
-                       LOG.debug("Request {} was not sent when session went down, cancelling the instruction", e.getKey());
-                       e.getValue().setResult(OperationResults.UNSENT);
-               }
-               this.sendingRequests.clear();
-
-               // CLear all requests which have not been acked by the peer: they result in failure
-               for (final Entry<SrpIdNumber, PCEPRequest> e : this.waitingRequests.entrySet()) {
-                       LOG.info("Request {} was incomplete when session went down, failing the instruction", e.getKey());
-                       e.getValue().setResult(OperationResults.NOACK);
-               }
-               this.waitingRequests.clear();
-       }
-
-       @Override
-       public synchronized void onSessionDown(final PCEPSession session, final Exception e) {
-               LOG.warn("Session {} went down unexpectedly", e);
-               tearDown(session);
-       }
-
-       @Override
-       public synchronized void onSessionTerminated(final PCEPSession session, final PCEPTerminationReason reason) {
-               LOG.info("Session {} terminated by peer with reason {}", session, reason);
-               tearDown(session);
-       }
-
-       private InstanceIdentifierBuilder<ReportedLsp> lspIdentifier(final ReportedLspKey key) {
-               return InstanceIdentifier.builder(this.topologyAugment).child(PathComputationClient.class).child(ReportedLsp.class, key);
-       }
-
-       @Override
-       public synchronized void onMessage(final PCEPSession session, final Message message) {
-               if (!(message instanceof PcrptMessage)) {
-                       LOG.info("Unhandled message {} on session {}", message, session);
-                       session.sendMessage(UNHANDLED_MESSAGE_ERROR);
-               }
-
-               final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.pcrpt.message.PcrptMessage rpt = ((PcrptMessage) message).getPcrptMessage();
-
-               final DataModificationTransaction trans = this.serverSessionManager.beginTransaction();
-
-               for (final Reports r : rpt.getReports()) {
-                       final Lsp lsp = r.getLsp();
-
-                       if (!lsp.isSync() && !this.synced) {
-                               // Update synchronization flag
-                               this.synced = true;
-                               this.topologyAugmentBuilder.setPathComputationClient(this.pccBuilder.setStateSync(PccSyncState.Synchronized).build());
-                               final Node1 ta = this.topologyAugmentBuilder.build();
-                               trans.putOperationalData(this.topologyAugment, ta);
-                               LOG.debug("Peer data {} set to {}", this.topologyAugment, ta);
-
-                               // The node has completed synchronization, cleanup metadata no longer reported back
-                               this.nodeState.cleanupExcept(Collections2.transform(
-                                               this.lsps.values(),
-                                               new Function<SymbolicPathName, org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.SymbolicPathName>() {
-                                                       @Override
-                                                       public org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.SymbolicPathName apply(
-                                                                       final SymbolicPathName input) {
-                                                               return input.getPathName();
-                                                       }
-                                               }));
-                               LOG.debug("Session {} achieved synchronized state", session);
-                               continue;
-                       }
-
-                       final ReportedLspBuilder rlb = new ReportedLspBuilder(r);
-                       boolean solicited = false;
-
-                       final Srp srp = r.getSrp();
-                       if (srp != null) {
-                               final SrpIdNumber id = srp.getOperationId();
-                               if (id.getValue() != 0) {
-                                       solicited = true;
-
-                                       switch (lsp.getOperational()) {
-                                       case Active:
-                                       case Down:
-                                       case Up:
-                                               final PCEPRequest req = this.waitingRequests.remove(id);
-                                               if (req != null) {
-                                                       LOG.debug("Request {} resulted in LSP operational state {}", id, lsp.getOperational());
-                                                       rlb.setMetadata(req.getMetadata());
-                                                       req.setResult(OperationResults.SUCCESS);
-                                               } else {
-                                                       LOG.warn("Request ID {} not found in outstanding DB", id);
-                                               }
-                                               break;
-                                       case GoingDown:
-                                       case GoingUp:
-                                               // These are transitive states, so we don't have to do anything, as they will be followed
-                                               // up...
-                                               break;
-                                       }
-                               }
-                       }
-
-                       final PlspId id = lsp.getPlspId();
-                       if (lsp.isRemove()) {
-                               final SymbolicPathName name = this.lsps.remove(id);
-                               if (name != null) {
-                                       this.nodeState.removeLspMetadata(name.getPathName());
-                                       trans.removeOperationalData(lspIdentifier(new ReportedLspKey(name.getPathName())).build());
-                               }
-
-                               LOG.debug("LSP {} removed", lsp);
-                       } else {
-                               if (!this.lsps.containsKey(id)) {
-                                       LOG.debug("PLSPID {} not known yet, looking for a symbolic name", id);
-
-                                       final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.lsp.object.lsp.Tlvs tlvs = r.getLsp().getTlvs();
-                                       if (tlvs != null && tlvs.getSymbolicPathName() != null) {
-                                               this.lsps.put(id, tlvs.getSymbolicPathName());
-                                       } else {
-                                               LOG.error("PLSPID {} seen for the first time, not reporting the LSP", id);
-                                               continue;
-                                       }
-                               }
-
-                               rlb.setKey(new ReportedLspKey(this.lsps.get(id).getPathName()));
-
-                               // If this is an unsolicited update. We need to make sure we retain the metadata already present
-                               if (solicited) {
-                                       this.nodeState.setLspMetadata(rlb.getName(), rlb.getMetadata());
-                               } else {
-                                       rlb.setMetadata(this.nodeState.getLspMetadata(rlb.getName()));
-                               }
-
-                               trans.putOperationalData(lspIdentifier(rlb.getKey()).build(), rlb.build());
-
-                               LOG.debug("LSP {} updated", lsp);
-                       }
-               }
-
-               Futures.addCallback(JdkFutureAdapters.listenInPoolThread(trans.commit()), new FutureCallback<RpcResult<TransactionStatus>>() {
-                       @Override
-                       public void onSuccess(final RpcResult<TransactionStatus> result) {
-                               LOG.trace("Internal state for session {} updated successfully", session);
-                       }
-
-                       @Override
-                       public void onFailure(final Throwable t) {
-                               LOG.error("Failed to update internal state for session {}, closing it", session, t);
-                               session.close(TerminationReason.Unknown);
-                       }
-               });
-       }
-
-       @GuardedBy("this")
-       private SrpIdNumber nextRequest() {
-               return new SrpIdNumber(this.requestId++);
-       }
-
-       private synchronized void messageSendingComplete(final SrpIdNumber requestId, final io.netty.util.concurrent.Future<Void> future) {
-               final PCEPRequest req = this.sendingRequests.remove(requestId);
-
-               if (future.isSuccess()) {
-                       this.waitingRequests.put(requestId, req);
-               } else {
-                       LOG.info("Failed to send request {}, instruction cancelled", requestId, future.cause());
-                       req.setResult(OperationResults.UNSENT);
-               }
-       }
-
-       synchronized ListenableFuture<OperationResult> sendMessage(final Message message, final SrpIdNumber requestId,
-                       final Metadata metadata) {
-               final io.netty.util.concurrent.Future<Void> f = this.session.sendMessage(message);
-               final PCEPRequest req = new PCEPRequest(metadata);
-
-               this.sendingRequests.put(requestId, req);
-
-               f.addListener(new FutureListener<Void>() {
-                       @Override
-                       public void operationComplete(final io.netty.util.concurrent.Future<Void> future) {
-                               messageSendingComplete(requestId, future);
-                       }
-               });
-
-               return req.getFuture();
-       }
-
-       synchronized ListenableFuture<OperationResult> addLsp(final AddLspArgs input) {
-               // Make sure there is no such LSP
-               final InstanceIdentifier<ReportedLsp> lsp = InstanceIdentifier.builder(topologyAugment).child(PathComputationClient.class).child(
-                               ReportedLsp.class, new ReportedLspKey(input.getName())).toInstance();
-               if (serverSessionManager.readOperationalData(lsp) != null) {
-                       LOG.debug("Node {} already contains lsp {} at {}", input.getNode(), input.getName(), lsp);
-                       return OperationResults.UNSENT.future();
-               }
-
-               // Build the request
-               final RequestsBuilder rb = new RequestsBuilder();
-               rb.fieldsFrom(input.getArguments());
-               rb.setSrp(new SrpBuilder().setOperationId(nextRequest()).setProcessingRule(Boolean.TRUE).build());
-               rb.setLsp(new LspBuilder().setAdministrative(input.getArguments().isAdministrative()).setDelegate(Boolean.TRUE).setTlvs(
-                               new TlvsBuilder().setSymbolicPathName(new SymbolicPathNameBuilder().setPathName(input.getName()).build()).build()).build());
-
-               final PcinitiateMessageBuilder ib = new PcinitiateMessageBuilder(MESSAGE_HEADER);
-               ib.setRequests(ImmutableList.of(rb.build()));
-
-               // Send the message
-               return sendMessage(new PcinitiateBuilder().setPcinitiateMessage(ib.build()).build(), rb.getSrp().getOperationId(),
-                               input.getArguments().getMetadata());
-       }
-
-       synchronized ListenableFuture<OperationResult> removeLsp(final RemoveLspArgs input) {
-               // Make sure the LSP exists, we need it for PLSP-ID
-               final InstanceIdentifier<ReportedLsp> lsp = InstanceIdentifier.builder(topologyAugment).child(PathComputationClient.class).child(
-                               ReportedLsp.class, new ReportedLspKey(input.getName())).toInstance();
-               final ReportedLsp rep = serverSessionManager.readOperationalData(lsp);
-               if (rep == null) {
-                       LOG.debug("Node {} does not contain LSP {}", input.getNode(), input.getName());
-                       return OperationResults.UNSENT.future();
-               }
-
-               // Build the request and send it
-               final RequestsBuilder rb = new RequestsBuilder();
-               rb.setSrp(new SrpBuilder().setOperationId(nextRequest()).setProcessingRule(Boolean.TRUE).build());
-               rb.setLsp(new LspBuilder().setRemove(Boolean.TRUE).setPlspId(rep.getLsp().getPlspId()).setDelegate(Boolean.TRUE).build());
-
-               final PcinitiateMessageBuilder ib = new PcinitiateMessageBuilder(MESSAGE_HEADER);
-               ib.setRequests(ImmutableList.of(rb.build()));
-               return sendMessage(new PcinitiateBuilder().setPcinitiateMessage(ib.build()).build(), rb.getSrp().getOperationId(), null);
-       }
-
-       synchronized ListenableFuture<OperationResult> updateLsp(final UpdateLspArgs input) {
-               // Make sure the LSP exists
-               final InstanceIdentifier<ReportedLsp> lsp = InstanceIdentifier.builder(topologyAugment).child(PathComputationClient.class).child(
-                               ReportedLsp.class, new ReportedLspKey(input.getName())).toInstance();
-               final ReportedLsp rep = serverSessionManager.readOperationalData(lsp);
-               if (rep == null) {
-                       LOG.debug("Node {} does not contain LSP {}", input.getNode(), input.getName());
-                       return OperationResults.UNSENT.future();
-               }
-
-               // Build the PCUpd request and send it
-               final UpdatesBuilder rb = new UpdatesBuilder();
-               rb.setSrp(new SrpBuilder().setOperationId(nextRequest()).setProcessingRule(Boolean.TRUE).build());
-               rb.setLsp(new LspBuilder().setPlspId(rep.getLsp().getPlspId()).setDelegate(Boolean.TRUE).build());
-               final PathBuilder pb = new PathBuilder();
-               rb.setPath(pb.setEro(input.getArguments().getEro()).build());
-
-               final PcupdMessageBuilder ub = new PcupdMessageBuilder(MESSAGE_HEADER);
-               ub.setUpdates(ImmutableList.of(rb.build()));
-               return sendMessage(new PcupdBuilder().setPcupdMessage(ub.build()).build(), rb.getSrp().getOperationId(),
-                               input.getArguments().getMetadata());
-       }
-
-       synchronized ListenableFuture<OperationResult> ensureLspOperational(final EnsureLspOperationalInput input) {
-               // Make sure the LSP exists
-               final InstanceIdentifier<ReportedLsp> lsp = InstanceIdentifier.builder(topologyAugment).child(PathComputationClient.class).child(
-                               ReportedLsp.class, new ReportedLspKey(input.getName())).toInstance();
-               LOG.debug("Checking if LSP {} has operational state {}", lsp, input.getArguments().getOperational());
-               final ReportedLsp rep = serverSessionManager.readOperationalData(lsp);
-               if (rep == null) {
-                       LOG.debug("Node {} does not contain LSP {}", input.getNode(), input.getName());
-                       return OperationResults.UNSENT.future();
-               }
-
-               if (rep.getLsp().getOperational().equals(input.getArguments().getOperational())) {
-                       return OperationResults.SUCCESS.future();
-               } else {
-                       return OperationResults.UNSENT.future();
-               }
-       }
 }
\ No newline at end of file
diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologySessionRPCs.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologySessionRPCs.java
new file mode 100644 (file)
index 0000000..d8a5985
--- /dev/null
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.bgpcep.pcep.topology.provider;
+
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.AddLspArgs;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.EnsureLspOperationalInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.OperationResult;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.RemoveLspArgs;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.UpdateLspArgs;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+interface TopologySessionRPCs {
+       ListenableFuture<OperationResult> addLsp(AddLspArgs input);
+       ListenableFuture<OperationResult> removeLsp(RemoveLspArgs input);
+       ListenableFuture<OperationResult> updateLsp(UpdateLspArgs input);
+       ListenableFuture<OperationResult> ensureLspOperational(EnsureLspOperationalInput input);
+}
\ No newline at end of file