import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.annotation.concurrent.GuardedBy;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.bgpcep.pcep.topology.provider.config.PCEPTopologyConfiguration;
+import org.opendaylight.bgpcep.pcep.topology.provider.config.PCEPTopologyProviderDependencies;
+import org.opendaylight.bgpcep.pcep.topology.spi.stats.TopologySessionStatsRegistry;
import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.protocol.pcep.PCEPDispatcherDependencies;
import org.opendaylight.protocol.pcep.PCEPPeerProposal;
import org.opendaylight.protocol.pcep.PCEPSession;
import org.opendaylight.protocol.pcep.PCEPSessionListener;
import org.opendaylight.protocol.pcep.PCEPSessionListenerFactory;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stats.rev171113.PcepSessionState;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.open.object.open.TlvsBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev171025.AddLspArgs;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev171025.EnsureLspOperationalInput;
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.TopologyBuilder;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey;
+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.NodeKey;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.TopologyTypesBuilder;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.RpcError;
+import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- *
- */
-final class ServerSessionManager implements PCEPSessionListenerFactory, TopologySessionRPCs, PCEPPeerProposal {
+final class ServerSessionManager implements PCEPSessionListenerFactory, TopologySessionRPCs, PCEPPeerProposal,
+ TopologySessionStatsRegistry {
private static final Logger LOG = LoggerFactory.getLogger(ServerSessionManager.class);
private static final long DEFAULT_HOLD_STATE_NANOS = TimeUnit.MINUTES.toNanos(5);
+ private static final String FAILURE_MSG = "Failed to find session";
@VisibleForTesting
- public final AtomicBoolean isClosed = new AtomicBoolean(false);
+ final AtomicBoolean isClosed = new AtomicBoolean(false);
@GuardedBy("this")
private final Map<NodeId, TopologySessionListener> nodes = new HashMap<>();
@GuardedBy("this")
private final Map<NodeId, TopologyNodeState> state = new HashMap<>();
private final TopologySessionListenerFactory listenerFactory;
private final InstanceIdentifier<Topology> topology;
- private final DataBroker broker;
private final PCEPStatefulPeerProposal peerProposal;
private final short rpcTimeout;
+ private final PCEPTopologyProviderDependencies dependenciesProvider;
+ private final PCEPDispatcherDependencies pcepDispatcherDependencies;
- public ServerSessionManager(final DataBroker broker, final InstanceIdentifier<Topology> topology,
- final TopologySessionListenerFactory listenerFactory, final short rpcTimeout) {
- this.broker = requireNonNull(broker);
- this.topology = requireNonNull(topology);
+ public ServerSessionManager(
+ final PCEPTopologyProviderDependencies dependenciesProvider,
+ final TopologySessionListenerFactory listenerFactory,
+ final PCEPTopologyConfiguration configDependencies) {
+ this.dependenciesProvider = requireNonNull(dependenciesProvider);
+ this.topology = requireNonNull(configDependencies.getTopology());
this.listenerFactory = requireNonNull(listenerFactory);
- this.peerProposal = PCEPStatefulPeerProposal.createStatefulPeerProposal(this.broker, this.topology);
- this.rpcTimeout = rpcTimeout;
+ this.peerProposal = PCEPStatefulPeerProposal
+ .createStatefulPeerProposal(this.dependenciesProvider.getDataBroker(), this.topology);
+ this.rpcTimeout = configDependencies.getRpcTimeout();
+ this.pcepDispatcherDependencies = new PCEPDispatcherDependenciesImpl(this, configDependencies);
}
private static NodeId createNodeId(final InetAddress addr) {
synchronized ListenableFuture<Void> instantiateServiceInstance() {
final TopologyKey key = InstanceIdentifier.keyOf(this.topology);
final TopologyId topologyId = key.getTopologyId();
- final WriteTransaction tx = this.broker.newWriteOnlyTransaction();
+ final WriteTransaction tx = this.dependenciesProvider.getDataBroker().newWriteOnlyTransaction();
tx.put(LogicalDatastoreType.OPERATIONAL, this.topology, new TopologyBuilder().setKey(key)
.setTopologyId(topologyId).setTopologyTypes(new TopologyTypesBuilder()
.addAugmentation(TopologyTypes1.class, new TopologyTypes1Builder().setTopologyPcep(
return future;
}
- synchronized void releaseNodeState(final TopologyNodeState nodeState, final PCEPSession session, final boolean persistNode) {
+ synchronized void releaseNodeState(final TopologyNodeState nodeState, final PCEPSession session,
+ final boolean persistNode) {
if (this.isClosed.get()) {
LOG.error("Session Manager has already been closed.");
return;
}
}
- synchronized TopologyNodeState takeNodeState(final InetAddress address, final TopologySessionListener sessionListener, final boolean retrieveNode) {
+ synchronized TopologyNodeState takeNodeState(final InetAddress address,
+ final TopologySessionListener sessionListener, final boolean retrieveNode) {
final NodeId id = createNodeId(address);
if (this.isClosed.get()) {
- LOG.error("Server Session Manager is closed. Unable to create topology node {} with listener {}", id, sessionListener);
+ LOG.error("Server Session Manager is closed. Unable to create topology node {} with listener {}",
+ id, sessionListener);
return null;
}
TopologyNodeState ret = this.state.get(id);
if (ret == null) {
- ret = new TopologyNodeState(this.broker, this.topology, id, DEFAULT_HOLD_STATE_NANOS);
+ ret = new TopologyNodeState(this.dependenciesProvider.getDataBroker(), this.topology, id,
+ DEFAULT_HOLD_STATE_NANOS);
LOG.debug("Created topology node {} for id {} at {}", ret, id, ret.getNodeId());
this.state.put(id, ret);
}
// if another listener requests the same session, close it
final TopologySessionListener existingSessionListener = this.nodes.get(id);
if (existingSessionListener != null && !sessionListener.equals(existingSessionListener)) {
- LOG.error("New session listener {} is in conflict with existing session listener {} on node {}, closing the existing one.", existingSessionListener, sessionListener, id);
+ LOG.error("New session listener {} is in conflict with existing session listener {} on node {}," +
+ " closing the existing one.", existingSessionListener, sessionListener, id);
existingSessionListener.close();
}
ret.taken(retrieveNode);
return this.listenerFactory.createTopologySessionListener(this);
}
- protected final synchronized TopologySessionListener checkSessionPresence(final NodeId nodeId) {
+ private synchronized TopologySessionListener checkSessionPresence(final NodeId nodeId) {
// Get the listener corresponding to the node
final TopologySessionListener l = this.nodes.get(nodeId);
if (l == null) {
}
@Override
- public ListenableFuture<Void> tearDownSession(final TearDownSessionInput input) {
+ public ListenableFuture<RpcResult<Void>> tearDownSession(final TearDownSessionInput input) {
final TopologySessionListener l = checkSessionPresence(input.getNode());
- return l != null ? l.tearDownSession(input) :
- Futures.immediateFailedFuture(new Throwable("Node not present"));
+ if (l == null) {
+ return RpcResultBuilder.<Void>failed().withError(RpcError.ErrorType.RPC,
+ FAILURE_MSG).buildFuture();
+ }
+
+ return l.tearDownSession(input);
}
synchronized ListenableFuture<Void> closeServiceInstance() {
nodeState.close();
}
this.state.clear();
- final WriteTransaction t = this.broker.newWriteOnlyTransaction();
+ final WriteTransaction t = this.dependenciesProvider.getDataBroker().newWriteOnlyTransaction();
t.delete(LogicalDatastoreType.OPERATIONAL, this.topology);
final ListenableFuture<Void> future = t.submit();
Futures.addCallback(future, new FutureCallback<Void>() {
short getRpcTimeout() {
return this.rpcTimeout;
}
+
+ @Override
+ public synchronized void bind(final KeyedInstanceIdentifier<Node, NodeKey> nodeId,
+ final PcepSessionState sessionState) {
+ this.dependenciesProvider.getStateRegistry().bind(nodeId, sessionState);
+ }
+
+ @Override
+ public synchronized void unbind(final KeyedInstanceIdentifier<Node, NodeKey> nodeId) {
+ this.dependenciesProvider.getStateRegistry().unbind(nodeId);
+ }
+
+ PCEPDispatcherDependencies getPCEPDispatcherDependencies(){
+ return this.pcepDispatcherDependencies;
+ }
}
\ No newline at end of file
Code Review / bgpcep.git / blobdiff