X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fimpl%2Fservices%2FSalFlowServiceImpl.java;h=3912e027980f73e6f9fdedcb1341cb3e7b4cd1dc;hb=a20de7a6effc5e4a37940e0ef5db507ad0730953;hp=8d11b8a60ef64f2b1c0c02a89c245b1e8e2e2f19;hpb=6ae68a28f2f853f5ba7837e181edd44d254c3c1d;p=openflowplugin.git
diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/SalFlowServiceImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/SalFlowServiceImpl.java
index 8d11b8a60e..3912e02798 100644
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/SalFlowServiceImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/SalFlowServiceImpl.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
- *
+ *
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -10,24 +10,24 @@ package org.opendaylight.openflowplugin.impl.services;
import com.google.common.base.Function;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.JdkFutureAdapters;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
-import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
+import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueue;
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.device.Xid;
-import org.opendaylight.openflowplugin.api.openflow.device.exception.DeviceDataException;
+import org.opendaylight.openflowplugin.api.openflow.registry.flow.DeviceFlowRegistry;
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.openflowplugin.openflow.md.core.sal.convertor.FlowConvertor;
import org.opendaylight.openflowplugin.openflow.md.util.FlowCreatorUtil;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowId;
@@ -44,7 +44,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.Upda
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.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
import org.opendaylight.yangtools.yang.common.RpcError;
import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
import org.opendaylight.yangtools.yang.common.RpcResult;
@@ -59,43 +61,33 @@ public class SalFlowServiceImpl extends CommonService implements SalFlowService
super(requestContextStack, deviceContext);
}
- ListenableFuture> handleServiceCall(final BigInteger connectionID,
- final FlowModInputBuilder flowModInputBuilder, final Function, ListenableFuture>> function) {
- LOG.debug("Calling the FlowMod RPC method on MessageDispatchService");
-
- final RequestContext requestContext = requestContextStack.createRequestContext();
- final SettableFuture> result = requestContextStack.storeOrFail(requestContext);
- final DataCrate dataCrate = DataCrateBuilder.builder().setiDConnection(connectionID)
- .setRequestContext(requestContext).setFlowModInputBuilder(flowModInputBuilder).build();
-
- if (!result.isDone()) {
- final ListenableFuture> resultFromOFLib = function.apply(dataCrate);
-
- final OFJResult2RequestCtxFuture OFJResult2RequestCtxFuture = new OFJResult2RequestCtxFuture<>(requestContext, deviceContext);
- OFJResult2RequestCtxFuture.processResultFromOfJava(resultFromOFLib);
-
- } else {
- RequestContextUtil.closeRequstContext(requestContext);
- }
- return result;
- }
-
@Override
public Future> addFlow(final AddFlowInput input) {
+ getMessageSpy().spyMessage(input.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.TO_SWITCH_ENTERED);
- final FlowId flowId = input.getFlowRef().getValue().firstKeyOf(Flow.class, FlowKey.class).getId();
+ final List ofFlowModInputs = FlowConvertor.toFlowModInputs(input, getVersion(), getDatapathId());
+ final ListenableFuture> future = processFlowModInputBuilders(ofFlowModInputs);
+ final FlowId flowId;
+ if (null != input.getFlowRef()) {
+ flowId = input.getFlowRef().getValue().firstKeyOf(Flow.class, FlowKey.class).getId();
+ } else {
+ flowId = FlowUtil.createAlienFlowId(input.getTableId());
+ }
- final FlowHash flowHash = FlowHashFactory.create(input);
+ final DeviceContext deviceContext = getDeviceContext();
+ final FlowHash flowHash = FlowHashFactory.create(input, deviceContext.getPrimaryConnectionContext().getFeatures().getVersion());
final FlowDescriptor flowDescriptor = FlowDescriptorFactory.create(input.getTableId(), flowId);
deviceContext.getDeviceFlowRegistry().store(flowHash, flowDescriptor);
+ Futures.addCallback(future, new FutureCallback>() {
- final List ofFlowModInputs = FlowConvertor.toFlowModInputs(input, version, datapathId);
- final ListenableFuture future = processFlowModInputBuilders(ofFlowModInputs);
- Futures.addCallback(future, new FutureCallback() {
@Override
- public void onSuccess(final Object o) {
- LOG.debug("flow add finished without error, id={}", flowId.getValue());
+ public void onSuccess(final RpcResult rpcResult) {
+ if (rpcResult.isSuccessful()) {
+ LOG.debug("flow add finished without error, id={}", flowId.getValue());
+ } else {
+ LOG.debug("flow add failed with error, id={}", flowId.getValue());
+ }
}
@Override
@@ -111,40 +103,44 @@ public class SalFlowServiceImpl extends CommonService implements SalFlowService
@Override
public Future> removeFlow(final RemoveFlowInput input) {
LOG.trace("Calling remove flow for flow with ID ={}.", input.getFlowRef());
- return this.handleServiceCall(PRIMARY_CONNECTION,
- new Function, ListenableFuture>>() {
+ return this.handleServiceCall(new Function, ListenableFuture>>() {
+ @Override
+ public ListenableFuture> apply(final RequestContext requestContext) {
+ final FlowModInputBuilder ofFlowModInput = FlowConvertor.toFlowModInput(input, getVersion(),
+ getDatapathId());
+ final ListenableFuture> future = createResultForFlowMod(requestContext, ofFlowModInput);
+ Futures.addCallback(future, new FutureCallback>() {
@Override
- public ListenableFuture> apply(final DataCrate data) {
- final FlowModInputBuilder ofFlowModInput = FlowConvertor.toFlowModInput(input, version,
- datapathId);
- final ListenableFuture> future = createResultForFlowMod(data, ofFlowModInput);
- Futures.addCallback(future, new FutureCallback() {
- @Override
- public void onSuccess(final Object o) {
- FlowHash flowHash = FlowHashFactory.create(input);
- deviceContext.getDeviceFlowRegistry().markToBeremoved(flowHash);
- }
+ public void onSuccess(final RpcResult o) {
+ final DeviceContext deviceContext = getDeviceContext();
+ getMessageSpy().spyMessage(input.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMIT_SUCCESS);
+ FlowHash flowHash = FlowHashFactory.create(input, deviceContext.getPrimaryConnectionContext().getFeatures().getVersion());
+ deviceContext.getDeviceFlowRegistry().markToBeremoved(flowHash);
+ }
- @Override
- public void onFailure(final Throwable throwable) {
- StringBuffer errors = new StringBuffer();
- try {
- RpcResult result = future.get();
- Collection rpcErrors = result.getErrors();
- if (null != rpcErrors && rpcErrors.size() > 0) {
- for (RpcError rpcError : rpcErrors) {
- errors.append(rpcError.getMessage());
- }
- }
- } catch (InterruptedException | ExecutionException e) {
- LOG.trace("Flow modification failed. Can't read errors from RpcResult.");
+ @Override
+ public void onFailure(final Throwable throwable) {
+ getMessageSpy().spyMessage(input.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMIT_FAILURE);
+ LOG.trace("Flow modification failed..", throwable);
+ StringBuilder errors = new StringBuilder();
+ try {
+ RpcResult result = future.get();
+ Collection rpcErrors = result.getErrors();
+ if (null != rpcErrors && rpcErrors.size() > 0) {
+ for (RpcError rpcError : rpcErrors) {
+ errors.append(rpcError.getMessage());
}
- LOG.trace("Flow modification failed. Errors : {}", errors.toString());
}
- });
- return future;
+ } catch (InterruptedException | ExecutionException e) {
+ LOG.trace("Flow modification failed. Can't read errors from RpcResult.");
+ } finally {
+ LOG.trace("Flow modification failed. Errors : {}", errors.toString());
+ }
}
});
+ return future;
+ }
+ });
}
@Override
@@ -156,104 +152,105 @@ public class SalFlowServiceImpl extends CommonService implements SalFlowService
final List allFlowMods = new ArrayList<>();
List ofFlowModInputs;
- if (!FlowCreatorUtil.canModifyFlow(original, updated, version)) {
+ if (!FlowCreatorUtil.canModifyFlow(original, updated, getVersion())) {
// We would need to remove original and add updated.
// remove flow
final RemoveFlowInputBuilder removeflow = new RemoveFlowInputBuilder(original);
final List ofFlowRemoveInput = FlowConvertor.toFlowModInputs(removeflow.build(),
- version, datapathId);
+ getVersion(), getDatapathId());
// remove flow should be the first
allFlowMods.addAll(ofFlowRemoveInput);
final AddFlowInputBuilder addFlowInputBuilder = new AddFlowInputBuilder(updated);
- ofFlowModInputs = FlowConvertor.toFlowModInputs(addFlowInputBuilder.build(), version, datapathId);
+ ofFlowModInputs = FlowConvertor.toFlowModInputs(addFlowInputBuilder.build(), getVersion(), getDatapathId());
} else {
- ofFlowModInputs = FlowConvertor.toFlowModInputs(updated, version, datapathId);
+ ofFlowModInputs = FlowConvertor.toFlowModInputs(updated, getVersion(), getDatapathId());
}
allFlowMods.addAll(ofFlowModInputs);
- ListenableFuture future = processFlowModInputBuilders(allFlowMods);
- Futures.addCallback(future, new FutureCallback() {
+ ListenableFuture> future = processFlowModInputBuilders(allFlowMods);
+ Futures.addCallback(future, new FutureCallback>() {
@Override
- public void onSuccess(final Object o) {
- FlowHash flowHash = FlowHashFactory.create(original);
- deviceContext.getDeviceFlowRegistry().markToBeremoved(flowHash);
+ public void onSuccess(final RpcResult o) {
+ final DeviceContext deviceContext = getDeviceContext();
+ getMessageSpy().spyMessage(input.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMIT_SUCCESS);
+ final short version = deviceContext.getPrimaryConnectionContext().getFeatures().getVersion();
+ FlowHash flowHash = FlowHashFactory.create(original, version);
- flowHash = FlowHashFactory.create(updated);
+ FlowHash updatedflowHash = FlowHashFactory.create(updated, version);
FlowId flowId = input.getFlowRef().getValue().firstKeyOf(Flow.class, FlowKey.class).getId();
FlowDescriptor flowDescriptor = FlowDescriptorFactory.create(updated.getTableId(), flowId);
- deviceContext.getDeviceFlowRegistry().store(flowHash, flowDescriptor);
-
+ final DeviceFlowRegistry deviceFlowRegistry = deviceContext.getDeviceFlowRegistry();
+ deviceFlowRegistry.markToBeremoved(flowHash);
+ deviceFlowRegistry.store(updatedflowHash, flowDescriptor);
}
@Override
public void onFailure(final Throwable throwable) {
-
+ getMessageSpy().spyMessage(input.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMIT_FAILURE);
}
});
return future;
}
- private ListenableFuture> processFlowModInputBuilders(
- final List ofFlowModInputs) {
+ private ListenableFuture> processFlowModInputBuilders(final List ofFlowModInputs) {
+
final List>> partialFutures = new ArrayList<>();
- for (FlowModInputBuilder flowModInputBuilder : ofFlowModInputs) {
- ListenableFuture> partialFuture = handleServiceCall(PRIMARY_CONNECTION, flowModInputBuilder,
- new Function, ListenableFuture>>() {
+
+ for (final FlowModInputBuilder flowModInputBuilder : ofFlowModInputs) {
+ ListenableFuture> partialFuture = handleServiceCall(
+ new Function, ListenableFuture>>() {
@Override
- public ListenableFuture> apply(final DataCrate data) {
- return createResultForFlowMod(data);
+ public ListenableFuture> apply(final RequestContext requestContext) {
+ return createResultForFlowMod(requestContext, flowModInputBuilder);
}
});
partialFutures.add(partialFuture);
}
- final ListenableFuture>> allFutures = Futures.allAsList(partialFutures);
+ final ListenableFuture>> allFutures = Futures.successfulAsList(partialFutures);
final SettableFuture> finalFuture = SettableFuture.create();
Futures.addCallback(allFutures, new FutureCallback>>() {
@Override
- public void onSuccess(List> result) {
- LOG.warn("Positive confirmation of flow push is not supported by OF-spec");
- for (FlowModInputBuilder ofFlowModInput : ofFlowModInputs) {
- LOG.warn("flow future result was successful [{}] = this should have never happen",
- ofFlowModInput.getXid());
- }
- finalFuture.setException(new DeviceDataException("positive confirmation of flow occurred"));
+ public void onSuccess(final List> results) {
+ RpcResultBuilder rpcResultBuilder = RpcResultBuilder.success();
+ finalFuture.set(rpcResultBuilder.build());
}
@Override
- public void onFailure(Throwable t) {
- LOG.trace("Flow mods chained future failed.");
- RpcResultBuilder resultBuilder;
- if (allFutures.isCancelled()) {
- if (LOG.isTraceEnabled()) {
- for (FlowModInputBuilder ofFlowModInput : ofFlowModInputs) {
- LOG.trace("flow future result was cancelled [{}] = barrier passed it without error",
- ofFlowModInput.getXid());
- }
- }
- resultBuilder = RpcResultBuilder.success();
- } else {
- resultBuilder = RpcResultBuilder.failed().withError(ErrorType.APPLICATION, "", t.getMessage());
- }
- finalFuture.set(resultBuilder.build());
+ public void onFailure(final Throwable t) {
+ RpcResultBuilder rpcResultBuilder = RpcResultBuilder.failed();
+ finalFuture.set(rpcResultBuilder.build());
}
});
return finalFuture;
}
- protected ListenableFuture> createResultForFlowMod(final DataCrate data) {
- return createResultForFlowMod(data, data.getFlowModInputBuilder());
- }
+ protected ListenableFuture> createResultForFlowMod(final RequestContext requestContext, final FlowModInputBuilder flowModInputBuilder) {
+ final OutboundQueue outboundQueue = getDeviceContext().getPrimaryConnectionContext().getOutboundQueueProvider();
+ final long xid = requestContext.getXid().getValue();
+ flowModInputBuilder.setXid(xid);
+ final FlowModInput flowModInput = flowModInputBuilder.build();
+
+ final SettableFuture> settableFuture = SettableFuture.create();
+ outboundQueue.commitEntry(xid, flowModInput, new FutureCallback() {
+ @Override
+ public void onSuccess(final OfHeader ofHeader) {
+ RequestContextUtil.closeRequstContext(requestContext);
+ getMessageSpy().spyMessage(FlowModInput.class, MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMIT_SUCCESS);
+
+ settableFuture.set(SUCCESSFUL_RPCRESULT);
+ }
- protected ListenableFuture> createResultForFlowMod(final DataCrate data, final FlowModInputBuilder flowModInput) {
- final Xid xId = deviceContext.getNextXid();
- flowModInput.setXid(xId.getValue());
- data.getRequestContext().setXid(xId);
- Future> flowModResult = provideConnectionAdapter(data.getiDConnection()).flowMod(
- flowModInput.build());
- return JdkFutureAdapters.listenInPoolThread(flowModResult);
+ @Override
+ public void onFailure(final Throwable throwable) {
+ RpcResultBuilder rpcResultBuilder = RpcResultBuilder.failed().withError(ErrorType.APPLICATION, throwable.getMessage(), throwable);
+ RequestContextUtil.closeRequstContext(requestContext);
+ settableFuture.set(rpcResultBuilder.build());
+ }
+ });
+ return settableFuture;
}
}