Decouple config and netconf subsystems.

[controller.git] / opendaylight / netconf / sal-netconf-connector / src / main / java / org / opendaylight / controller / sal / connect / netconf / sal / tx / WriteRunningTx.java

diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/sal/tx/WriteRunningTx.java b/opendaylight/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/sal/tx/WriteRunningTx.java
similarity index 90%
rename from opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/sal/tx/WriteRunningTx.java
rename to opendaylight/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/sal/tx/WriteRunningTx.java
index ba94da8be276ac339c68958f301f9c59ba14ecb2..dc82e860bfcdbfd0309f740e689fab4dc2a763a1 100644 (file)
--- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/sal/tx/WriteRunningTx.java
+++ b/opendaylight/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/sal/tx/WriteRunningTx.java
@@ -67,7 +67,7 @@ public class WriteRunningTx extends AbstractWriteTx {
                 }
             });
         } catch (final NetconfDocumentedException e) {
-            LOG.warn("{}: Failed to initialize netconf transaction (lock running)", 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);
         }
@@ -80,7 +80,7 @@ public class WriteRunningTx extends AbstractWriteTx {
 
     @Override
     protected void handleEditException(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data, final NetconfDocumentedException e, final String editType) {
-        LOG.warn("{}: Error " + editType + " data to (running){}, data: {}, canceling", id, path, data, e);
+        LOG.warn("{}: Error {} data to (running){}, data: {}, canceling", id, editType, path, data, e);
         cancel();
         throw new RuntimeException(id + ": Error while " + editType + ": (running)" + path, e);
     }
@@ -120,11 +120,11 @@ public class WriteRunningTx extends AbstractWriteTx {
         invokeBlocking("Edit running", new Function<NetconfBaseOps, ListenableFuture<DOMRpcResult>>() {
             @Override
             public ListenableFuture<DOMRpcResult> 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);
+                    return defaultOperation.isPresent()
+                            ? input.editConfigRunning(new NetconfRpcFutureCallback("Edit running", id), editStructure, defaultOperation.get(),
+                            rollbackSupport)
+                            : input.editConfigRunning(new NetconfRpcFutureCallback("Edit running", id), editStructure,
+                            rollbackSupport);
             }
         });
     }
@@ -138,7 +138,7 @@ public class WriteRunningTx extends AbstractWriteTx {
                 }
             });
         } catch (final NetconfDocumentedException e) {
-            LOG.warn("{}: Failed to unlock running datastore", e);
+            LOG.warn("{}: Failed to unlock running datastore", id, e);
             throw new RuntimeException(id + ": Failed to unlock running datastore", e);
         }
     }