import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter;
import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueueHandlerRegistration;
import org.opendaylight.openflowplugin.api.openflow.OFPContext;
import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
import org.opendaylight.openflowplugin.api.openflow.device.DeviceManager;
-import org.opendaylight.openflowplugin.api.openflow.device.DeviceState;
import org.opendaylight.openflowplugin.api.openflow.device.TranslatorLibrary;
import org.opendaylight.openflowplugin.api.openflow.device.handlers.DeviceInitializationPhaseHandler;
import org.opendaylight.openflowplugin.api.openflow.device.handlers.DeviceTerminationPhaseHandler;
import org.opendaylight.openflowplugin.api.openflow.lifecycle.LifecycleConductor;
+import org.opendaylight.openflowplugin.api.openflow.lifecycle.LifecycleService;
import org.opendaylight.openflowplugin.extension.api.ExtensionConverterProviderKeeper;
import org.opendaylight.openflowplugin.extension.api.core.extension.ExtensionConverterProvider;
import org.opendaylight.openflowplugin.impl.connection.OutboundQueueProviderImpl;
import org.opendaylight.openflowplugin.impl.device.listener.OpenflowProtocolListenerFullImpl;
+import org.opendaylight.openflowplugin.impl.lifecycle.LifecycleServiceImpl;
+import org.opendaylight.openflowplugin.impl.util.DeviceInitializationUtils;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodesBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.role.service.rev150727.OfpRole;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
private final long globalNotificationQuota;
private final boolean switchFeaturesMandatory;
+ private boolean isNotificationFlowRemovedOff;
- private final int spyRate = 10;
+ private static final int SPY_RATE = 10;
private final DataBroker dataBroker;
+ private final ConvertorExecutor convertorExecutor;
private TranslatorLibrary translatorLibrary;
private DeviceInitializationPhaseHandler deviceInitPhaseHandler;
private DeviceTerminationPhaseHandler deviceTerminPhaseHandler;
private final ConcurrentMap<DeviceInfo, DeviceContext> deviceContexts = new ConcurrentHashMap<>();
+ private final ConcurrentMap<DeviceInfo, LifecycleService> lifecycleServices = new ConcurrentHashMap<>();
private final long barrierIntervalNanos;
private final int barrierCountLimit;
private ExtensionConverterProvider extensionConverterProvider;
private ScheduledThreadPoolExecutor spyPool;
+ private final ClusterSingletonServiceProvider singletonServiceProvider;
private final LifecycleConductor conductor;
public DeviceManagerImpl(@Nonnull final DataBroker dataBroker,
- final long globalNotificationQuota, final boolean switchFeaturesMandatory,
- final long barrierInterval, final int barrierCountLimit,
- final LifecycleConductor lifecycleConductor) {
+ final long globalNotificationQuota,
+ final boolean switchFeaturesMandatory,
+ final long barrierInterval,
+ final int barrierCountLimit,
+ final LifecycleConductor lifecycleConductor,
+ boolean isNotificationFlowRemovedOff,
+ final ConvertorExecutor convertorExecutor,
+ final ClusterSingletonServiceProvider singletonServiceProvider) {
this.switchFeaturesMandatory = switchFeaturesMandatory;
this.globalNotificationQuota = globalNotificationQuota;
+ this.isNotificationFlowRemovedOff = isNotificationFlowRemovedOff;
this.dataBroker = Preconditions.checkNotNull(dataBroker);
+ this.convertorExecutor = convertorExecutor;
/* merge empty nodes to oper DS to predict any problems with missing parent for Node */
final WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
this.conductor = lifecycleConductor;
spyPool = new ScheduledThreadPoolExecutor(1);
+ this.singletonServiceProvider = singletonServiceProvider;
}
}
@Override
- public void onDeviceContextLevelUp(@CheckForNull DeviceInfo deviceInfo) throws Exception {
+ public void onDeviceContextLevelUp(@CheckForNull DeviceInfo deviceInfo, final LifecycleService lifecycleService) throws Exception {
// final phase - we have to add new Device to MD-SAL DataStore
LOG.debug("Final phase of DeviceContextLevelUp for Node: {} ", deviceInfo.getNodeId());
DeviceContext deviceContext = Preconditions.checkNotNull(deviceContexts.get(deviceInfo));
- ((DeviceContextImpl) deviceContext).initialSubmitTransaction();
deviceContext.onPublished();
+ lifecycleService.registerService(this.singletonServiceProvider);
}
@Override
Preconditions.checkArgument(connectionContext != null);
DeviceInfo deviceInfo = connectionContext.getDeviceInfo();
- /**
+ /*
* This part prevent destroy another device context. Throwing here an exception result to propagate close connection
* in {@link org.opendaylight.openflowplugin.impl.connection.org.opendaylight.openflowplugin.impl.connection.HandshakeContextImpl}
* If context already exist we are in state closing process (connection flapping) and we should not propagate connection close
//FIXME: as soon as auxiliary connection are fully supported then this is needed only before device context published
connectionAdapter.setPacketInFiltering(true);
- final Short version = connectionContext.getFeatures().getVersion();
- final OutboundQueueProvider outboundQueueProvider = new OutboundQueueProviderImpl(version);
+ final OutboundQueueProvider outboundQueueProvider = new OutboundQueueProviderImpl(deviceInfo.getVersion());
connectionContext.setOutboundQueueProvider(outboundQueueProvider);
final OutboundQueueHandlerRegistration<OutboundQueueProvider> outboundQueueHandlerRegistration =
connectionAdapter.registerOutboundQueueHandler(outboundQueueProvider, barrierCountLimit, barrierIntervalNanos);
connectionContext.setOutboundQueueHandleRegistration(outboundQueueHandlerRegistration);
- final DeviceState deviceState = new DeviceStateImpl();
final DeviceContext deviceContext = new DeviceContextImpl(connectionContext,
- deviceState,
dataBroker,
conductor,
outboundQueueProvider,
translatorLibrary,
- switchFeaturesMandatory);
+ this,
+ convertorExecutor);
+
+ final LifecycleService lifecycleService = new LifecycleServiceImpl();
+ lifecycleService.setDeviceContext(deviceContext);
Verify.verify(deviceContexts.putIfAbsent(deviceInfo, deviceContext) == null, "DeviceCtx still not closed.");
+ lifecycleServices.putIfAbsent(deviceInfo, lifecycleService);
+
+ deviceContext.setSwitchFeaturesMandatory(switchFeaturesMandatory);
((ExtensionConverterProviderKeeper) deviceContext).setExtensionConverterProvider(extensionConverterProvider);
deviceContext.setNotificationPublishService(conductor.getNotificationPublishService());
final OpenflowProtocolListenerFullImpl messageListener = new OpenflowProtocolListenerFullImpl(
connectionAdapter, deviceContext);
- connectionAdapter.setMessageListener(messageListener);
- deviceState.setValid(true);
-
- deviceInitPhaseHandler.onDeviceContextLevelUp(connectionContext.getDeviceInfo());
+ connectionAdapter.setMessageListener(messageListener);
+ deviceInitPhaseHandler.onDeviceContextLevelUp(connectionContext.getDeviceInfo(), lifecycleService);
return true;
}
LOG.debug("onDeviceContextClosed for Node {}", deviceInfo.getNodeId());
deviceContexts.remove(deviceInfo);
updatePacketInRateLimiters();
+ LifecycleService lifecycleService = lifecycleServices.remove(deviceInfo);
+ try {
+ lifecycleService.close();
+ } catch (Exception e) {
+ LOG.warn("Closing service for node {} was unsuccessful ", deviceInfo.getNodeId().getValue(), e);
+ }
}
@Override
public void initialize() {
- spyPool.scheduleAtFixedRate(conductor.getMessageIntelligenceAgency(), spyRate, spyRate, TimeUnit.SECONDS);
- }
-
- @Override
- public DeviceContext getDeviceContextFromNodeId(DeviceInfo deviceInfo) {
- return deviceContexts.get(deviceInfo);
+ spyPool.scheduleAtFixedRate(conductor.getMessageIntelligenceAgency(), SPY_RATE, SPY_RATE, TimeUnit.SECONDS);
}
@Override
}
@Override
- public ListenableFuture<Void> onClusterRoleChange(final DeviceInfo deviceInfo, final OfpRole role) {
- DeviceContext deviceContext = conductor.getDeviceContext(deviceInfo);
- LOG.trace("onClusterRoleChange {} for node:", role, deviceInfo.getNodeId());
- if (OfpRole.BECOMEMASTER.equals(role)) {
- return deviceContext.onDeviceTakeClusterLeadership();
- }
- return ((DeviceContextImpl)deviceContext).getTransactionChainManager().deactivateTransactionManager();
+ public void setIsNotificationFlowRemovedOff(boolean isNotificationFlowRemovedOff) {
+ this.isNotificationFlowRemovedOff = isNotificationFlowRemovedOff;
+ }
+
+ @Override
+ public boolean getIsNotificationFlowRemovedOff() {
+ return this.isNotificationFlowRemovedOff;
}
}
Code Review / openflowplugin.git / blobdiff