X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fsal-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fsal%2Fconnect%2Fnetconf%2Fsal%2Ftx%2FWriteRunningTx.java;h=c9809e0262e88c9d36e6f9d9cddd0d3de8b72081;hb=1d91e1bbe29d0da6ea427a5d0837064c8a3d5134;hp=cf7594a7bcf0b9dbdadb9dc7a6aa6ef500d88a19;hpb=554c48aa39c535e9cf34c57198d679bd138adad2;p=netconf.git diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTx.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTx.java index cf7594a7bc..c9809e0262 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTx.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTx.java @@ -5,23 +5,17 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.sal.connect.netconf.sal.tx; -import com.google.common.base.Function; -import com.google.common.base.Optional; -import com.google.common.util.concurrent.CheckedFuture; -import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import org.opendaylight.controller.md.sal.common.api.TransactionStatus; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; -import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult; -import org.opendaylight.netconf.api.NetconfDocumentedException; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import org.opendaylight.mdsal.dom.api.DOMRpcResult; import org.opendaylight.netconf.sal.connect.netconf.util.NetconfBaseOps; import org.opendaylight.netconf.sal.connect.netconf.util.NetconfRpcFutureCallback; import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId; import org.opendaylight.yangtools.yang.common.RpcResult; -import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.opendaylight.yangtools.yang.data.api.ModifyAction; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; @@ -30,7 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Tx implementation for netconf devices that support only writable-running with no candidate + * Tx implementation for netconf devices that support only writable-running with no candidate. * The sequence goes as: *
    *
  1. Lock running datastore on tx construction @@ -49,6 +43,7 @@ import org.slf4j.LoggerFactory; public class WriteRunningTx extends AbstractWriteTx { private static final Logger LOG = LoggerFactory.getLogger(WriteRunningTx.class); + private final List changes = new ArrayList<>(); public WriteRunningTx(final RemoteDeviceId id, final NetconfBaseOps netOps, final boolean rollbackSupport) { @@ -61,18 +56,7 @@ public class WriteRunningTx extends AbstractWriteTx { } private void lock() { - try { - invokeBlocking("Lock running", new Function>() { - @Override - public ListenableFuture apply(final NetconfBaseOps input) { - return input.lockRunning(new NetconfRpcFutureCallback("Lock running", id)); - } - }); - } catch (final NetconfDocumentedException e) { - LOG.warn("{}: Failed to initialize netconf transaction (lock running)", id, e); - finished = true; - throw new RuntimeException(id + ": Failed to initialize netconf transaction (lock running)", e); - } + resultsFutures.add(netOps.lockRunning(new NetconfRpcFutureCallback("Lock running", id))); } @Override @@ -81,67 +65,46 @@ public class WriteRunningTx extends AbstractWriteTx { } @Override - protected void handleEditException(final YangInstanceIdentifier path, final NormalizedNode data, final NetconfDocumentedException e, final String editType) { - LOG.warn("{}: Error {} data to (running){}, data: {}, canceling", id, editType, path, data, e); - cancel(); - throw new RuntimeException(id + ": Error while " + editType + ": (running)" + path, e); + public synchronized ListenableFuture> performCommit() { + for (final Change change : changes) { + resultsFutures.add(change.execute(id, netOps, rollbackSupport)); + } + unlock(); + return resultsToTxStatus(); } @Override - protected void handleDeleteException(final YangInstanceIdentifier path, final NetconfDocumentedException e) { - LOG.warn("{}: Error deleting data (running){}, canceling", id, path, e); - cancel(); - throw new RuntimeException(id + ": Error while deleting (running)" + path, e); + protected void editConfig(final YangInstanceIdentifier path, + final Optional> data, + final DataContainerChild editStructure, + final Optional defaultOperation, + final String operation) { + changes.add(new Change(editStructure, defaultOperation)); } - @Override - public synchronized CheckedFuture submit() { - final ListenableFuture commmitFutureAsVoid = Futures.transform(commit(), new Function, Void>() { - @Override - public Void apply(final RpcResult input) { - return null; - } - }); - - return Futures.makeChecked(commmitFutureAsVoid, new Function() { - @Override - public TransactionCommitFailedException apply(final Exception input) { - return new TransactionCommitFailedException("Submit of transaction " + getIdentifier() + " failed", input); - } - }); + private void unlock() { + netOps.unlockRunning(new NetconfRpcFutureCallback("Unlock running", id)); } - @Override - public synchronized ListenableFuture> performCommit() { - unlock(); - return Futures.immediateFuture(RpcResultBuilder.success(TransactionStatus.COMMITED).build()); - } + private static final class Change { - @Override - protected void editConfig(final DataContainerChild editStructure, final Optional defaultOperation) throws NetconfDocumentedException { - invokeBlocking("Edit running", new Function>() { - @Override - public ListenableFuture apply(final NetconfBaseOps input) { - return defaultOperation.isPresent() - ? input.editConfigRunning(new NetconfRpcFutureCallback("Edit running", id), editStructure, defaultOperation.get(), - rollbackSupport) - : input.editConfigRunning(new NetconfRpcFutureCallback("Edit running", id), editStructure, - rollbackSupport); - } - }); - } + private final DataContainerChild editStructure; + private final Optional defaultOperation; - private void unlock() { - try { - invokeBlocking("Unlocking running", new Function>() { - @Override - public ListenableFuture apply(final NetconfBaseOps input) { - return input.unlockRunning(new NetconfRpcFutureCallback("Unlock running", id)); - } - }); - } catch (final NetconfDocumentedException e) { - LOG.warn("{}: Failed to unlock running datastore", id, e); - throw new RuntimeException(id + ": Failed to unlock running datastore", e); + Change(final DataContainerChild editStructure, final Optional defaultOperation) { + this.editStructure = editStructure; + this.defaultOperation = defaultOperation; + } + + private ListenableFuture execute(final RemoteDeviceId id, final NetconfBaseOps netOps, + final boolean rollbackSupport) { + final NetconfRpcFutureCallback editConfigCallback = new NetconfRpcFutureCallback("Edit running", id); + if (defaultOperation.isPresent()) { + return netOps.editConfigRunning(editConfigCallback, editStructure, defaultOperation.get(), + rollbackSupport); + } else { + return netOps.editConfigRunning(editConfigCallback, editStructure, rollbackSupport); + } } } }