Returning of future from request context - SalEchoService.

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / services / SalEchoServiceImpl.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/SalEchoServiceImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/SalEchoServiceImpl.java
index b7b3e22ea3ace79dd921f920ead1cc77ae0088a1..f125a9252b1fd5f2b5624bd08d73c9b98b5cfe9a 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/SalEchoServiceImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/SalEchoServiceImpl.java
@@ -8,25 +8,20 @@
 package org.opendaylight.openflowplugin.impl.services;
 
 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.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.statistics.ofpspecific.MessageSpy;
-import org.opendaylight.openflowplugin.impl.callback.SuccessCallback;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.echo.service.rev150305.SalEchoService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.echo.service.rev150305.SendEchoInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.echo.service.rev150305.SendEchoOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.echo.service.rev150305.SendEchoOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoOutput;
-import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
+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.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 import org.slf4j.Logger;
@@ -43,69 +38,45 @@ public class SalEchoServiceImpl extends CommonService implements SalEchoService
     @Override
     public Future<RpcResult<SendEchoOutput>> sendEcho(final SendEchoInput sendEchoInput) {
         final RequestContext<SendEchoOutput> requestContext = getRequestContextStack().createRequestContext();
-        final SettableFuture<RpcResult<SendEchoOutput>> sendEchoOutput = getRequestContextStack()
-                .storeOrFail(requestContext);
-        if (!sendEchoOutput.isDone()) {
-            final DeviceContext deviceContext = getDeviceContext();
-            final Xid xid = deviceContext.getNextXid();
-            requestContext.setXid(xid);
-
-            LOG.trace("Hooking xid {} to device context - precaution.", requestContext.getXid().getValue());
-            deviceContext.hookRequestCtx(requestContext.getXid(), requestContext);
-
-            final EchoInputBuilder echoInputOFJavaBuilder = new EchoInputBuilder();
-            echoInputOFJavaBuilder.setVersion(getVersion());
-            echoInputOFJavaBuilder.setXid(xid.getValue());
-            echoInputOFJavaBuilder.setData(sendEchoInput.getData());
-            final EchoInput echoInputOFJava = echoInputOFJavaBuilder.build();
-
-            final Future<RpcResult<EchoOutput>> rpcEchoOutputOFJava = getPrimaryConnectionAdapter()
-                    .echo(echoInputOFJava);
-            LOG.debug("Echo with xid {} was sent from controller", xid);
+        if (requestContext == null) {
+            getMessageSpy().spyMessage(null, MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMIT_FAILURE);
+            return failedFuture();
+        }
 
-            ListenableFuture<RpcResult<EchoOutput>> listenableRpcEchoOutputOFJava = JdkFutureAdapters
-                    .listenInPoolThread(rpcEchoOutputOFJava);
 
-            // callback on OF JAVA future
-            SuccessCallback<EchoOutput, SendEchoOutput> successCallback = new SuccessCallback<EchoOutput, SendEchoOutput>(
-                    deviceContext, requestContext, listenableRpcEchoOutputOFJava) {
 
-                @Override
-                public RpcResult<SendEchoOutput> transform(RpcResult<EchoOutput> rpcResult) {
-                    EchoOutput echoOutputOFJava = rpcResult.getResult();
-                    SendEchoOutputBuilder sendEchoOutputBuilder = new SendEchoOutputBuilder();
-                    sendEchoOutputBuilder.setData(echoOutputOFJava.getData());
+        LOG.trace("Hooking xid {} to device context - precaution.", requestContext.getXid().getValue());
+        final Xid xid = requestContext.getXid();
+        final EchoInputBuilder echoInputOFJavaBuilder = new EchoInputBuilder();
+        echoInputOFJavaBuilder.setVersion(getVersion());
+        echoInputOFJavaBuilder.setXid(requestContext.getXid().getValue());
+        echoInputOFJavaBuilder.setData(sendEchoInput.getData());
+        final EchoInput echoInputOFJava = echoInputOFJavaBuilder.build();
 
-                    LOG.debug("Echo with xid {} was received by controller.", rpcResult.getResult().getXid());
-                    return RpcResultBuilder.success(sendEchoOutputBuilder.build()).build();
-                }
-            };
-            Futures.addCallback(listenableRpcEchoOutputOFJava, successCallback);
-        } else {
-            getMessageSpy().spyMessage(requestContext, MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMIT_FAILURE);
-        }
+        LOG.debug("Echo with xid {} was sent from controller", xid);
 
-        // callback on request context future
-        Futures.addCallback(sendEchoOutput, new FutureCallback<RpcResult<SendEchoOutput>>() {
+        final OutboundQueue outboundQueue = getDeviceContext().getPrimaryConnectionContext().getOutboundQueueProvider();
+        outboundQueue.commitEntry(xid.getValue(), echoInputOFJava, new FutureCallback<OfHeader>() {
 
+            RpcResultBuilder<SendEchoOutput> rpcResultBuilder;
             @Override
-            public void onSuccess(RpcResult<SendEchoOutput> result) {
+            public void onSuccess(final OfHeader ofHeader) {
+                rpcResultBuilder = RpcResultBuilder.<SendEchoOutput>success();
+                requestContext.setResult(rpcResultBuilder.build());
+                RequestContextUtil.closeRequstContext(requestContext);
+
+                getMessageSpy().spyMessage(echoInputOFJava.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMIT_SUCCESS);
             }
 
             @Override
-            public void onFailure(Throwable t) {
-                if (sendEchoOutput.isCancelled()) {
-                    requestContext.getFuture().set(
-                            RpcResultBuilder.<SendEchoOutput>failed()
-                                    .withError(ErrorType.APPLICATION, "Echo response wasn't obtained until barrier.")
-                                    .build());
-                    LOG.debug("Echo reply with xid {} wasn't received by controller until barrier.",
-                            requestContext.getXid());
-                }
+            public void onFailure(final Throwable throwable) {
+                rpcResultBuilder = RpcResultBuilder.<SendEchoOutput>failed().withError(RpcError.ErrorType.APPLICATION, throwable.getMessage(), throwable);
+                requestContext.setResult(rpcResultBuilder.build());
+                RequestContextUtil.closeRequstContext(requestContext);
+
+                getMessageSpy().spyMessage(echoInputOFJava.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMIT_FAILURE);
             }
         });
-
-        return sendEchoOutput;
+        return requestContext.getFuture();
     }
-
 }