diff options
12 files changed, 50 insertions, 47 deletions
diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/DOMNotificationToXPath.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/DOMNotificationToXPath.java index abe89df7a..3d7353328 100644 --- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/DOMNotificationToXPath.java +++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/DOMNotificationToXPath.java @@ -224,10 +224,10 @@ public class DOMNotificationToXPath { Instant eventTime; if (domNotification instanceof DOMEvent) { eventTime = ((DOMEvent) domNotification).getEventInstant(); - LOG.info("Event time {}", eventTime); + LOG.debug("Event time {}", eventTime); } else { eventTime = Instant.now(); - LOG.info("Defaulting to actual time of processing the notification - {}", eventTime); + LOG.debug("Defaulting to actual time of processing the notification - {}", eventTime); } return eventTime; } diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMChangeNotificationListener.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMChangeNotificationListener.java index 39eabcdc6..f8e8b6da2 100644 --- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMChangeNotificationListener.java +++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMChangeNotificationListener.java @@ -134,7 +134,7 @@ public class ORanDOMChangeNotificationListener implements DOMNotificationListene VESNotificationFieldsPOJO body = mapper.createVESNotificationFields(domNotificationXPath.convertDomNotifToXPath(domNotification), ORanDeviceManagerQNames.IETF_NETCONF_NOTIFICATIONS_NETCONF_CONFIG_CHANGE.getLocalName()); - log.info("domNotification in XPath format = {}", + log.debug("domNotification in XPath format = {}", domNotificationXPath.convertDomNotifToXPath(domNotification)); try { vesCollectorService.publishVESMessage(vesCollectorService.generateVESEvent(header, body)); diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMFaultNotificationListener.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMFaultNotificationListener.java index 494a01f71..3e6921272 100644 --- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMFaultNotificationListener.java +++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMFaultNotificationListener.java @@ -115,7 +115,7 @@ public class ORanDOMFaultNotificationListener implements DOMNotificationListener VESFaultFieldsPOJO body = mapper.mapFaultFields(notification); VESMessage vesMsg = vesCollectorService.generateVESEvent(header, body); vesCollectorService.publishVESMessage(vesMsg); - LOG.info("VES Message is {}", vesMsg.getMessage()); + LOG.debug("VES Message is {}", vesMsg.getMessage()); writeToEventLog(vesMsg.getMessage(), eventTimeInstant, ORanDeviceManagerQNames.ORAN_FM_ALARM_NOTIF.getLocalName(), counter); } } catch (JsonProcessingException | DateTimeParseException e) { diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMNetworkElement.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMNetworkElement.java index 9b4f11e27..88a470f3f 100644 --- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMNetworkElement.java +++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMNetworkElement.java @@ -77,7 +77,7 @@ public class ORanDOMNetworkElement implements NetworkElement { public ORanDOMNetworkElement(@NonNull NetconfDomAccessor netconfDomAccessor, @NonNull DeviceManagerServiceProvider serviceProvider) { - LOG.info("Create {}", ORanDOMNetworkElement.class.getSimpleName()); + LOG.debug("Create {}", ORanDOMNetworkElement.class.getSimpleName()); this.netconfDomAccessor = Objects.requireNonNull(netconfDomAccessor); Objects.requireNonNull(serviceProvider); this.databaseService = serviceProvider.getDataProvider(); @@ -199,7 +199,7 @@ public class ORanDOMNetworkElement implements NetworkElement { * @return NormalizedNode data with GUI cut through information or null if not available. */ private @Nullable NormalizedNode getOnapSystemData() { - LOG.info("Get System1 for mountpoint {}", netconfDomAccessor.getNodeId().getValue()); + LOG.debug("Get System1 for mountpoint {}", netconfDomAccessor.getNodeId().getValue()); @NonNull InstanceIdentifierBuilder ietfSystemIID = YangInstanceIdentifier.builder().node(ORanDeviceManagerQNames.IETF_SYSTEM_CONTAINER); @@ -209,7 +209,7 @@ public class ORanDOMNetworkElement implements NetworkElement { InstanceIdentifierBuilder augmentedOnapSystem = YangInstanceIdentifier.builder(ietfSystemIID.build()).node(onapSystemIID); Capabilities x = netconfDomAccessor.getCapabilites(); - LOG.info("Capabilites: {}", x); + LOG.debug("Capabilites: {}", x); if (x.isSupportingNamespace(ORanDeviceManagerQNames.ONAP_SYSTEM_QNAME)) { Optional<NormalizedNode> res = netconfDomAccessor.readDataNode(LogicalDatastoreType.OPERATIONAL, augmentedOnapSystem.build()); @@ -268,14 +268,14 @@ public class ORanDOMNetworkElement implements NetworkElement { String deviceName = ORanDMDOMUtility.getLeafValue(device, ORanDeviceManagerQNames.CALLHOME_SERVER_ALLOWED_DEVICE_KEY); if (deviceName != null && deviceName.equals(mountpointName)) { - LOG.info("Mountpoint {} is part of allowed-devices list", mountpointName); + LOG.debug("Mountpoint {} is part of allowed-devices list", mountpointName); return true; } } } } - LOG.info("Mountpoint {} is not part of allowed-devices list", mountpointName); + LOG.debug("Mountpoint {} is not part of allowed-devices list", mountpointName); return false; } diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMNotifToVESEventAssembly.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMNotifToVESEventAssembly.java index b8b5151fe..7a2cd43cf 100644 --- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMNotifToVESEventAssembly.java +++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMNotifToVESEventAssembly.java @@ -88,7 +88,7 @@ public class ORanDOMNotifToVESEventAssembly { Entry<String, String> pair = it.next(); buf.append("\n" + pair.getKey() + " = " + pair.getValue()); } - log.info("Resultlist({}):{}", xPathFields.size(), buf.toString()); + log.debug("Resultlist({}):{}", xPathFields.size(), buf.toString()); ArrayList<HashMap<String, Object>> arrayOfNamedHashMap = new ArrayList<HashMap<String, Object>>(); HashMap<String, Object> namedHashMap = new HashMap<String, Object>(); diff --git a/sdnr/wt/mountpoint-state-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/impl/MountpointNodeStateListenerImpl.java b/sdnr/wt/mountpoint-state-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/impl/MountpointNodeStateListenerImpl.java index ea5232d59..1f8cee10d 100644 --- a/sdnr/wt/mountpoint-state-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/impl/MountpointNodeStateListenerImpl.java +++ b/sdnr/wt/mountpoint-state-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/impl/MountpointNodeStateListenerImpl.java @@ -49,7 +49,7 @@ public class MountpointNodeStateListenerImpl implements NetconfNodeStateListener public void onCreated(NodeId nNodeId, NetconfNode netconfNode) { Ipv4Address ipv4Address = netconfNode.getHost().getIpAddress().getIpv4Address(); Ipv6Address ipv6Address = netconfNode.getHost().getIpAddress().getIpv6Address(); - LOG.info("In onCreated of MountpointNodeStateListenerImpl - nNodeId = {}, IP Address = {}",nNodeId.getValue(), + LOG.debug("In onCreated of MountpointNodeStateListenerImpl - nNodeId = {}, IP Address = {}",nNodeId.getValue(), ipv4Address != null?ipv4Address.getValue():ipv6Address.getValue()); JSONObject obj = new JSONObject(); obj.put(Constants.NODEID, nNodeId.getValue()); @@ -63,7 +63,7 @@ public class MountpointNodeStateListenerImpl implements NetconfNodeStateListener public void onStateChange(NodeId nNodeId, NetconfNode netconfNode) { Ipv4Address ipv4Address = netconfNode.getHost().getIpAddress().getIpv4Address(); Ipv6Address ipv6Address = netconfNode.getHost().getIpAddress().getIpv6Address(); - LOG.info("In onStateChange of MountpointNodeStateListenerImpl - nNodeId = {}, IP Address = {}",nNodeId.getValue(), + LOG.debug("In onStateChange of MountpointNodeStateListenerImpl - nNodeId = {}, IP Address = {}",nNodeId.getValue(), ipv4Address != null?ipv4Address.getValue():ipv6Address.getValue()); JSONObject obj = new JSONObject(); obj.put(Constants.NODEID, nNodeId.getValue()); @@ -76,7 +76,7 @@ public class MountpointNodeStateListenerImpl implements NetconfNodeStateListener @Override public void onRemoved(NodeId nNodeId) { - LOG.info("In onRemoved of MountpointNodeStateListenerImpl - nNodeId = {}",nNodeId); + LOG.debug("In onRemoved of MountpointNodeStateListenerImpl - nNodeId = {}",nNodeId); JSONObject obj = new JSONObject(); obj.put(Constants.NODEID, nNodeId.getValue()); obj.put(Constants.NETCONFNODESTATE, "Removed"); diff --git a/sdnr/wt/mountpoint-state-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/impl/MountpointStateVESMessageFormatter.java b/sdnr/wt/mountpoint-state-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/impl/MountpointStateVESMessageFormatter.java index 01a8d49ff..ad5198f2f 100644 --- a/sdnr/wt/mountpoint-state-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/impl/MountpointStateVESMessageFormatter.java +++ b/sdnr/wt/mountpoint-state-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointstateprovider/impl/MountpointStateVESMessageFormatter.java @@ -66,7 +66,7 @@ public class MountpointStateVESMessageFormatter { VESMessage vesMsg = null; try { vesMsg = vesCollectorService.generateVESEvent(vesCommonEventHeader, vesNotificationFields); - LOG.info("VES Message is - {}", vesMsg.getMessage()); + LOG.debug("VES Message is - {}", vesMsg.getMessage()); } catch (JsonProcessingException e) { LOG.error("Exception while generating VES Event - ", e); } diff --git a/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/Capabilities.java b/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/Capabilities.java index 82232b2d5..a05ae46cf 100644 --- a/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/Capabilities.java +++ b/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/Capabilities.java @@ -55,7 +55,7 @@ public class Capabilities { private Capabilities() {} public static Capabilities getAvailableCapabilities(@Nullable NetconfNode nnode) { - LOG.info("GetAvailableCapabilities for node"); + LOG.debug("GetAvailableCapabilities for node"); Capabilities capabilities = new Capabilities(); if (nnode != null) { AvailableCapabilities availableCapabilites = nnode.getAvailableCapabilities(); @@ -71,7 +71,7 @@ public class Capabilities { } public static Capabilities getUnavailableCapabilities(NetconfNode nnode) { - LOG.info("GetUnavailableCapabilities for node"); + LOG.debug("GetUnavailableCapabilities for node"); Capabilities capabilities = new Capabilities(); if (nnode != null) { UnavailableCapabilities availableCapabilites = nnode.getUnavailableCapabilities(); @@ -204,7 +204,7 @@ public class Capabilities { if (revisionObject instanceof Optional) { if (((Optional<?>) revisionObject).isPresent()) { revisionObject = ((Optional<?>) revisionObject).get(); - LOG.info("Unwrapp Optional: {}", revisionObject != null ? revisionObject.getClass() : null); + LOG.debug("Unwrapp Optional: {}", revisionObject != null ? revisionObject.getClass() : null); } } if (revisionObject == null) { diff --git a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/NetconfNodeStateServiceImpl.java b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/NetconfNodeStateServiceImpl.java index 988dbd257..1b1676c42 100644 --- a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/NetconfNodeStateServiceImpl.java +++ b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/NetconfNodeStateServiceImpl.java @@ -306,7 +306,7 @@ public class NetconfNodeStateServiceImpl @Override public <L extends NetconfNodeConnectListener> @NonNull ListenerRegistration<L> registerNetconfNodeConnectListener( final @NonNull L netconfNodeConnectListener) { - LOG.info("Register connect listener {}", netconfNodeConnectListener.getClass().getName()); + LOG.debug("Register connect listener {}", netconfNodeConnectListener.getClass().getName()); netconfNodeConnectListenerList.add(netconfNodeConnectListener); return new ListenerRegistration<L>() { @@ -317,7 +317,7 @@ public class NetconfNodeStateServiceImpl @Override public void close() { - LOG.info("Remove connect listener {}", netconfNodeConnectListener); + LOG.debug("Remove connect listener {}", netconfNodeConnectListener); netconfNodeConnectListenerList.remove(netconfNodeConnectListener); } }; @@ -326,7 +326,7 @@ public class NetconfNodeStateServiceImpl @Override public <L extends NetconfNodeStateListener> @NonNull ListenerRegistration<L> registerNetconfNodeStateListener( @NonNull L netconfNodeStateListener) { - LOG.info("Register state listener {}", netconfNodeStateListener.getClass().getName()); + LOG.debug("Register state listener {}", netconfNodeStateListener.getClass().getName()); netconfNodeStateListenerList.add(netconfNodeStateListener); return new ListenerRegistration<L>() { @@ -337,7 +337,7 @@ public class NetconfNodeStateServiceImpl @Override public void close() { - LOG.info("Remove state listener {}", netconfNodeStateListener); + LOG.debug("Remove state listener {}", netconfNodeStateListener); netconfNodeStateListenerList.remove(netconfNodeStateListener); } }; @@ -346,7 +346,7 @@ public class NetconfNodeStateServiceImpl @Override public <L extends VesNotificationListener> @NonNull ListenerRegistration<L> registerVesNotifications( @NonNull L vesNotificationListener) { - LOG.info("Register Ves notification listener {}", vesNotificationListener.getClass().getName()); + LOG.debug("Register Ves notification listener {}", vesNotificationListener.getClass().getName()); vesNotificationListenerList.add(vesNotificationListener); return new ListenerRegistration<L>() { @@ -357,7 +357,7 @@ public class NetconfNodeStateServiceImpl @Override public void close() { - LOG.info("Remove Ves notification listener {}", vesNotificationListener); + LOG.debug("Remove Ves notification listener {}", vesNotificationListener); vesNotificationListenerList.remove(vesNotificationListener); } }; @@ -412,7 +412,7 @@ public class NetconfNodeStateServiceImpl private void enterConnectedState(NodeId nNodeId, NetconfNode netconfNode) { String mountPointNodeName = nNodeId.getValue(); - LOG.info("Access connected state for mountpoint {}", mountPointNodeName); + LOG.debug("Access connected state for mountpoint {}", mountPointNodeName); boolean preConditionMissing = false; if (mountPointService == null) { @@ -428,7 +428,7 @@ public class NetconfNodeStateServiceImpl } boolean isNetconfNodeMaster = isNetconfNodeMaster(netconfNode); - LOG.info("isNetconfNodeMaster indication {} for mountpoint {}", isNetconfNodeMaster, mountPointNodeName); + LOG.debug("isNetconfNodeMaster indication {} for mountpoint {}", isNetconfNodeMaster, mountPointNodeName); if (isNetconfNodeMaster) { NetconfAccessor acessor = accessorManager.getAccessor(nNodeId, netconfNode); /* @@ -439,11 +439,11 @@ public class NetconfNodeStateServiceImpl try { item.onEnterConnected(acessor); } catch (Exception e) { - LOG.info("Exception during onEnterConnected listener call", e); + LOG.debug("Exception during onEnterConnected listener call", e); } }); - LOG.info("Connect indication forwarded for {}", mountPointNodeName); + LOG.debug("Connect indication forwarded for {}", mountPointNodeName); } } @@ -456,7 +456,7 @@ public class NetconfNodeStateServiceImpl */ private void leaveConnectedState(NodeId nNodeId, Optional<NetconfNode> optionalNetconfNode) { String mountPointNodeName = nNodeId.getValue(); - LOG.info("leaveConnectedState id {}", mountPointNodeName); + LOG.debug("leaveConnectedState id {}", mountPointNodeName); if (this.accessorManager.containes(nNodeId)) { netconfNodeConnectListenerList.forEach(item -> { @@ -467,13 +467,13 @@ public class NetconfNodeStateServiceImpl LOG.warn("Unexpeced null item during onleave"); } } catch (Exception e) { - LOG.info("Exception during onLeaveConnected listener call", e); + LOG.debug("Exception during onLeaveConnected listener call", e); } }); - LOG.info("Remove Master mountpoint {}", mountPointNodeName); + LOG.debug("Remove Master mountpoint {}", mountPointNodeName); this.accessorManager.removeAccessor(nNodeId); } else { - LOG.info("Master mountpoint already removed {}", mountPointNodeName); + LOG.debug("Master mountpoint already removed {}", mountPointNodeName); } } @@ -495,7 +495,7 @@ public class NetconfNodeStateServiceImpl connectedBefore = false; created = true; } - LOG.info("L1 NETCONF id:{} t:{} created {} before:{} after:{} akkaIsCluster:{} cl stat:{}", nodeId, + LOG.debug("L1 NETCONF id:{} t:{} created {} before:{} after:{} akkaIsCluster:{} cl stat:{}", nodeId, modificationTyp, created, connectedBefore, connectedAfter, isCluster, getClusteredConnectionStatus(nNodeAfter)); switch (modificationTyp) { @@ -589,10 +589,10 @@ public class NetconfNodeStateServiceImpl } } } catch (NullPointerException | IllegalStateException e) { - LOG.info("Data not available at ", e); + LOG.debug("Data not available at ", e); } } //for - LOG.info("datatreechanged handler completed"); + LOG.debug("datatreechanged handler completed"); } // ---- subclasses for listeners @@ -603,10 +603,10 @@ public class NetconfNodeStateServiceImpl private class L1 implements ClusteredDataTreeChangeListener<Node> { @Override public void onDataTreeChanged(@NonNull Collection<DataTreeModification<Node>> changes) { - LOG.info("L1 TreeChange enter changes:{}", changes.size()); + LOG.debug("L1 TreeChange enter changes:{}", changes.size()); //Debug AkkTimeout NetconfNodeStateServiceImpl.this.pool.execute(new Thread( () -> onDataTreeChangedHandler(changes))); onDataTreeChangedHandler(changes); - LOG.info("L1 TreeChange leave"); + LOG.debug("L1 TreeChange leave"); } } @@ -617,9 +617,9 @@ public class NetconfNodeStateServiceImpl @Override public void onDataTreeChanged(@NonNull Collection<DataTreeModification<Node>> changes) { - LOG.info("L2 TreeChange enter changes:{}", changes.size()); + LOG.debug("L2 TreeChange enter changes:{}", changes.size()); // Do nothing - LOG.info("L2 TreeChange leave"); + LOG.debug("L2 TreeChange leave"); } } diff --git a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/NetconfCommunicatorManager.java b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/NetconfCommunicatorManager.java index 30afb4a20..c903d3cb3 100644 --- a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/NetconfCommunicatorManager.java +++ b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/NetconfCommunicatorManager.java @@ -84,14 +84,14 @@ public class NetconfCommunicatorManager { } else { final MountPoint mountPoint = optionalMountPoint.get(); - LOG.info("Mountpoint with id: {} class:{}", mountPoint.getIdentifier(), mountPoint.getClass().getName()); + LOG.debug("Mountpoint with id: {} class:{}", mountPoint.getIdentifier(), mountPoint.getClass().getName()); Optional<DataBroker> optionalNetconfNodeDatabroker = mountPoint.getService(DataBroker.class); if (!optionalNetconfNodeDatabroker.isPresent()) { - LOG.info("Slave mountpoint {} without databroker", mountPointNodeName); + LOG.debug("Slave mountpoint {} without databroker", mountPointNodeName); } else { - LOG.info("Master mountpoint {}", mountPointNodeName); + LOG.debug("Master mountpoint {}", mountPointNodeName); return Optional.of( new NetconfBindingAccessorImpl(accessor, optionalNetconfNodeDatabroker.get(), mountPoint)); } diff --git a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/binding/NetconfBindingAccessorImpl.java b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/binding/NetconfBindingAccessorImpl.java index b36e47621..780641942 100644 --- a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/binding/NetconfBindingAccessorImpl.java +++ b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/binding/NetconfBindingAccessorImpl.java @@ -98,13 +98,13 @@ public class NetconfBindingAccessorImpl extends NetconfAccessorImpl implements N @Override public @NonNull <T extends NotificationListener> ListenerRegistration<NotificationListener> doRegisterNotificationListener( @NonNull T listener) { - log.info("Begin register listener for Mountpoint {}", mountpoint.getIdentifier().toString()); + log.debug("Begin register listener for Mountpoint {}", mountpoint.getIdentifier().toString()); final Optional<NotificationService> optionalNotificationService = mountpoint.getService(NotificationService.class); final NotificationService notificationService = optionalNotificationService.get(); final ListenerRegistration<NotificationListener> ranListenerRegistration = notificationService.registerNotificationListener(listener); - log.info("End registration listener for Mountpoint {} Listener: {} Result: {}", + log.debug("End registration listener for Mountpoint {} Listener: {} Result: {}", mountpoint.getIdentifier().toString(), optionalNotificationService, ranListenerRegistration); return ranListenerRegistration; } @@ -116,7 +116,7 @@ public class NetconfBindingAccessorImpl extends NetconfAccessorImpl implements N if (streamName != null) { createSubscriptionInputBuilder.setStream(new StreamNameType(streamName)); } - log.info("Event listener triggering notification stream '{}' for node {}", streamName, getNodeId()); + log.debug("Event listener triggering notification stream '{}' for node {}", streamName, getNodeId()); return mountpointNotificationService.createSubscription(createSubscriptionInputBuilder.build()); } @@ -132,7 +132,7 @@ public class NetconfBindingAccessorImpl extends NetconfAccessorImpl implements N StreamNameType streamName = stream.getName(); if (streamName != null) { String streamNameValue = stream.getName().getValue(); - log.info("Stream Name = {}, Stream Description = {}", streamNameValue, stream.getDescription()); + log.debug("Stream Name = {}, Stream Description = {}", streamNameValue, stream.getDescription()); if (!(streamNameValue.equals(DefaultNotificationsStream))) // Register any not default stream. Default stream is already registered registerNotificationsStream(streamNameValue); diff --git a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/dom/NetconfDomAccessorImpl.java b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/dom/NetconfDomAccessorImpl.java index 1b263115f..00f743d33 100644 --- a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/dom/NetconfDomAccessorImpl.java +++ b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/dom/NetconfDomAccessorImpl.java @@ -143,6 +143,9 @@ public class NetconfDomAccessorImpl extends NetconfAccessorImpl implements Netco } catch (ExecutionException | TimeoutException e) { LOG.debug("Incomplete read to node transaction {} {}", dataStoreType, path, e); return Optional.empty(); + } catch (IllegalArgumentException e) { + LOG.debug("IllegalArgumentException occurred, Incomplete read to node transaction {} {}", dataStoreType, path, e); + return Optional.empty(); } } @@ -199,12 +202,12 @@ public class NetconfDomAccessorImpl extends NetconfAccessorImpl implements Netco @Override public @NonNull <T extends DOMNotificationListener> ListenerRegistration<DOMNotificationListener> doRegisterNotificationListener( @NonNull T listener, Collection<Absolute> types) { - LOG.info("Begin register listener for Mountpoint {}", mountpoint.getIdentifier().toString()); + LOG.debug("Begin register listener for Mountpoint {}", mountpoint.getIdentifier().toString()); final ListenerRegistration<DOMNotificationListener> ranListenerRegistration = notificationService.registerNotificationListener(listener, types); - LOG.info("End registration listener for Mountpoint {} Listener: {} Result: {}", + LOG.debug("End registration listener for Mountpoint {} Listener: {} Result: {}", mountpoint.getIdentifier().toString(), notificationService, ranListenerRegistration); return ranListenerRegistration; |