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=01227abbb4d5f966e5234e882878d9c097678b7f;hb=fc2c4994e93731fa8c4cf685e3896bd63856e62b;hp=da2193c1a38d15b701f501a052c6d82d5566c03a;hpb=9970bfc4d7f57e731bdb3f4e7ae96eb38a93d674;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 da2193c1a3..01227abbb4 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 @@ -7,13 +7,31 @@ */ package org.opendaylight.openflowplugin.impl.device; +import org.opendaylight.controller.sal.binding.api.NotificationProviderService; + +import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnectorBuilder; +import org.opendaylight.openflowplugin.openflow.md.util.InventoryDataServiceUtil; +import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion; +import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; +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.NodeConnectorId; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortReason; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.SettableFuture; +import io.netty.util.HashedWheelTimer; +import io.netty.util.Timeout; import java.math.BigInteger; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.TreeMap; import java.util.concurrent.atomic.AtomicLong; import javax.annotation.Nonnull; import org.opendaylight.controller.md.sal.binding.api.DataBroker; @@ -21,21 +39,23 @@ import org.opendaylight.controller.md.sal.binding.api.ReadTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext; import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext; -import org.opendaylight.openflowplugin.api.openflow.device.DeviceReplyProcessor; import org.opendaylight.openflowplugin.api.openflow.device.DeviceState; import org.opendaylight.openflowplugin.api.openflow.device.MessageTranslator; 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.listener.OpenflowMessageListenerFacade; +import org.opendaylight.openflowplugin.api.openflow.flow.registry.DeviceFlowRegistry; import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher; import org.opendaylight.openflowplugin.api.openflow.md.core.TranslatorKey; -import org.opendaylight.openflowplugin.impl.device.translator.PacketReceivedTranslator; -import org.opendaylight.openflowplugin.impl.device.translator.PortUpdateTranslator; +import org.opendaylight.openflowplugin.impl.flow.registry.DeviceFlowRegistryImpl; +import org.opendaylight.openflowplugin.impl.translator.PacketReceivedTranslator; 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.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.PacketInMessage; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortStatusMessage; @@ -53,7 +73,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); @@ -61,26 +81,39 @@ public class DeviceContextImpl implements DeviceContext, DeviceReplyProcessor { private final DeviceState deviceState; private final DataBroker dataBroker; private final XidGenerator xidGenerator; - private Map requests = new HashMap(); + private final HashedWheelTimer hashedWheelTimer; + private Map requests = new TreeMap<>(); private final Map auxiliaryConnectionContexts; private final TransactionChainManager txChainManager; private TranslatorLibrary translatorLibrary; + private OpenflowMessageListenerFacade openflowMessageListenerFacade; + private DeviceFlowRegistry deviceFlowRegistry; + private Timeout barrierTaskTimeout; + private NotificationProviderService notificationService; @VisibleForTesting DeviceContextImpl(@Nonnull final ConnectionContext primaryConnectionContext, - @Nonnull final DeviceState deviceState, @Nonnull final DataBroker dataBroker) { + @Nonnull final DeviceState deviceState, @Nonnull final DataBroker dataBroker, + @Nonnull final HashedWheelTimer hashedWheelTimer) { 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(); } + /** + * This method is called from {@link DeviceManagerImpl} only. So we could say "posthandshake process finish" + * and we are able to set a scheduler for an automatic transaction submitting by time (0,5sec). + */ void submitTransaction() { txChainManager.submitTransaction(); + txChainManager.enableCounter(); } @Override @@ -112,10 +145,15 @@ public class DeviceContextImpl implements DeviceContext, DeviceReplyProcessor { @Override public void writeToTransaction(final LogicalDatastoreType store, - final InstanceIdentifier path, final T data) { + final InstanceIdentifier path, final T data) { 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 @@ -137,6 +175,7 @@ public class DeviceContextImpl implements DeviceContext, DeviceReplyProcessor { return xidGenerator.generate(); } + @Override public Map getRequests() { return requests; } @@ -147,67 +186,97 @@ 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 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(); + 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); + } } else { - rpcResult = RpcResultBuilder - .success() - .withResult(ofHeader) - .build(); - } - - replyFuture.set(rpcResult); - try { - requestContext.close(); - } catch (final Exception e) { - LOG.error("Closing RequestContext failed: ", e); + LOG.error("Can't find request context registered for xid : {}", ofHeader.getXid()); } } @Override - public void processReply(final Xid xid, final List ofHeaderList) { + 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 : {}", xid.getValue()); } } @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()); } } @@ -218,10 +287,40 @@ public class DeviceContextImpl implements DeviceContext, DeviceReplyProcessor { @Override public void processPortStatusMessage(final PortStatusMessage portStatus) { - final TranslatorKey translatorKey = new TranslatorKey(portStatus.getVersion(), PortUpdateTranslator.class.getName()); + 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 + FlowCapableNodeConnector flowCapableNodeConnector = messageTranslator.translate(portStatus, this, null); + + final KeyedInstanceIdentifier iiToNodeConnector = + provideIIToNodeConnector(portStatus.getPortNo(), portStatus.getVersion()); + if (portStatus.getReason().equals(PortReason.OFPPRADD) ) { + // because of ADD status node connector has to be created + createNodeConnectorInDS(iiToNodeConnector); + } else if (portStatus.getReason().equals(PortReason.OFPPRDELETE) ) { + //only put operation over datastore is available. therefore delete is + //inserting of empty FlowCapableNodeConnector + flowCapableNodeConnector = new FlowCapableNodeConnectorBuilder().build(); + } + + InstanceIdentifier iiToFlowCapableNodeConnector = iiToNodeConnector.augmentation(FlowCapableNodeConnector.class); + writeToTransaction(LogicalDatastoreType.OPERATIONAL, iiToFlowCapableNodeConnector, flowCapableNodeConnector); + } + + private void createNodeConnectorInDS(final KeyedInstanceIdentifier iiToNodeConnector) { + writeToTransaction(LogicalDatastoreType.OPERATIONAL, iiToNodeConnector, new NodeConnectorBuilder().setKey(iiToNodeConnector.getKey()).build()); + } + + private KeyedInstanceIdentifier provideIIToNodes() { + return InstanceIdentifier.create(Nodes.class).child(Node.class, new NodeKey(deviceState.getNodeId())); + } + + private KeyedInstanceIdentifier provideIIToNodeConnector(final Long portNo, final Short version) { + final KeyedInstanceIdentifier iiToNodes = provideIIToNodes(); + final NodeConnectorId nodeConnectorId = InventoryDataServiceUtil.nodeConnectorIdfromDatapathPortNo( + deviceState.getFeatures().getDatapathId(), portNo, OpenflowVersion.get(version)); + final NodeConnectorKey nodeConnectorKey = new NodeConnectorKey(new NodeConnectorId(nodeConnectorId)); + return iiToNodes.child(NodeConnector.class, nodeConnectorKey); + } @Override @@ -229,13 +328,24 @@ public class DeviceContextImpl implements DeviceContext, DeviceReplyProcessor { final TranslatorKey translatorKey = new TranslatorKey(packetInMessage.getVersion(), PacketReceivedTranslator.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 + public TranslatorLibrary oook() { + return translatorLibrary; + } + + @Override public void setTranslatorLibrary(final TranslatorLibrary translatorLibrary) { this.translatorLibrary = translatorLibrary; } + @Override + public HashedWheelTimer getTimer() { + return hashedWheelTimer; + } + private class XidGenerator { @@ -245,4 +355,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(Timeout timeout) { + barrierTaskTimeout = timeout; + } + + @Override + public Timeout getBarrierTaskTimeout() { + return barrierTaskTimeout; + } + + @Override + public void setNotificationService(final NotificationProviderService notificationServiceParam) { + notificationService = notificationServiceParam; + } }