X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fimpl%2Fdevice%2FDeviceContextImpl.java;h=e6389ac342fe923e5494e03e143b5e7bc6367b3b;hb=07d3ee4c62f690ac6394d8db3bad8ea77a896237;hp=ec3783842472ac0f5037f13ef91718232e181de8;hpb=a4d078e306aacf9b775c89f6a27e6459dbcd4b2f;p=openflowplugin.git diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java index ec37838424..e6389ac342 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java @@ -12,17 +12,18 @@ import com.google.common.base.Preconditions; import com.google.common.util.concurrent.SettableFuture; import io.netty.util.HashedWheelTimer; import io.netty.util.Timeout; -import io.netty.util.TimerTask; import java.math.BigInteger; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.concurrent.TimeUnit; +import java.util.TreeMap; import java.util.concurrent.atomic.AtomicLong; import javax.annotation.Nonnull; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.ReadTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext; import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext; import org.opendaylight.openflowplugin.api.openflow.device.DeviceState; @@ -31,23 +32,41 @@ import org.opendaylight.openflowplugin.api.openflow.device.RequestContext; import org.opendaylight.openflowplugin.api.openflow.device.TranslatorLibrary; import org.opendaylight.openflowplugin.api.openflow.device.Xid; import org.opendaylight.openflowplugin.api.openflow.device.exception.DeviceDataException; -import org.opendaylight.openflowplugin.api.openflow.device.handlers.DeviceReplyProcessor; +import org.opendaylight.openflowplugin.api.openflow.device.listener.OpenflowMessageListenerFacade; import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher; import org.opendaylight.openflowplugin.api.openflow.md.core.TranslatorKey; -import org.opendaylight.openflowplugin.impl.translator.PacketReceivedTranslator; +import org.opendaylight.openflowplugin.api.openflow.registry.flow.DeviceFlowRegistry; +import org.opendaylight.openflowplugin.api.openflow.registry.group.DeviceGroupRegistry; +import org.opendaylight.openflowplugin.api.openflow.registry.meter.DeviceMeterRegistry; +import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageSpy; +import org.opendaylight.openflowplugin.impl.common.NodeStaticReplyTranslatorUtil; +import org.opendaylight.openflowplugin.impl.registry.flow.DeviceFlowRegistryImpl; +import org.opendaylight.openflowplugin.impl.registry.group.DeviceGroupRegistryImpl; +import org.opendaylight.openflowplugin.impl.registry.meter.DeviceMeterRegistryImpl; import org.opendaylight.openflowplugin.openflow.md.core.session.SwitchConnectionCookieOFImpl; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnector; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortReason; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.Error; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FlowRemoved; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReply; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketIn; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketInMessage; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortGrouping; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortStatusMessage; import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketReceived; +import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.FlowCapableNodeConnectorStatisticsData; +import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.FlowCapableNodeConnectorStatisticsDataBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TableFeatures; import org.opendaylight.yangtools.yang.binding.ChildOf; import org.opendaylight.yangtools.yang.binding.DataObject; 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; @@ -57,7 +76,7 @@ import org.slf4j.LoggerFactory; /** * */ -public class DeviceContextImpl implements DeviceContext, DeviceReplyProcessor { +public class DeviceContextImpl implements DeviceContext { private static final Logger LOG = LoggerFactory.getLogger(DeviceContextImpl.class); @@ -66,24 +85,38 @@ public class DeviceContextImpl implements DeviceContext, DeviceReplyProcessor { private final DataBroker dataBroker; private final XidGenerator xidGenerator; private final HashedWheelTimer hashedWheelTimer; - private Map requests = new HashMap(); + private Map requests = new TreeMap<>(); private final Map auxiliaryConnectionContexts; private final TransactionChainManager txChainManager; private TranslatorLibrary translatorLibrary; + private OpenflowMessageListenerFacade openflowMessageListenerFacade; + private final DeviceFlowRegistry deviceFlowRegistry; + private final DeviceGroupRegistry deviceGroupRegistry; + private final DeviceMeterRegistry deviceMeterRegistry; + private Timeout barrierTaskTimeout; + private NotificationProviderService notificationService; + private final MessageSpy messageSpy; + @VisibleForTesting DeviceContextImpl(@Nonnull final ConnectionContext primaryConnectionContext, - @Nonnull final DeviceState deviceState, @Nonnull final DataBroker dataBroker, - @Nonnull final HashedWheelTimer hashedWheelTimer) { + @Nonnull final DeviceState deviceState, + @Nonnull final DataBroker dataBroker, + @Nonnull final HashedWheelTimer hashedWheelTimer, + @Nonnull final MessageSpy _messageSpy) { this.primaryConnectionContext = Preconditions.checkNotNull(primaryConnectionContext); this.deviceState = Preconditions.checkNotNull(deviceState); this.dataBroker = Preconditions.checkNotNull(dataBroker); this.hashedWheelTimer = Preconditions.checkNotNull(hashedWheelTimer); xidGenerator = new XidGenerator(); - txChainManager = new TransactionChainManager(dataBroker, 500L); + txChainManager = new TransactionChainManager(dataBroker, hashedWheelTimer, 500L); auxiliaryConnectionContexts = new HashMap<>(); requests = new HashMap<>(); + deviceFlowRegistry = new DeviceFlowRegistryImpl(); + deviceGroupRegistry = new DeviceGroupRegistryImpl(); + deviceMeterRegistry = new DeviceMeterRegistryImpl(); + messageSpy = _messageSpy; } /** @@ -93,12 +126,6 @@ public class DeviceContextImpl implements DeviceContext, DeviceReplyProcessor { void submitTransaction() { txChainManager.submitTransaction(); txChainManager.enableCounter(); - hashedWheelTimer.newTimeout(new TimerTask() { - @Override - public void run(final Timeout timeout) throws Exception { - submitTransaction(); - } - }, 0, TimeUnit.MILLISECONDS); } @Override @@ -134,6 +161,11 @@ public class DeviceContextImpl implements DeviceContext, DeviceReplyProcessor { txChainManager.writeToTransaction(store, path, data); } + @Override + public void addDeleteToTxChain(final LogicalDatastoreType store, final InstanceIdentifier path) { + txChainManager.addDeleteOperationTotTxChain(store, path); + } + @Override public TableFeatures getCapabilities() { // TODO Auto-generated method stub @@ -155,6 +187,7 @@ public class DeviceContextImpl implements DeviceContext, DeviceReplyProcessor { return xidGenerator.generate(); } + @Override public Map getRequests() { return requests; } @@ -165,67 +198,109 @@ public class DeviceContextImpl implements DeviceContext, DeviceReplyProcessor { requests.put(xid.getValue(), requestFutureContext); } + @Override + public void attachOpenflowMessageListener(final OpenflowMessageListenerFacade openflowMessageListenerFacade) { + this.openflowMessageListenerFacade = openflowMessageListenerFacade; + primaryConnectionContext.getConnectionAdapter().setMessageListener(openflowMessageListenerFacade); + } + + @Override + public OpenflowMessageListenerFacade getOpenflowMessageListenerFacade() { + return openflowMessageListenerFacade; + } + + @Override + public DeviceFlowRegistry getDeviceFlowRegistry() { + return deviceFlowRegistry; + } + + @Override + public DeviceGroupRegistry getDeviceGroupRegistry() { + return deviceGroupRegistry; + } + + @Override + public DeviceMeterRegistry getDeviceMeterRegistry() { + return deviceMeterRegistry; + } + @Override public void processReply(final OfHeader ofHeader) { final RequestContext requestContext = getRequests().get(ofHeader.getXid()); - final SettableFuture replyFuture = requestContext.getFuture(); - getRequests().remove(ofHeader.getXid()); - RpcResult rpcResult; - - if (ofHeader instanceof Error) { - final Error error = (Error) ofHeader; - final String message = "Operation on device failed"; - rpcResult = RpcResultBuilder - .failed() - .withError(RpcError.ErrorType.APPLICATION, message, new DeviceDataException(message, error)) - .build(); - } else { - rpcResult = RpcResultBuilder - .success() - .withResult(ofHeader) - .build(); - } + if (null != requestContext) { + final SettableFuture replyFuture = requestContext.getFuture(); + getRequests().remove(ofHeader.getXid()); + RpcResult rpcResult; + if (ofHeader instanceof Error) { + final Error error = (Error) ofHeader; + final String message = "Operation on device failed"; + rpcResult = RpcResultBuilder + .failed() + .withError(RpcError.ErrorType.APPLICATION, message, new DeviceDataException(message, error)) + .build(); + } else { + rpcResult = RpcResultBuilder + .success() + .withResult(ofHeader) + .build(); + } - replyFuture.set(rpcResult); - try { - requestContext.close(); - } catch (final Exception e) { - LOG.error("Closing RequestContext failed: ", e); + replyFuture.set(rpcResult); + try { + requestContext.close(); + } catch (final Exception e) { + LOG.error("Closing RequestContext failed: ", e); + } + } else { + LOG.error("Can't find request context registered for xid : {}. Type of reply: {}. From address: {}", ofHeader.getXid(), ofHeader.getClass().getName(), + getPrimaryConnectionContext().getConnectionAdapter().getRemoteAddress()); } } @Override public void processReply(final Xid xid, final List ofHeaderList) { final RequestContext requestContext = getRequests().get(xid.getValue()); - final SettableFuture replyFuture = requestContext.getFuture(); - getRequests().remove(xid.getValue()); - final RpcResult> rpcResult = RpcResultBuilder - .>success() - .withResult(ofHeaderList) - .build(); - replyFuture.set(rpcResult); - try { - requestContext.close(); - } catch (final Exception e) { - LOG.error("Closing RequestContext failed: ", e); + if (null != requestContext) { + final SettableFuture replyFuture = requestContext.getFuture(); + getRequests().remove(xid.getValue()); + final RpcResult> rpcResult = RpcResultBuilder + .>success() + .withResult(ofHeaderList) + .build(); + replyFuture.set(rpcResult); + try { + requestContext.close(); + } catch (final Exception e) { + LOG.error("Closing RequestContext failed: ", e); + } + } else { + LOG.error("Can't find request context registered for xid : {}. Type of reply: MULTIPART. From address: {}", xid.getValue(), + getPrimaryConnectionContext().getConnectionAdapter().getRemoteAddress()); } } @Override public void processException(final Xid xid, final DeviceDataException deviceDataException) { + + LOG.trace("Processing exception for xid : {}", xid.getValue()); + final RequestContext requestContext = getRequests().get(xid.getValue()); - final SettableFuture replyFuture = requestContext.getFuture(); - getRequests().remove(xid.getValue()); - final RpcResult> rpcResult = RpcResultBuilder - .>failed() - .withError(RpcError.ErrorType.APPLICATION, "Message processing failed", deviceDataException) - .build(); - replyFuture.set(rpcResult); - try { - requestContext.close(); - } catch (final Exception e) { - LOG.error("Closing RequestContext failed: ", e); + if (null != requestContext) { + final SettableFuture replyFuture = requestContext.getFuture(); + getRequests().remove(xid.getValue()); + final RpcResult> rpcResult = RpcResultBuilder + .>failed() + .withError(RpcError.ErrorType.APPLICATION, String.format("Message processing failed : %s", deviceDataException.getError()), deviceDataException) + .build(); + replyFuture.set(rpcResult); + try { + requestContext.close(); + } catch (final Exception e) { + LOG.error("Closing RequestContext failed: ", e); + } + } else { + LOG.error("Can't find request context registered for xid : {}", xid.getValue()); } } @@ -236,18 +311,35 @@ public class DeviceContextImpl implements DeviceContext, DeviceReplyProcessor { @Override public void processPortStatusMessage(final PortStatusMessage portStatus) { - final TranslatorKey translatorKey = new TranslatorKey(portStatus.getVersion(), PortStatusMessage.class.getName()); - final MessageTranslator messageTranslator = translatorLibrary.lookupTranslator(translatorKey); - final FlowCapableNodeConnector nodeConnector = messageTranslator.translate(portStatus, this, null); - //TODO write into datastore + final TranslatorKey translatorKey = new TranslatorKey(portStatus.getVersion(), PortGrouping.class.getName()); + final MessageTranslator messageTranslator = translatorLibrary.lookupTranslator(translatorKey); + final FlowCapableNodeConnector flowCapableNodeConnector = messageTranslator.translate(portStatus, this, null); + + final KeyedInstanceIdentifier iiToNodeConnector = provideIIToNodeConnector(portStatus.getPortNo(), portStatus.getVersion()); + if (portStatus.getReason().equals(PortReason.OFPPRADD) || portStatus.getReason().equals(PortReason.OFPPRMODIFY)) { + // because of ADD status node connector has to be created + final NodeConnectorBuilder nConnectorBuilder = new NodeConnectorBuilder().setKey(iiToNodeConnector.getKey()); + nConnectorBuilder.addAugmentation(FlowCapableNodeConnectorStatisticsData.class, new FlowCapableNodeConnectorStatisticsDataBuilder().build()); + nConnectorBuilder.addAugmentation(FlowCapableNodeConnector.class, flowCapableNodeConnector); + writeToTransaction(LogicalDatastoreType.OPERATIONAL, iiToNodeConnector, nConnectorBuilder.build()); + } else if (portStatus.getReason().equals(PortReason.OFPPRDELETE)) { + addDeleteToTxChain(LogicalDatastoreType.OPERATIONAL, iiToNodeConnector); + } + } + + private KeyedInstanceIdentifier provideIIToNodeConnector(final long portNo, final short version) { + final InstanceIdentifier iiToNodes = deviceState.getNodeInstanceIdentifier(); + final BigInteger dataPathId = deviceState.getFeatures().getDatapathId(); + final NodeConnectorId nodeConnectorId = NodeStaticReplyTranslatorUtil.nodeConnectorId(dataPathId.toString(), portNo, version); + return iiToNodes.child(NodeConnector.class, new NodeConnectorKey(nodeConnectorId)); } @Override public void processPacketInMessage(final PacketInMessage packetInMessage) { - final TranslatorKey translatorKey = new TranslatorKey(packetInMessage.getVersion(), PacketReceivedTranslator.class.getName()); + final TranslatorKey translatorKey = new TranslatorKey(packetInMessage.getVersion(), PacketIn.class.getName()); final MessageTranslator messageTranslator = translatorLibrary.lookupTranslator(translatorKey); final PacketReceived packetReceived = messageTranslator.translate(packetInMessage, this, null); - //TODO publish to MD-SAL + notificationService.publish(packetReceived); } @Override @@ -260,6 +352,18 @@ public class DeviceContextImpl implements DeviceContext, DeviceReplyProcessor { this.translatorLibrary = translatorLibrary; } + @Override + public HashedWheelTimer getTimer() { + return hashedWheelTimer; + } + + @Override + public void close() throws Exception { + for (Map.Entry entry : requests.entrySet()){ + entry.getValue().close(); + } + } + private class XidGenerator { @@ -269,4 +373,32 @@ public class DeviceContextImpl implements DeviceContext, DeviceReplyProcessor { return new Xid(xid.incrementAndGet()); } } + + @Override + public RequestContext extractNextOutstandingMessage(final long barrierXid) { + RequestContext nextMessage = null; + final Iterator keyIterator = requests.keySet().iterator(); + if (keyIterator.hasNext()) { + final Long oldestXid = keyIterator.next(); + if (oldestXid < barrierXid) { + nextMessage = requests.remove(oldestXid); + } + } + return nextMessage; + } + + @Override + public void setCurrentBarrierTimeout(final Timeout timeout) { + barrierTaskTimeout = timeout; + } + + @Override + public Timeout getBarrierTaskTimeout() { + return barrierTaskTimeout; + } + + @Override + public void setNotificationService(final NotificationProviderService notificationServiceParam) { + notificationService = notificationServiceParam; + } }