From 77814bae3f3b13015d206e1dc5108ffdb8015eb6 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Fri, 25 Nov 2016 13:18:33 +0100 Subject: [PATCH] Bug 7241:Fix logging for VPP node 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 --- .../groupbasedpolicy/renderer/vpp/manager/VppNodeManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/manager/VppNodeManager.java b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/manager/VppNodeManager.java index 4dee0a663..cfd64a189 100644 --- a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/manager/VppNodeManager.java +++ b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/manager/VppNodeManager.java @@ -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) { -- 2.36.6