*/
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 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.TreeMap;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import javax.annotation.Nonnull;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
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.AnyMessageTypeListener;
+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.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;
private final Map<SwitchConnectionDistinguisher, ConnectionContext> auxiliaryConnectionContexts;
private final TransactionChainManager txChainManager;
private TranslatorLibrary translatorLibrary;
- private AnyMessageTypeListener anyMessageTypeListener;
+ private OpenflowMessageListenerFacade openflowMessageListenerFacade;
+ private DeviceFlowRegistry deviceFlowRegistry;
+ private Timeout barrierTaskTimeout;
+ private NotificationProviderService notificationService;
@VisibleForTesting
DeviceContextImpl(@Nonnull final ConnectionContext primaryConnectionContext,
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();
}
/**
void submitTransaction() {
txChainManager.submitTransaction();
txChainManager.enableCounter();
- hashedWheelTimer.newTimeout(new TimerTask() {
- @Override
- public void run(final Timeout timeout) throws Exception {
- submitTransaction();
- }
- }, 0, TimeUnit.MILLISECONDS);
}
@Override
txChainManager.writeToTransaction(store, path, data);
}
+ @Override
+ public <T extends DataObject> void addDeleteToTxChain(final LogicalDatastoreType store, final InstanceIdentifier<T> path) {
+ txChainManager.addDeleteOperationTotTxChain(store, path);
+ }
+
@Override
public TableFeatures getCapabilities() {
// TODO Auto-generated method stub
return xidGenerator.generate();
}
+ @Override
public Map<Long, RequestContext> getRequests() {
return requests;
}
}
@Override
- public void attachAnyMessageTypeListener(final AnyMessageTypeListener anyMessageTypeListener) {
- this.anyMessageTypeListener = anyMessageTypeListener;
- primaryConnectionContext.getConnectionAdapter().setMessageListener(anyMessageTypeListener);
+ public void attachOpenflowMessageListener(final OpenflowMessageListenerFacade openflowMessageListenerFacade) {
+ this.openflowMessageListenerFacade = openflowMessageListenerFacade;
+ primaryConnectionContext.getConnectionAdapter().setMessageListener(openflowMessageListenerFacade);
+ }
+
+ @Override
+ public OpenflowMessageListenerFacade getOpenflowMessageListenerFacade() {
+ return openflowMessageListenerFacade;
}
@Override
- public AnyMessageTypeListener getAnyMessageTypeListener() {
- return this.anyMessageTypeListener;
+ public DeviceFlowRegistry getDeviceFlowRegistry() {
+ return deviceFlowRegistry;
}
@Override
public void processPortStatusMessage(final PortStatusMessage portStatus) {
final TranslatorKey translatorKey = new TranslatorKey(portStatus.getVersion(), PortStatusMessage.class.getName());
final MessageTranslator<PortStatusMessage, FlowCapableNodeConnector> 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<NodeConnector, NodeConnectorKey> 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<FlowCapableNodeConnector> iiToFlowCapableNodeConnector = iiToNodeConnector.augmentation(FlowCapableNodeConnector.class);
+ writeToTransaction(LogicalDatastoreType.OPERATIONAL, iiToFlowCapableNodeConnector, flowCapableNodeConnector);
+ }
+
+ private void createNodeConnectorInDS(final KeyedInstanceIdentifier<NodeConnector, NodeConnectorKey> iiToNodeConnector) {
+ writeToTransaction(LogicalDatastoreType.OPERATIONAL, iiToNodeConnector, new NodeConnectorBuilder().setKey(iiToNodeConnector.getKey()).build());
+ }
+
+ private KeyedInstanceIdentifier<Node, NodeKey> provideIIToNodes() {
+ return InstanceIdentifier.create(Nodes.class).child(Node.class, new NodeKey(deviceState.getNodeId()));
+ }
+
+ private KeyedInstanceIdentifier<NodeConnector, NodeConnectorKey> provideIIToNodeConnector(final Long portNo, final Short version) {
+ final KeyedInstanceIdentifier<Node, NodeKey> 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
final TranslatorKey translatorKey = new TranslatorKey(packetInMessage.getVersion(), PacketReceivedTranslator.class.getName());
final MessageTranslator<PacketInMessage, PacketReceived> messageTranslator = translatorLibrary.lookupTranslator(translatorKey);
final PacketReceived packetReceived = messageTranslator.translate(packetInMessage, this, null);
- //TODO publish to MD-SAL
+ notificationService.publish(packetReceived);
}
@Override
this.translatorLibrary = translatorLibrary;
}
+ @Override
+ public HashedWheelTimer getTimer() {
+ return hashedWheelTimer;
+ }
+
private class XidGenerator {
}
@Override
- public RequestContext extractNextOutstandingMessage(long barrierXid) {
+ public RequestContext extractNextOutstandingMessage(final long barrierXid) {
RequestContext nextMessage = null;
- Iterator<Long> keyIterator = requests.keySet().iterator();
+ final Iterator<Long> keyIterator = requests.keySet().iterator();
if (keyIterator.hasNext()) {
- Long oldestXid = keyIterator.next();
+ 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;
+ }
}
Code Review / openflowplugin.git / blobdiff