*/
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.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;
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.flow.registry.DeviceFlowRegistryImpl;
-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;
private final TransactionChainManager txChainManager;
private TranslatorLibrary translatorLibrary;
private OpenflowMessageListenerFacade openflowMessageListenerFacade;
- private DeviceFlowRegistry deviceFlowRegistry;
+ private final DeviceFlowRegistry deviceFlowRegistry;
+ private final DeviceGroupRegistry deviceGroupRegistry;
+ private final DeviceMeterRegistry deviceMeterRegistry;
private Timeout barrierTaskTimeout;
private NotificationProviderService notificationService;
+ private final MessageSpy<Class> 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;
}
/**
void submitTransaction() {
txChainManager.submitTransaction();
txChainManager.enableCounter();
- hashedWheelTimer.newTimeout(new TimerTask() {
- @Override
- public void run(final Timeout timeout) throws Exception {
- submitTransaction();
- }
- }, 0, TimeUnit.MILLISECONDS);
}
@Override
}
@Override
- public Map<Long, RequestContext> getRequests() {
- return requests;
+ public RequestContext lookupRequest(Xid xid) {
+ return requests.get(xid.getValue());
+ }
+
+ @Override
+ public int getNumberOfOutstandingRequests() {
+ return requests.size();
}
@Override
public void hookRequestCtx(final Xid xid, final RequestContext requestFutureContext) {
- // TODO Auto-generated method stub
requests.put(xid.getValue(), requestFutureContext);
}
+ @Override
+ public RequestContext unhookRequestCtx(Xid xid) {
+ return requests.remove(xid.getValue());
+ }
+
@Override
public void attachOpenflowMessageListener(final OpenflowMessageListenerFacade openflowMessageListenerFacade) {
this.openflowMessageListenerFacade = openflowMessageListenerFacade;
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 RequestContext requestContext = requests.get(ofHeader.getXid());
if (null != requestContext) {
final SettableFuture replyFuture = requestContext.getFuture();
- getRequests().remove(ofHeader.getXid());
+ requests.remove(ofHeader.getXid());
RpcResult<OfHeader> rpcResult;
if (ofHeader instanceof Error) {
final Error error = (Error) ofHeader;
.<OfHeader>failed()
.withError(RpcError.ErrorType.APPLICATION, message, new DeviceDataException(message, error))
.build();
+ messageSpy.spyMessage(ofHeader.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.FROM_SWITCH_PUBLISHED_FAILURE);
} else {
rpcResult = RpcResultBuilder
.<OfHeader>success()
.withResult(ofHeader)
.build();
+ messageSpy.spyMessage(ofHeader.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.FROM_SWITCH_PUBLISHED_SUCCESS);
}
replyFuture.set(rpcResult);
LOG.error("Closing RequestContext failed: ", e);
}
} else {
- LOG.error("Can't find request context registered for xid : {}", ofHeader.getXid());
+ 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<MultipartReply> ofHeaderList) {
- final RequestContext requestContext = getRequests().get(xid.getValue());
+ final RequestContext requestContext = requests.get(xid.getValue());
if (null != requestContext) {
final SettableFuture replyFuture = requestContext.getFuture();
- getRequests().remove(xid.getValue());
+ requests.remove(xid.getValue());
final RpcResult<List<MultipartReply>> rpcResult = RpcResultBuilder
.<List<MultipartReply>>success()
.withResult(ofHeaderList)
.build();
replyFuture.set(rpcResult);
+ for (MultipartReply multipartReply : ofHeaderList) {
+ messageSpy.spyMessage(multipartReply.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.FROM_SWITCH_PUBLISHED_FAILURE);
+ }
+
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());
+ LOG.error("Can't find request context registered for xid : {}. Type of reply: MULTIPART. From address: {}", xid.getValue(),
+ getPrimaryConnectionContext().getConnectionAdapter().getRemoteAddress());
}
}
LOG.trace("Processing exception for xid : {}", xid.getValue());
- final RequestContext requestContext = getRequests().get(xid.getValue());
+ final RequestContext requestContext = requests.get(xid.getValue());
if (null != requestContext) {
final SettableFuture replyFuture = requestContext.getFuture();
- getRequests().remove(xid.getValue());
+ requests.remove(xid.getValue());
final RpcResult<List<OfHeader>> rpcResult = RpcResultBuilder
.<List<OfHeader>>failed()
.withError(RpcError.ErrorType.APPLICATION, String.format("Message processing failed : %s", deviceDataException.getError()), deviceDataException)
.build();
replyFuture.set(rpcResult);
+ messageSpy.spyMessage(deviceDataException.getClass(), MessageSpy.STATISTIC_GROUP.FROM_SWITCH_PUBLISHED_FAILURE);
try {
requestContext.close();
} catch (final Exception e) {
@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);
- FlowCapableNodeConnector flowCapableNodeConnector = messageTranslator.translate(portStatus, this, null);
+ messageSpy.spyMessage(portStatus.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.FROM_SWITCH_PUBLISHED_SUCCESS);
+ final TranslatorKey translatorKey = new TranslatorKey(portStatus.getVersion(), PortGrouping.class.getName());
+ final MessageTranslator<PortGrouping, FlowCapableNodeConnector> messageTranslator = translatorLibrary.lookupTranslator(translatorKey);
+ final FlowCapableNodeConnector flowCapableNodeConnector = messageTranslator.translate(portStatus, this, null);
- final KeyedInstanceIdentifier<NodeConnector, NodeConnectorKey> iiToNodeConnector =
- provideIIToNodeConnector(portStatus.getPortNo(), portStatus.getVersion());
- if (portStatus.getReason().equals(PortReason.OFPPRADD) ) {
+ final KeyedInstanceIdentifier<NodeConnector, NodeConnectorKey> 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
- 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();
+ 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);
}
-
- 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);
-
+ private KeyedInstanceIdentifier<NodeConnector, NodeConnectorKey> provideIIToNodeConnector(final long portNo, final short version) {
+ final InstanceIdentifier<Node> 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());
+ messageSpy.spyMessage(packetInMessage.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.FROM_SWITCH_PUBLISHED_SUCCESS);
+ final TranslatorKey translatorKey = new TranslatorKey(packetInMessage.getVersion(), PacketIn.class.getName());
final MessageTranslator<PacketInMessage, PacketReceived> messageTranslator = translatorLibrary.lookupTranslator(translatorKey);
final PacketReceived packetReceived = messageTranslator.translate(packetInMessage, this, null);
notificationService.publish(packetReceived);
return hashedWheelTimer;
}
+ @Override
+ public void close() throws Exception {
+ for (Map.Entry<Long, RequestContext> entry : requests.entrySet()){
+ entry.getValue().close();
+ }
+ }
+
private class XidGenerator {
}
@Override
- public void setCurrentBarrierTimeout(Timeout timeout) {
+ public void setCurrentBarrierTimeout(final Timeout timeout) {
barrierTaskTimeout = timeout;
}
public void setNotificationService(final NotificationProviderService notificationServiceParam) {
notificationService = notificationServiceParam;
}
+
+ @Override
+ public MessageSpy getMessageSpy() {
+ return messageSpy;
+ }
}
Code Review / openflowplugin.git / blobdiff