-
- PceOpticalNode pceNode = new PceOpticalNode(node, nodeType, node.getNodeId(),
- input.getServiceAEnd().getServiceFormat(), "optical");
- pceNode.validateAZxponder(anodeId, znodeId);
+ String deviceNodeId = MapUtils.getSupNetworkNode(node);
+ // Should never happen but because of existing topology test files
+ // we have to manage this case
+ if (deviceNodeId == null || deviceNodeId.isBlank()) {
+ deviceNodeId = node.getNodeId().getValue();
+ }
+ LOG.info("Device node id {} for {}", deviceNodeId, node);
+ PceOpticalNode pceNode = new PceOpticalNode(node, nodeType, mappingUtils.getOpenRoadmVersion(deviceNodeId));
+ pceNode.validateAZxponder(anodeId, znodeId, input.getServiceAEnd().getServiceFormat());