Clean up some log messages and descriptions

Just some minor changes for readability when digging through
log files. yang desrciption was changed to match log message
as they were duplicates of each other.

Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>
Change-Id: I51a6deee824ef95b3c7721c2e555f247d95de781
(cherry picked from commit 49fcac580c1d866bb76a87abc7e0a4f53c25c032)

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java
index 7cac6407fecba69c82f470117cec438d1a5d8a7e..de840e27d09ac143fbb88af6370a821240e1c994 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java
@@ -348,10 +348,10 @@ public class NetconfDeviceCommunicator
         try {
             if (semaphore != null && !semaphore.tryAcquire()) {
                 LOG.warn("Limit of concurrent rpc messages was reached (limit: {}). Rpc reply message is needed. "
-                    + "Discarding request of Netconf device with id {}", concurentRpcMsgs, id.getName());
+                    + "Discarding request of Netconf device with id: {}", concurentRpcMsgs, id.getName());
                 return FluentFutures.immediateFailedFluentFuture(new NetconfDocumentedException(
                         "Limit of rpc messages was reached (Limit :" + concurentRpcMsgs
-                        + ") waiting for emptying the queue of Netconf device with id" + id.getName()));
+                        + ") waiting for emptying the queue of Netconf device with id: " + id.getName()));
             }
 
             return sendRequestWithLock(message, rpc);

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/LockChangeListener.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/LockChangeListener.java
index 2092057d48ffc3aeeda7d51f7ca24867f395716c..ee3d6a08aeaab6607e3c2bafd82136aab2e84aef 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/LockChangeListener.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/LockChangeListener.java
@@ -34,10 +34,9 @@ final class LockChangeListener implements DataTreeChangeListener<DatastoreLock>
                 case SUBTREE_MODIFIED:
                 case WRITE:
                     if (!rootNode.getDataAfter().isDatastoreLockAllowed()) {
-                        LOG.warn("With blocking the lock/unlock operations, the user is coming to"
-                                 + "operate in a manner which is not supported. It must not exist"
-                                 + "any concurrent access to the data store - it may interfere with"
-                                 + "data consistency.");
+                        LOG.warn("With blocking the lock/unlock operations, the user is coming to "
+                                 + "operate in a manner which is not supported. Concurrent access to "
+                                 + "the data store may interfere with data consistency.");
                     }
                     netconfDeviceDataBroker.setLockAllowed(rootNode.getDataAfter().isDatastoreLockAllowed());
                     break;

diff --git a/netconf/sal-netconf-connector/src/main/yang/netconf-node-optional.yang b/netconf/sal-netconf-connector/src/main/yang/netconf-node-optional.yang
index 8e9d632a54cec54ab370355ba81b26308dc932c0..9ecbe6e4b74e4077e59292193c58ccd5015c5e3c 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/yang/netconf-node-optional.yang
+++ b/netconf/sal-netconf-connector/src/main/yang/netconf-node-optional.yang
@@ -53,8 +53,8 @@ module netconf-node-optional {
                         description "The operation allows the client to lock the entire configuration datastore
                             system of a device.
                             WARNING - With blocking the lock/unlock operations, the user is coming to operate
-                            in a manner which is not supported. It must not exist any concurrent access to
-                            the data store - it may interfere with data consistency.";
+                            in a manner which is not supported. Concurrent access to the data store may interfere
+                            with data consistency.";
                     }
                 }
             }