Bug 7241:Fix logging for VPP node 97/48697/2
authorMichal Cmarada <mcmarada@cisco.com>
Fri, 25 Nov 2016 12:18:33 +0000 (13:18 +0100)
committerMichal Cmarada <mcmarada@cisco.com>
Fri, 25 Nov 2016 12:40:37 +0000 (12:40 +0000)
if the required VPP node does not contain required capability the logs
shouldn`t say that this node is capable and ready.

Change-Id: Id515d89a9aae8c5c84ac555ececa751f40aa8052
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/manager/VppNodeManager.java

index 4dee0a66310c2ce701106fd1b199b64871fcd79f..cfd64a18912bbb269355cbd079663369e4ee8bf7 100644 (file)
@@ -107,7 +107,6 @@ public class VppNodeManager {
                 break;
             case Connected:
                 resolveConnectedNode(node, netconfNode);
-                LOG.info("Node {} is capable and ready", node.getNodeId().getValue());
                 break;
             default:
                 break;
@@ -123,7 +122,6 @@ public class VppNodeManager {
         NetconfNodeConnectionStatus.ConnectionStatus afterNodeStatus = netconfNode.getConnectionStatus();
         if (afterNodeStatus.equals(Connected)) {
             resolveConnectedNode(node, netconfNode);
-            LOG.info("Node {} is capable and ready", node.getNodeId().getValue());
         }
         if (afterNodeStatus.equals(Connecting)) {
             resolveDisconnectedNode(node);
@@ -143,11 +141,13 @@ public class VppNodeManager {
         VppNodeWriter vppNodeWriter = new VppNodeWriter();
         vppNodeWriter.cache(rendererNode);
         if (!isCapableNetconfDevice(node, netconfNode)) {
+            LOG.warn("Node {} is not connected.", node.getNodeId().getValue());
             return;
         }
         vppNodeWriter.commitToDatastore(dataBroker);
         DataBroker mountpoint = getNodeMountPoint(mountPointIid);
         netconfNodeCache.put(mountPointIid, mountpoint);
+        LOG.info("Node {} is capable and ready.", node.getNodeId().getValue());
     }
 
     private void resolveDisconnectedNode(Node node) {