*/
package org.opendaylight.openflowplugin.impl.rpc;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
import com.google.common.base.Verify;
import com.google.common.collect.Iterators;
import java.util.Iterator;
-import java.util.Map.Entry;
+import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
+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.handlers.DeviceInitializationPhaseHandler;
+import org.opendaylight.openflowplugin.api.openflow.device.handlers.DeviceTerminationPhaseHandler;
+import org.opendaylight.openflowplugin.api.openflow.lifecycle.LifecycleService;
import org.opendaylight.openflowplugin.api.openflow.rpc.RpcContext;
import org.opendaylight.openflowplugin.api.openflow.rpc.RpcManager;
-import org.opendaylight.openflowplugin.impl.util.MdSalRegistrationUtils;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.role.service.rev150727.OfpRole;
+import org.opendaylight.openflowplugin.extension.api.core.extension.ExtensionConverterProvider;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
private static final Logger LOG = LoggerFactory.getLogger(RpcManagerImpl.class);
private final RpcProviderRegistry rpcProviderRegistry;
private DeviceInitializationPhaseHandler deviceInitPhaseHandler;
+ private DeviceTerminationPhaseHandler deviceTerminationPhaseHandler;
private final int maxRequestsQuota;
- private final ConcurrentMap<DeviceContext, RpcContext> contexts = new ConcurrentHashMap<>();
+ private final ConcurrentMap<DeviceInfo, RpcContext> contexts = new ConcurrentHashMap<>();
private boolean isStatisticsRpcEnabled;
- private NotificationPublishService notificationPublishService;
+ private final ExtensionConverterProvider extensionConverterProvider;
+ private final ConvertorExecutor convertorExecutor;
+ private final NotificationPublishService notificationPublishService;
- public RpcManagerImpl(final RpcProviderRegistry rpcProviderRegistry,
- final int quotaValue) {
+
+ public RpcManagerImpl(
+ final RpcProviderRegistry rpcProviderRegistry,
+ final int quotaValue,
+ final ExtensionConverterProvider extensionConverterProvider,
+ final ConvertorExecutor convertorExecutor,
+ final NotificationPublishService notificationPublishService) {
this.rpcProviderRegistry = rpcProviderRegistry;
maxRequestsQuota = quotaValue;
+ this.extensionConverterProvider = extensionConverterProvider;
+ this.convertorExecutor = convertorExecutor;
+ this.notificationPublishService = notificationPublishService;
}
@Override
}
@Override
- public void onDeviceContextLevelUp(final DeviceContext deviceContext) throws Exception {
- final NodeId nodeId = deviceContext.getDeviceState().getNodeId();
- final OfpRole ofpRole = deviceContext.getDeviceState().getRole();
-
- LOG.debug("Node:{}, deviceContext.getDeviceState().getRole():{}", nodeId, ofpRole);
- final RpcContext rpcContext = new RpcContextImpl(deviceContext.getMessageSpy(), rpcProviderRegistry,
- deviceContext, maxRequestsQuota, isStatisticsRpcEnabled, notificationPublishService);
-
- Verify.verify(contexts.putIfAbsent(deviceContext, rpcContext) == null, "RPC context still not closed for node {}", nodeId);
- deviceContext.addDeviceContextClosedHandler(this);
-
- if (OfpRole.BECOMEMASTER.equals(ofpRole)) {
- LOG.info("Registering Openflow RPCs services for node:{}, role:{}", nodeId, ofpRole);
- MdSalRegistrationUtils.registerMasterServices(rpcContext, deviceContext, ofpRole);
-
- } else if(OfpRole.BECOMESLAVE.equals(ofpRole)) {
- // if slave, we need to de-register rpcs if any have been registered, in case of master to slave
- LOG.info("Unregister RPC services (if any) for slave role for node:{}", deviceContext.getDeviceState().getNodeId());
- MdSalRegistrationUtils.registerSlaveServices(rpcContext, ofpRole);
- } else {
- // if we don't know role, we need to unregister rpcs if any have been registered
- LOG.info("Unregister RPC services (if any) for slave role for node:{}", deviceContext.getDeviceState().getNodeId());
- MdSalRegistrationUtils.unregisterServices(rpcContext);
- }
+ public void onDeviceContextLevelUp(final DeviceInfo deviceInfo, final LifecycleService lifecycleService) throws Exception {
+
+ final DeviceContext deviceContext = Preconditions.checkNotNull(lifecycleService.getDeviceContext());
+
+ final RpcContext rpcContext = new RpcContextImpl(
+ deviceInfo,
+ rpcProviderRegistry,
+ deviceContext.getMessageSpy(),
+ maxRequestsQuota,
+ deviceInfo.getNodeInstanceIdentifier(),
+ deviceContext,
+ extensionConverterProvider,
+ convertorExecutor,
+ notificationPublishService);
+
+ Verify.verify(contexts.putIfAbsent(deviceInfo, rpcContext) == null, "RpcCtx still not closed for node {}", deviceInfo.getNodeId());
+ lifecycleService.setRpcContext(rpcContext);
+ lifecycleService.registerDeviceRemovedHandler(this);
+ rpcContext.setStatisticsRpcEnabled(isStatisticsRpcEnabled);
// finish device initialization cycle back to DeviceManager
- deviceInitPhaseHandler.onDeviceContextLevelUp(deviceContext);
+ deviceInitPhaseHandler.onDeviceContextLevelUp(deviceInfo, lifecycleService);
}
@Override
public void close() {
- for (final Iterator<Entry<DeviceContext, RpcContext>> iterator = Iterators
- .consumingIterator(contexts.entrySet().iterator()); iterator.hasNext();) {
- iterator.next().getValue().close();
+ for (final Iterator<RpcContext> iterator = Iterators.consumingIterator(contexts.values().iterator());
+ iterator.hasNext();) {
+ iterator.next().close();
}
}
+ @Override
+ public void onDeviceContextLevelDown(final DeviceInfo deviceInfo) {
+ Optional.ofNullable(contexts.get(deviceInfo)).ifPresent(OFPContext::close);
+ deviceTerminationPhaseHandler.onDeviceContextLevelDown(deviceInfo);
+ }
@Override
- public void onDeviceContextClosed(final DeviceContext deviceContext) {
- final RpcContext removedContext = contexts.remove(deviceContext);
- if (removedContext != null) {
- LOG.info("Unregister RPCs services for device context closure");
- removedContext.close();
+ public void setDeviceTerminationPhaseHandler(final DeviceTerminationPhaseHandler handler) {
+ this.deviceTerminationPhaseHandler = handler;
+ }
+
+ /**
+ * This method is only for testing
+ */
+ @VisibleForTesting
+ void addRecordToContexts(DeviceInfo deviceInfo, RpcContext rpcContexts) {
+ if(!contexts.containsKey(deviceInfo)) {
+ this.contexts.put(deviceInfo,rpcContexts);
}
}
+
+
@Override
- public void setStatisticsRpcEnabled(final boolean isStatisticsRpcEnabled) {
- this.isStatisticsRpcEnabled = isStatisticsRpcEnabled;
+ public void setStatisticsRpcEnabled(boolean statisticsRpcEnabled) {
+ isStatisticsRpcEnabled = statisticsRpcEnabled;
}
@Override
- public void setNotificationPublishService(final NotificationPublishService notificationPublishService) {
- this.notificationPublishService = notificationPublishService;
+ public void onDeviceRemoved(DeviceInfo deviceInfo) {
+ contexts.remove(deviceInfo);
+ LOG.debug("Rpc context removed for node {}", deviceInfo.getLOGValue());
}
}
Code Review / openflowplugin.git / blobdiff