MultipartType.OFPMPPORTDESC, deviceContext, deviceState.getNodeInstanceIdentifier(), deviceState.getVersion());
final ListenableFuture<List<RpcResult<List<MultipartReply>>>> deviceFeaturesFuture =
- Futures.allAsList(Arrays.asList(replyDesc, replyMeterFeature, replyGroupFeatures, replyTableFeatures, replyPortDescription));
+ Futures.allAsList(Arrays.asList(replyDesc,
+ replyMeterFeature,
+ replyGroupFeatures,
+// replyTableFeatures,
+ replyPortDescription));
Futures.addCallback(deviceFeaturesFuture, new FutureCallback<List<RpcResult<List<MultipartReply>>>>() {
@Override
// FIXME : remove session
}
});
- return Futures.allAsList(Arrays.asList(replyDesc, replyMeterFeature, replyGroupFeatures, replyTableFeatures, replyPortDescription));
+ return Futures.allAsList(Arrays.asList(replyDesc,
+ replyMeterFeature,
+ replyGroupFeatures,
+// replyTableFeatures,
+ replyPortDescription));
}
@Override
import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
import org.opendaylight.openflowplugin.api.openflow.device.RequestContext;
import org.opendaylight.openflowplugin.api.openflow.device.RequestContextStack;
+import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageSpy;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FeaturesReply;
import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
import org.opendaylight.yangtools.yang.common.RpcResult;
public RequestContextStack requestContextStack;
public DeviceContext deviceContext;
public ConnectionAdapter primaryConnectionAdapter;
+ public MessageSpy messageSpy;
+
/**
* @deprecated use {@link #CommonService(RequestContextStack, DeviceContext)}
this.datapathId = features.getDatapathId();
this.version = features.getVersion();
this.primaryConnectionAdapter = deviceContext.getPrimaryConnectionContext().getConnectionAdapter();
+ this.messageSpy = deviceContext.getMessageSpy();
}
protected long provideWaitTime() {
}
final ConnectionContext auxiliaryConnectionContext =
- deviceContext.getAuxiliaryConnectiobContexts(connectionID);
+ deviceContext.getAuxiliaryConnectiobContexts(connectionID);
if (auxiliaryConnectionContext != null) {
return auxiliaryConnectionContext.getConnectionAdapter();
}
}
public <T, F> Future<RpcResult<T>> handleServiceCall(final BigInteger connectionID,
- final Function<DataCrate<T>, ListenableFuture<RpcResult<F>>> function) {
+ final Function<DataCrate<T>, ListenableFuture<RpcResult<F>>> function) {
LOG.debug("Calling the FlowMod RPC method on MessageDispatchService");
final RequestContext<T> requestContext = requestContextStack.createRequestContext();
OFJResult2RequestCtxFuture.processResultFromOfJava(resultFromOFLib);
} else {
+ messageSpy.spyMessage(requestContext, MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMITTED_FAILURE);
RequestContextUtil.closeRequstContext(requestContext);
}
return result;
import com.google.common.util.concurrent.ListenableFuture;
import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
import org.opendaylight.openflowplugin.api.openflow.device.RequestContext;
+import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageSpy;
import org.opendaylight.yangtools.yang.common.RpcError;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
@Override
public void onSuccess(final RpcResult<F> fRpcResult) {
if (!fRpcResult.isSuccessful()) {
+ deviceContext.getMessageSpy().spyMessage(requestContext, MessageSpy.STATISTIC_GROUP.FROM_SWITCH_PUBLISHED_FAILURE);
+
// remove current request from request cache in deviceContext
deviceContext.getRequests().remove(requestContext.getXid().getValue());
// handle requestContext failure
@Override
public void onFailure(final Throwable throwable) {
if (futureResultFromOfLib.isCancelled()) {
+ deviceContext.getMessageSpy().spyMessage(requestContext, MessageSpy.STATISTIC_GROUP.FROM_SWITCH_PUBLISHED_SUCCESS);
+
LOG.trace("Asymmetric message - no response from OF Java expected for XID {}. Closing as successful.", requestContext.getXid().getValue());
requestContext.getFuture().set(RpcResultBuilder.<T>success().build());
} else {
+ deviceContext.getMessageSpy().spyMessage(requestContext, MessageSpy.STATISTIC_GROUP.FROM_SWITCH_PUBLISHED_FAILURE);
LOG.trace("Exception occured while processing OF Java response for XID {}.", requestContext.getXid().getValue(), throwable);
requestContext.getFuture().set(
RpcResultBuilder.<T>failed()
import org.opendaylight.openflowplugin.api.openflow.device.Xid;
import org.opendaylight.openflowplugin.api.openflow.registry.flow.FlowDescriptor;
import org.opendaylight.openflowplugin.api.openflow.registry.flow.FlowHash;
+import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageSpy;
import org.opendaylight.openflowplugin.impl.registry.flow.FlowDescriptorFactory;
import org.opendaylight.openflowplugin.impl.registry.flow.FlowHashFactory;
import org.opendaylight.openflowplugin.impl.util.FlowUtil;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.UpdateFlowOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.flow.update.OriginalFlow;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.flow.update.UpdatedFlow;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FlowModInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FlowModInputBuilder;
import org.opendaylight.yangtools.yang.common.RpcError;
import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
Futures.addCallback(future, new FutureCallback() {
@Override
public void onSuccess(final Object o) {
+ messageSpy.spyMessage(input, MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMITTED_SUCCESS);
LOG.debug("flow add finished without error, id={}", flowId.getValue());
}
@Override
public void onFailure(final Throwable throwable) {
+ messageSpy.spyMessage(input, MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMITTED_FAILURE);
deviceContext.getDeviceFlowRegistry().markToBeremoved(flowHash);
LOG.trace("Service call for adding flows failed, id={}.", flowId.getValue(), throwable);
}
Futures.addCallback(future, new FutureCallback() {
@Override
public void onSuccess(final Object o) {
+ messageSpy.spyMessage(input, MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMITTED_SUCCESS);
FlowHash flowHash = FlowHashFactory.create(input);
deviceContext.getDeviceFlowRegistry().markToBeremoved(flowHash);
}
@Override
public void onFailure(final Throwable throwable) {
+ messageSpy.spyMessage(input, MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMITTED_FAILURE);
StringBuffer errors = new StringBuffer();
try {
RpcResult<Void> result = future.get();
Futures.addCallback(future, new FutureCallback() {
@Override
public void onSuccess(final Object o) {
+ messageSpy.spyMessage(input, MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMITTED_SUCCESS);
FlowHash flowHash = FlowHashFactory.create(original);
deviceContext.getDeviceFlowRegistry().markToBeremoved(flowHash);
@Override
public void onFailure(final Throwable throwable) {
-
+ messageSpy.spyMessage(input, MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMITTED_FAILURE);
}
});
return future;
return createResultForFlowMod(data, data.getFlowModInputBuilder());
}
- protected <T> ListenableFuture<RpcResult<Void>> createResultForFlowMod(final DataCrate<T> data, final FlowModInputBuilder flowModInput) {
+ protected <T> ListenableFuture<RpcResult<Void>> createResultForFlowMod(final DataCrate<T> data, final FlowModInputBuilder flowModInputBuilder) {
final Xid xid = data.getRequestContext().getXid();
- flowModInput.setXid(xid.getValue());
+ flowModInputBuilder.setXid(xid.getValue());
+ final FlowModInput flowModInput = flowModInputBuilder.build();
Future<RpcResult<Void>> flowModResult = provideConnectionAdapter(data.getiDConnection()).flowMod(
- flowModInput.build());
+ flowModInput);
final ListenableFuture<RpcResult<Void>> result = JdkFutureAdapters.listenInPoolThread(flowModResult);
final RequestContext requestContext = data.getRequestContext();
public void onSuccess(final RpcResult<Void> voidRpcResult) {
if (!voidRpcResult.isSuccessful()) {
// remove current request from request cache in deviceContext
+ messageSpy.spyMessage(flowModInput, MessageSpy.STATISTIC_GROUP.FROM_SWITCH_PUBLISHED_FAILURE);
deviceContext.getRequests().remove(requestContext.getXid().getValue());
// handle requestContext failure
StringBuilder rpcErrors = new StringBuilder();
@Override
public void onFailure(final Throwable throwable) {
if (result.isCancelled()) {
+ messageSpy.spyMessage(flowModInput, MessageSpy.STATISTIC_GROUP.FROM_SWITCH_PUBLISHED_SUCCESS);
LOG.trace("Asymmetric message - no response from OF Java expected for XID {}. Closing as successful.", requestContext.getXid().getValue());
requestContext.getFuture().set(RpcResultBuilder.<T>success().build());
} else {
+ messageSpy.spyMessage(flowModInput, MessageSpy.STATISTIC_GROUP.FROM_SWITCH_PUBLISHED_FAILURE);
LOG.trace("Exception occured while processing OF Java response for XID {}.", requestContext.getXid().getValue(), throwable);
requestContext.getFuture().set(
RpcResultBuilder.<T>failed()
import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
import org.opendaylight.openflowplugin.api.openflow.device.RequestContextStack;
import org.opendaylight.openflowplugin.api.openflow.device.Xid;
+import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageSpy;
import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.GroupConvertor;
import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.AddGroupInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.AddGroupOutput;
public class SalGroupServiceImpl extends CommonService implements SalGroupService {
+
public SalGroupServiceImpl(RequestContextStack requestContextStack, DeviceContext deviceContext) {
super(requestContextStack, deviceContext);
}
@Override
public Future<RpcResult<AddGroupOutput>> addGroup(final AddGroupInput input) {
deviceContext.getDeviceGroupRegistry().store(input.getGroupId());
- return this.<AddGroupOutput, Void> handleServiceCall( PRIMARY_CONNECTION,
- new Function<DataCrate<AddGroupOutput>,ListenableFuture<RpcResult<Void>>>() {
+ return this.<AddGroupOutput, Void>handleServiceCall(PRIMARY_CONNECTION,
+ new Function<DataCrate<AddGroupOutput>, ListenableFuture<RpcResult<Void>>>() {
@Override
public ListenableFuture<RpcResult<Void>> apply(final DataCrate<AddGroupOutput> data) {
@Override
public Future<RpcResult<UpdateGroupOutput>> updateGroup(final UpdateGroupInput input) {
- return this.<UpdateGroupOutput, Void> handleServiceCall(PRIMARY_CONNECTION,
+ return this.<UpdateGroupOutput, Void>handleServiceCall(PRIMARY_CONNECTION,
new Function<DataCrate<UpdateGroupOutput>, ListenableFuture<RpcResult<Void>>>() {
@Override
@Override
public Future<RpcResult<RemoveGroupOutput>> removeGroup(final RemoveGroupInput input) {
deviceContext.getDeviceGroupRegistry().markToBeremoved(input.getGroupId());
- return this.<RemoveGroupOutput, Void> handleServiceCall(PRIMARY_CONNECTION,
+ return this.<RemoveGroupOutput, Void>handleServiceCall(PRIMARY_CONNECTION,
new Function<DataCrate<RemoveGroupOutput>, ListenableFuture<RpcResult<Void>>>() {
@Override
}
<T> ListenableFuture<RpcResult<Void>> convertAndSend(final Group iputGroup, final DataCrate<T> data) {
+ messageSpy.spyMessage(iputGroup, MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMITTED_SUCCESS);
final GroupModInputBuilder ofGroupModInput = GroupConvertor.toGroupModInput(iputGroup, version, datapathId);
final Xid xid = data.getRequestContext().getXid();
ofGroupModInput.setXid(xid.getValue());
import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
import org.opendaylight.openflowplugin.api.openflow.device.RequestContextStack;
import org.opendaylight.openflowplugin.api.openflow.device.Xid;
+import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageSpy;
import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.MeterConvertor;
import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.AddMeterInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.AddMeterOutput;
}
<T> ListenableFuture<RpcResult<Void>> convertAndSend(final Meter iputMeter, final DataCrate<T> data) {
+ messageSpy.spyMessage(iputMeter, MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMITTED_SUCCESS);
+
final MeterModInputBuilder ofMeterModInput = MeterConvertor.toMeterModInput(iputMeter, version);
final Xid xid = data.getRequestContext().getXid();
ofMeterModInput.setXid(xid.getValue());
import com.google.common.util.concurrent.ListenableFuture;
import java.util.concurrent.Future;
import org.opendaylight.openflowplugin.api.openflow.device.Xid;
+import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageSpy;
import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.PortConvertor;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.port.mod.port.Port;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortModInput;
new Function<DataCrate<UpdatePortOutput>, ListenableFuture<RpcResult<Void>>>() {
@Override
public ListenableFuture<RpcResult<Void>> apply(final DataCrate<UpdatePortOutput> data) {
+ messageSpy.spyMessage(input, MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMITTED_SUCCESS);
+
final Port inputPort = input.getUpdatedPort().getPort().getPort().get(0);
final PortModInput ofPortModInput = PortConvertor.toPortModInput(inputPort, version);
final PortModInputBuilder mdInput = new PortModInputBuilder(ofPortModInput);
import java.util.concurrent.Future;
import org.opendaylight.openflowplugin.api.OFConstants;
import org.opendaylight.openflowplugin.api.openflow.device.Xid;
+import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageSpy;
import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.TableFeaturesConvertor;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev150304.TransactionId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartRequestFlags;
@Override
public ListenableFuture<RpcResult<UpdateTableOutput>> apply(final DataCrate<UpdateTableOutput> data) {
+ messageSpy.spyMessage(input, MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMITTED_SUCCESS);
final SettableFuture<RpcResult<UpdateTableOutput>> result = SettableFuture.create();