Merge "BUG-6890:Flow-Removed Notification configuration"

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

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/NodeConfigServiceImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/NodeConfigServiceImpl.java
index 9d9a84e7b7311fbc02cf752118b373071c61d17f..5a45f44336de19ddf9f3c92443a5bc7721c197bf 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/NodeConfigServiceImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/NodeConfigServiceImpl.java
@@ -7,63 +7,37 @@
  */
 package org.opendaylight.openflowplugin.impl.services;
 
-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.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.yang.gen.v1.urn.opendaylight.module.config.rev141015.NodeConfigService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.module.config.rev141015.SetConfigInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.module.config.rev141015.SetConfigOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.SwitchConfigFlag;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.SetConfigInputBuilder;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 
-/**
- * @author joe
- */
-public class NodeConfigServiceImpl extends CommonService implements NodeConfigService {
-
-    private final RequestContextStack requestContextStack;
-    private final DeviceContext deviceContext;
-
+public final class NodeConfigServiceImpl extends AbstractSimpleService<SetConfigInput, SetConfigOutput> implements NodeConfigService {
     public NodeConfigServiceImpl(final RequestContextStack requestContextStack, final DeviceContext deviceContext) {
-        super(requestContextStack, deviceContext);
-        this.requestContextStack = requestContextStack;
-        this.deviceContext = deviceContext;
+        super(requestContextStack, deviceContext, SetConfigOutput.class);
     }
 
-
     @Override
     public Future<RpcResult<SetConfigOutput>> setConfig(final SetConfigInput input) {
-        final RequestContext requestContext = requestContextStack.createRequestContext();
-        final SettableFuture<RpcResult<SetConfigOutput>> result = requestContextStack.storeOrFail(requestContext);
-        if (!result.isDone()) {
-            SetConfigInputBuilder builder = new SetConfigInputBuilder();
-            SwitchConfigFlag flag = SwitchConfigFlag.valueOf(input.getFlag());
-            final Long reserverXid = deviceContext.getReservedXid();
-            if (null == reserverXid){
-                RequestContextUtil.closeRequestContextWithRpcError(requestContext, "Outbound queue wasn't able to reserve XID.");
-                return result;
-            }
+        return handleServiceCall(input);
+    }
+
+    @Override
+    protected OfHeader buildRequest(final Xid xid, final SetConfigInput input) throws ServiceException {
+        SetConfigInputBuilder builder = new SetConfigInputBuilder();
+        SwitchConfigFlag flag = SwitchConfigFlag.valueOf(input.getFlag());
 
-            final Xid xid = new Xid(reserverXid);
-            builder.setXid(xid.getValue());
-            builder.setFlags(flag);
-            builder.setMissSendLen(input.getMissSearchLength());
-            builder.setVersion(getVersion());
-            ListenableFuture<RpcResult<Void>> futureResultFromOfLib;
-            synchronized (deviceContext) {
-                futureResultFromOfLib = JdkFutureAdapters.listenInPoolThread(deviceContext.getPrimaryConnectionContext().getConnectionAdapter().setConfig(builder.build()));
-            }
-            OFJResult2RequestCtxFuture<SetConfigOutput> OFJResult2RequestCtxFuture = new OFJResult2RequestCtxFuture<>(requestContext, deviceContext);
-            OFJResult2RequestCtxFuture.processResultFromOfJava(futureResultFromOfLib);
-        } else {
-            RequestContextUtil.closeRequstContext(requestContext);
-        }
-        return result;
+        builder.setXid(xid.getValue());
+        builder.setFlags(flag);
+        builder.setMissSendLen(input.getMissSearchLength());
+        builder.setVersion(getVersion());
+        return builder.build();
     }
 }