import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
+import org.opendaylight.controller.md.sal.binding.api.NotificationService;
import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
+import org.opendaylight.openflowplugin.api.ConnectionException;
import org.opendaylight.openflowplugin.api.OFConstants;
import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
private static final long TICK_DURATION = 500; // 0.5 sec.
private ScheduledThreadPoolExecutor spyPool;
- private int spyRate = 10;
+ private final int spyRate = 10;
private final DataBroker dataBroker;
private final HashedWheelTimer hashedWheelTimer;
- private RequestContextStack dummyRequestContextStack;
+ private RequestContextStack emptyRequestContextStack;
private TranslatorLibrary translatorLibrary;
private DeviceInitializationPhaseHandler deviceInitPhaseHandler;
- private NotificationProviderService notificationService;
- private final List<DeviceContext> synchronizedDeviceContextsList = Collections
- .<DeviceContext>synchronizedList(new ArrayList<DeviceContext>());
+ private NotificationService notificationService;
+ private NotificationPublishService notificationPublishService;
+
+ private final List<DeviceContext> synchronizedDeviceContextsList = new ArrayList<DeviceContext>();
private final MessageIntelligenceAgency messageIntelligenceAgency = new MessageIntelligenceAgencyImpl();
public DeviceManagerImpl(@Nonnull final DataBroker dataBroker) {
tx.merge(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(Nodes.class), new NodesBuilder().build());
tx.submit();
- dummyRequestContextStack = new RequestContextStack() {
+ emptyRequestContextStack = new RequestContextStack() {
@Override
public <T> void forgetRequestContext(final RequestContext<T> requestContext) {
//NOOP
@Override
public void onDeviceContextLevelUp(final DeviceContext deviceContext) {
// final phase - we have to add new Device to MD-SAL DataStore
- Preconditions.checkNotNull(deviceContext != null);
+ Preconditions.checkNotNull(deviceContext);
((DeviceContextImpl) deviceContext).submitTransaction();
new BarrierTaskBuilder(deviceContext).buildAndFireBarrierTask();
}
final DeviceContext deviceContext = new DeviceContextImpl(connectionContext, deviceState, dataBroker, hashedWheelTimer, messageIntelligenceAgency);
deviceContext.setNotificationService(notificationService);
+ deviceContext.setNotificationPublishService(notificationPublishService);
deviceContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL, deviceState.getNodeInstanceIdentifier(), new NodeBuilder().setId(deviceState.getNodeId()).build());
connectionContext.setDeviceDisconnectedHandler(deviceContext);
deviceContext.setTranslatorLibrary(translatorLibrary);
+ deviceContext.addDeviceContextClosedHandler(this);
final OpenflowProtocolListenerFullImpl messageListener = new OpenflowProtocolListenerFullImpl(
connectionContext.getConnectionAdapter(), deviceContext);
deviceContext.attachOpenflowMessageListener(messageListener);
- ListenableFuture<List<RpcResult<List<MultipartReply>>>> deviceFeaturesFuture = null;
+ final ListenableFuture<List<RpcResult<List<MultipartReply>>>> deviceFeaturesFuture;
- if (connectionContext.getFeatures().getVersion() == OFConstants.OFP_VERSION_1_0) {
+ final Short version = connectionContext.getFeatures().getVersion();
+ if (OFConstants.OFP_VERSION_1_0 == version) {
final CapabilitiesV10 capabilitiesV10 = connectionContext.getFeatures().getCapabilitiesV10();
DeviceStateUtil.setDeviceStateBasedOnV10Capabilities(deviceState, capabilitiesV10);
- //FIXME: next two lines are hack to make OF10 + cbench working (they don't send reply for description request)
- createEmptyFlowCapableNodeInDs(deviceContext);
- makeEmptyTables(deviceContext, deviceContext.getDeviceState().getNodeInstanceIdentifier(), connectionContext.getFeatures().getTables());
- deviceFeaturesFuture = Futures.immediateFuture(null);//createDeviceFeaturesForOF10(messageListener, deviceContext, deviceState);
+ deviceFeaturesFuture = createDeviceFeaturesForOF10(messageListener, deviceContext, deviceState);
+ // create empty tables after device description is processed
+ chainTableTrunkWriteOF10(deviceContext, deviceFeaturesFuture);
for (final PortGrouping port : connectionContext.getFeatures().getPhyPort()) {
final short ofVersion = deviceContext.getDeviceState().getVersion();
final NodeConnector connector = ncBuilder.build();
final InstanceIdentifier<NodeConnector> connectorII = deviceState.getNodeInstanceIdentifier().child(NodeConnector.class, connector.getKey());
deviceContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL, connectorII, connector);
- //FlowCapableNodeConnectorBuilder
}
- } else if (connectionContext.getFeatures().getVersion() == OFConstants.OFP_VERSION_1_3) {
+ } else if (OFConstants.OFP_VERSION_1_3 == version) {
final Capabilities capabilities = connectionContext.getFeatures().getCapabilities();
DeviceStateUtil.setDeviceStateBasedOnV13Capabilities(deviceState, capabilities);
deviceFeaturesFuture = createDeviceFeaturesForOF13(messageListener, deviceContext, deviceState);
+ } else {
+ deviceFeaturesFuture = Futures.immediateFailedFuture(new ConnectionException("Unsupported version " + version));
}
Futures.addCallback(deviceFeaturesFuture, new FutureCallback<List<RpcResult<List<MultipartReply>>>>() {
@Override
public void onSuccess(final List<RpcResult<List<MultipartReply>>> result) {
+ deviceContext.getDeviceState().setValid(true);
deviceInitPhaseHandler.onDeviceContextLevelUp(deviceContext);
}
public void onFailure(final Throwable t) {
// FIXME : remove session
LOG.trace("Device capabilities gathering future failed.");
+ LOG.trace("more info in exploration failure..", t);
+ }
+ });
+ }
+
+ private void chainTableTrunkWriteOF10(final DeviceContext deviceContext, final ListenableFuture<List<RpcResult<List<MultipartReply>>>> deviceFeaturesFuture) {
+ Futures.addCallback(deviceFeaturesFuture, new FutureCallback<List<RpcResult<List<MultipartReply>>>>() {
+ @Override
+ public void onSuccess(final List<RpcResult<List<MultipartReply>>> results) {
+ boolean allSucceeded = true;
+ for (final RpcResult<List<MultipartReply>> rpcResult : results) {
+ allSucceeded &= rpcResult.isSuccessful();
+ }
+ if (allSucceeded) {
+ synchronized (deviceContext) {
+ createEmptyFlowCapableNodeInDs(deviceContext);
+ makeEmptyTables(deviceContext, deviceContext.getDeviceState().getNodeInstanceIdentifier(),
+ deviceContext.getDeviceState().getFeatures().getTables());
+ }
+ }
+ }
+
+ @Override
+ public void onFailure(final Throwable t) {
+ //NOOP
}
});
}
- private ListenableFuture<RpcResult<List<MultipartReply>>> processReplyDesc(OpenflowProtocolListenerFullImpl messageListener,
- DeviceContext deviceContext,
- DeviceState deviceState) {
+ private ListenableFuture<RpcResult<List<MultipartReply>>> processReplyDesc(final OpenflowProtocolListenerFullImpl messageListener,
+ final DeviceContext deviceContext,
+ final DeviceState deviceState) {
final ListenableFuture<RpcResult<List<MultipartReply>>> replyDesc = getNodeStaticInfo(messageListener,
MultipartType.OFPMPDESC, deviceContext, deviceState.getNodeInstanceIdentifier(), deviceState.getVersion());
return replyDesc;
}
- private ListenableFuture<List<RpcResult<List<MultipartReply>>>> createDeviceFeaturesForOF10(OpenflowProtocolListenerFullImpl messageListener,
- DeviceContext deviceContext,
- DeviceState deviceState) {
+ private ListenableFuture<List<RpcResult<List<MultipartReply>>>> createDeviceFeaturesForOF10(final OpenflowProtocolListenerFullImpl messageListener,
+ final DeviceContext deviceContext,
+ final DeviceState deviceState) {
return Futures.allAsList(Arrays.asList(processReplyDesc(messageListener, deviceContext, deviceState)));
}
- private ListenableFuture<List<RpcResult<List<MultipartReply>>>> createDeviceFeaturesForOF13(OpenflowProtocolListenerFullImpl messageListener,
+ private ListenableFuture<List<RpcResult<List<MultipartReply>>>> createDeviceFeaturesForOF13(final OpenflowProtocolListenerFullImpl messageListener,
final DeviceContext deviceContext,
final DeviceState deviceState) {
final ListenableFuture<RpcResult<List<MultipartReply>>> replyDesc = processReplyDesc(messageListener, deviceContext, deviceState);
final InstanceIdentifier<Node> nodeII, final short version) {
final Xid xid = deviceContext.getNextXid();
- final RequestContext<List<MultipartReply>> requestContext = dummyRequestContextStack.createRequestContext();
+ final RequestContext<List<MultipartReply>> requestContext = emptyRequestContextStack.createRequestContext();
requestContext.setXid(xid);
LOG.trace("Hooking xid {} to device context - precaution.", requestContext.getXid().getValue());
deviceContext.hookRequestCtx(requestContext.getXid(), requestContext);
+
multiMsgCollector.registerMultipartXid(xid.getValue());
Futures.addCallback(requestContext.getFuture(), new FutureCallback<RpcResult<List<MultipartReply>>>() {
@Override
}
@Override
- public void setNotificationService(final NotificationProviderService notificationServiceParam) {
+ public void setNotificationService(final NotificationService notificationServiceParam) {
notificationService = notificationServiceParam;
}
+ @Override
+ public void setNotificationPublishService(final NotificationPublishService notificationService) {
+ this.notificationPublishService = notificationService;
+ }
+
@Override
public void close() throws Exception {
- for (DeviceContext deviceContext : synchronizedDeviceContextsList) {
+ for (final DeviceContext deviceContext : synchronizedDeviceContextsList) {
deviceContext.close();
}
}
private static void createEmptyFlowCapableNodeInDs(final DeviceContext deviceContext) {
- FlowCapableNodeBuilder flowCapableNodeBuilder = new FlowCapableNodeBuilder();
+ final FlowCapableNodeBuilder flowCapableNodeBuilder = new FlowCapableNodeBuilder();
final InstanceIdentifier<FlowCapableNode> fNodeII = deviceContext.getDeviceState().getNodeInstanceIdentifier().augmentation(FlowCapableNode.class);
deviceContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL, fNodeII, flowCapableNodeBuilder.build());
}
+
+ @Override
+ public void onDeviceContextClosed(final DeviceContext deviceContext) {
+ synchronizedDeviceContextsList.remove(deviceContext);
+ }
}
Code Review / openflowplugin.git / blobdiff