import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
-import org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
+import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType;
+import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
+import org.opendaylight.mdsal.binding.api.DataTreeModification;
import org.opendaylight.transportpce.common.StringConstants;
import org.opendaylight.transportpce.inventory.DeviceInventory;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * This class implements the {@link DataTreeChangeListener} on a {@link Node}. This listener should
- * be registered on a netconf topology node.
- *
+ * This class implements the {@link DataTreeChangeListener} on a {@link Node}.
+ * This listener should be registered on a netconf topology node.
*/
public class DeviceListener implements DataTreeChangeListener<Node> {
@Override
public void onDataTreeChanged(Collection<DataTreeModification<Node>> changes) {
+ //LOG.debug("testing np1: {}", changes.toString());
+ String openROADMversion = "";
List<DataTreeModification<Node>> changesWithoutDefaultNetconfNode = getRealDevicesOnly(changes);
for (DataTreeModification<Node> device : changesWithoutDefaultNetconfNode) {
- String nodeId = device.getRootNode().getDataAfter().getKey().getNodeId().getValue();
- NetconfNode netconfNode = device.getRootNode().getDataAfter().getAugmentation(NetconfNode.class);
- if (isCreate(device) || isUpdate(device)) {
- LOG.info("Node {} was modified", nodeId);
+ String nodeId = device.getRootNode().getDataAfter().key().getNodeId().getValue();
+ NetconfNode netconfNode = device.getRootNode().getDataAfter().augmentation(NetconfNode.class);
+ ConnectionStatus connectionStatus = netconfNode.getConnectionStatus();
+ long count = netconfNode.getAvailableCapabilities().getAvailableCapability().stream()
+ .filter(cp -> cp.getCapability().contains(StringConstants.OPENROADM_DEVICE_MODEL_NAME))
+ .count();
+ LOG.debug("DL Modification Type {}", device.getRootNode().getModificationType().toString());
+ LOG.debug("DL Capability Count {}", count);
+ LOG.debug("DL Connection Status {}", connectionStatus);
+ LOG.debug("DL device.getRootNode().getDataBefore() {}", device.getRootNode().getDataBefore());
+ LOG.debug("DL device.getRootNode().getDataAfter() {}", device.getRootNode().getDataAfter());
+
+ if (isCreate(device)) {
+ LOG.info("Node {} was created", nodeId);
try {
- processModifiedSubtree(nodeId, netconfNode);
+ processModifiedSubtree(nodeId, netconfNode, openROADMversion);
} catch (InterruptedException | ExecutionException e) {
- LOG.error(e.getMessage(), e);
+ LOG.error("something wrong when creating node {}", nodeId, e);
}
} else if (isDelete(device)) {
LOG.info("Node {} was deleted", nodeId);
}
/**
- * Handles the {@link ModificationType#SUBTREE_MODIFIED} case. If the changed node has
- * {@link StringConstants.OPENROADM_DEVICE_MODEL_NAME} capabilities it may be persisted.
+ * Handles the {@link ModificationType#SUBTREE_MODIFIED} case.
+ * If the changed node has.
*
- * @param nodeId device id
+ * @param nodeId device id
* @param netconfNode netconf node
* @throws InterruptedException may be thrown if there is a problem getting the device from
- * datastore
- * @throws ExecutionException may be thrown if there is a problem getting the device from datastore
+ * datastore
+ * @throws ExecutionException may be thrown if there is a problem getting the device from datastore
*/
- private void processModifiedSubtree(String nodeId, NetconfNode netconfNode)
+ private void processModifiedSubtree(String nodeId, NetconfNode netconfNode, String openROADMversion)
throws InterruptedException, ExecutionException {
- NetconfNodeConnectionStatus.ConnectionStatus connectionStatus = netconfNode.getConnectionStatus();
+ ConnectionStatus connectionStatus = netconfNode.getConnectionStatus();
+
long count = netconfNode.getAvailableCapabilities().getAvailableCapability().stream()
- .filter(cp -> cp.getCapability().contains(StringConstants.OPENROADM_DEVICE_MODEL_NAME)).count();
+ .filter(cp -> cp.getCapability().contains(StringConstants.OPENROADM_DEVICE_MODEL_NAME))
+ .count();
+
if (count < 1) {
LOG.info("No {} capable device was found", StringConstants.OPENROADM_DEVICE_MODEL_NAME);
return;
}
if (ConnectionStatus.Connected.equals(connectionStatus)) {
- deviceInventory.initializeDevice(nodeId);
+ LOG.info("DL The device is in {} state", connectionStatus);
+ deviceInventory.initializeDevice(nodeId, openROADMversion);
} else if (ConnectionStatus.Connecting.equals(connectionStatus)
|| ConnectionStatus.UnableToConnect.equals(connectionStatus)) {
- LOG.info("The device is in {} state", connectionStatus);
+ LOG.info("DL The device is in {} state", connectionStatus);
} else {
- LOG.warn("Invalid connection status {}", connectionStatus);
+ LOG.warn("DL Invalid connection status {}", connectionStatus);
}
+
}
/**
- * Filters the {@link StringConstants#DEFAULT_NETCONF_NODEID} nodes from the provided
- * {@link Collection}.
+ * Filters the {@link StringConstants#DEFAULT_NETCONF_NODEID} nodes from the provided {@link Collection}.
*
- * @param changes a change
- * @return {@code List<DataTreeModification<Node>>} a list of modifcations
*/
private static List<DataTreeModification<Node>> getRealDevicesOnly(Collection<DataTreeModification<Node>> changes) {
return changes.stream()
.filter(change -> (change.getRootNode().getDataAfter() != null
&& !StringConstants.DEFAULT_NETCONF_NODEID
- .equalsIgnoreCase(change.getRootNode().getDataAfter().getKey().getNodeId().getValue())
- && change.getRootNode().getDataAfter().getAugmentation(NetconfNode.class) != null)
+ .equalsIgnoreCase(change.getRootNode().getDataAfter().key().getNodeId().getValue())
+ && change.getRootNode().getDataAfter().augmentation(NetconfNode.class) != null)
|| (change.getRootNode().getDataBefore() != null
- && !StringConstants.DEFAULT_NETCONF_NODEID.equalsIgnoreCase(
- change.getRootNode().getDataBefore().getKey().getNodeId().getValue())
- && change.getRootNode().getDataBefore().getAugmentation(NetconfNode.class) != null
+ && !StringConstants.DEFAULT_NETCONF_NODEID.equalsIgnoreCase(
+ change.getRootNode().getDataBefore().key().getNodeId().getValue())
+ && change.getRootNode().getDataBefore().augmentation(NetconfNode.class) != null
- )).collect(Collectors.toList());
+ )).collect(Collectors.toList());
}
/**
* In the filtered collection checks if the change is a new write.
*
- * @param change the change
- * @return boolean true if the change is a new write
*/
private static boolean isCreate(DataTreeModification<Node> change) {
- return change.getRootNode().getDataBefore() == null && change.getRootNode().getDataAfter() != null
- && ModificationType.WRITE.equals(change.getRootNode().getModificationType());
- }
-
- /**
- * In the filtered collection checks if the modification is update.
- *
- * @param change the change
- * @return boolean true if the modification is update
- */
- private static boolean isUpdate(DataTreeModification<Node> change) {
- return ModificationType.SUBTREE_MODIFIED.equals(change.getRootNode().getModificationType());
+ return change.getRootNode().getModificationType().toString().equalsIgnoreCase("WRITE");
}
/**
* In the filtered collection checks if the node was deleted.
*
- * @param change the change
- * @return boolean true if the node was deleted
*/
private static boolean isDelete(DataTreeModification<Node> change) {
return change.getRootNode().getDataBefore() != null && change.getRootNode().getDataAfter() == null
&& ModificationType.DELETE.equals(change.getRootNode().getModificationType());
}
-}
+}
\ No newline at end of file
Code Review / transportpce.git / blobdiff