summaryrefslogtreecommitdiffstats
path: root/sdnr/wt/netconfnode-state-service
diff options
context:
space:
mode:
Diffstat (limited to 'sdnr/wt/netconfnode-state-service')
-rw-r--r--sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/Capabilities.java6
-rw-r--r--sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/NetconfNodeStateServiceImpl.java42
-rw-r--r--sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/NetconfCommunicatorManager.java6
-rw-r--r--sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/binding/NetconfBindingAccessorImpl.java8
-rw-r--r--sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/dom/NetconfDomAccessorImpl.java7
5 files changed, 36 insertions, 33 deletions
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;