X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fcommon%2Fmapping%2FPortMappingVersion221.java;h=e6380d09ea3d1609805dd160bb4d3b3a44e82e95;hb=0a65ef7de52296febed7af886b01cabfa51f1acf;hp=591e1b25aab7bfef620eb8baf7ccb4437bc4c55d;hpb=a0c703ac04217369edcc80c55d2fafd1a0efefe4;p=transportpce.git diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java index 591e1b25a..e6380d09e 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java @@ -9,12 +9,13 @@ package org.opendaylight.transportpce.common.mapping; import com.google.common.util.concurrent.FluentFuture; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Map.Entry; import java.util.Optional; @@ -30,24 +31,30 @@ import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.NetworkBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.NodesBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.NodesKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.CpToDegree; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.CpToDegreeBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.CpToDegreeKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.MappingBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.MappingKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.NodeInfo; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.NodeInfo.OpenroadmVersion; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.NodeInfoBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.SwitchingPoolLcp; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.SwitchingPoolLcpBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.switching.pool.lcp.NonBlockingList; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.switching.pool.lcp.NonBlockingListBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.NetworkBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.NodesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.CpToDegree; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.CpToDegreeBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.CpToDegreeKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.McCapabilities; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.McCapabilitiesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.McCapabilitiesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.NodeInfo; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.NodeInfo.OpenroadmVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.NodeInfoBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.SwitchingPoolLcp; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.SwitchingPoolLcpBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.SwitchingPoolLcpKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.switching.pool.lcp.NonBlockingList; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.switching.pool.lcp.NonBlockingListBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.switching.pool.lcp.NonBlockingListKey; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.optical.channel.types.rev200529.FrequencyGHz; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.Direction; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.PortQual; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.XpdrNodeTypes; @@ -69,9 +76,11 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.open import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.SharedRiskGroup; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.SharedRiskGroupKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.Xponder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.connection.map.Destination; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.odu.switching.pools.non.blocking.list.PortList; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.port.Interfaces; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.xponder.XpdrPort; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.NodeTypes; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev170626.InterfaceType; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev170626.OpenROADMOpticalMultiplex; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev170626.OpticalTransport; @@ -79,10 +88,16 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev170626.OtnO import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019.Protocols1; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019.lldp.container.Lldp; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019.lldp.container.lldp.PortConfig; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181019.SupportedIfCapability; +import org.opendaylight.yang.gen.v1.http.org.openroadm.switching.pool.types.rev191129.SwitchingPoolTypes; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.common.Uint16; +import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +// FIXME: many common pieces of code between PortMapping Versions 121 and 221 and 710 +// some mutualization would be helpful public class PortMappingVersion221 { private static final Logger LOG = LoggerFactory.getLogger(PortMappingVersion221.class); @@ -100,23 +115,21 @@ public class PortMappingVersion221 { public boolean createMappingData(String nodeId) { LOG.info("Create Mapping Data for node 2.2.1 {}", nodeId); List portMapList = new ArrayList<>(); + List mcCapabilitiesList = new ArrayList<>(); InstanceIdentifier infoIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child(Info.class); - Optional deviceInfoOptional = this.deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType - .OPERATIONAL, infoIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - Info deviceInfo; - NodeInfo nodeInfo; - if (deviceInfoOptional.isPresent()) { - deviceInfo = deviceInfoOptional.get(); - nodeInfo = createNodeInfo(deviceInfo); - if (nodeInfo == null) { - return false; - } else { - postPortMapping(nodeId, nodeInfo, null, null, null); - } - } else { + Optional deviceInfoOptional = this.deviceTransactionManager.getDataFromDevice( + nodeId, LogicalDatastoreType.OPERATIONAL, infoIID, + Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); + if (!deviceInfoOptional.isPresent()) { LOG.warn("Device info subtree is absent for {}", nodeId); return false; } + Info deviceInfo = deviceInfoOptional.get(); + NodeInfo nodeInfo = createNodeInfo(deviceInfo); + if (nodeInfo == null) { + return false; + } + postPortMapping(nodeId, nodeInfo, null, null, null, null); switch (deviceInfo.getNodeType()) { @@ -134,6 +147,12 @@ public class PortMappingVersion221 { LOG.warn("Unable to create mapping for PP's on node {}", nodeId); return false; } + // Get MC capabilities + if (!createMcCapabilitiesList(nodeId, deviceInfo, mcCapabilitiesList)) { + // return false if MC capabilites failed + LOG.warn("Unable to create MC capabilities on node {}", nodeId); + return false; + } break; case Xpdr: if (!createXpdrPortMapping(nodeId, portMapList)) { @@ -146,40 +165,39 @@ public class PortMappingVersion221 { break; } - return postPortMapping(nodeId, nodeInfo, portMapList, null, null); + return postPortMapping(nodeId, nodeInfo, portMapList, null, null, mcCapabilitiesList); } public boolean updateMapping(String nodeId, Mapping oldMapping) { InstanceIdentifier portIId = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(oldMapping.getSupportingCircuitPackName())) .child(Ports.class, new PortsKey(oldMapping.getSupportingPort())); - if ((oldMapping != null) && (nodeId != null)) { - try { - Optional portObject = deviceTransactionManager.getDataFromDevice(nodeId, - LogicalDatastoreType.OPERATIONAL, portIId, Timeouts.DEVICE_READ_TIMEOUT, - Timeouts.DEVICE_READ_TIMEOUT_UNIT); - if (portObject.isPresent()) { - Ports port = portObject.get(); - Mapping newMapping = createMappingObject(nodeId, port, oldMapping.getSupportingCircuitPackName(), - oldMapping.getLogicalConnectionPoint()); - LOG.info("Updating old mapping Data {} for {} of {} by new mapping data {}", oldMapping, - oldMapping.getLogicalConnectionPoint(), nodeId, newMapping); - final WriteTransaction writeTransaction = this.dataBroker.newWriteOnlyTransaction(); - InstanceIdentifier mapIID = InstanceIdentifier.create(Network.class) - .child(Nodes.class, new NodesKey(nodeId)) - .child(Mapping.class, new MappingKey(oldMapping.getLogicalConnectionPoint())); - writeTransaction.merge(LogicalDatastoreType.CONFIGURATION, mapIID, newMapping); - FluentFuture commit = writeTransaction.commit(); - commit.get(); - return true; - } - return false; - } catch (InterruptedException | ExecutionException e) { - LOG.error("Error updating Mapping {} for node {}", oldMapping.getLogicalConnectionPoint(), nodeId, e); + if ((oldMapping == null) || (nodeId == null)) { + LOG.error("Impossible to update mapping"); + return false; + } + try { + Optional portObject = deviceTransactionManager.getDataFromDevice(nodeId, + LogicalDatastoreType.OPERATIONAL, portIId, Timeouts.DEVICE_READ_TIMEOUT, + Timeouts.DEVICE_READ_TIMEOUT_UNIT); + if (!portObject.isPresent()) { return false; } - } else { - LOG.error("Impossible to update mapping"); + Ports port = portObject.get(); + Mapping newMapping = createMappingObject(nodeId, port, oldMapping.getSupportingCircuitPackName(), + oldMapping.getLogicalConnectionPoint()); + LOG.info("Updating old mapping Data {} for {} of {} by new mapping data {}", + oldMapping, oldMapping.getLogicalConnectionPoint(), nodeId, newMapping); + final WriteTransaction writeTransaction = this.dataBroker.newWriteOnlyTransaction(); + InstanceIdentifier mapIID = InstanceIdentifier.create(Network.class) + .child(Nodes.class, new NodesKey(nodeId)) + .child(Mapping.class, new MappingKey(oldMapping.getLogicalConnectionPoint())); + writeTransaction.merge(LogicalDatastoreType.CONFIGURATION, mapIID, newMapping); + FluentFuture commit = writeTransaction.commit(); + commit.get(); + return true; + } catch (InterruptedException | ExecutionException e) { + LOG.error("Error updating Mapping {} for node {}", oldMapping.getLogicalConnectionPoint(), nodeId, e); return false; } } @@ -190,37 +208,34 @@ public class PortMappingVersion221 { Optional deviceObject = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - OrgOpenroadmDevice device = null; - if (deviceObject.isPresent()) { - device = deviceObject.get(); - } else { + if (!deviceObject.isPresent()) { LOG.error("Impossible to get device configuration for node {}", nodeId); return false; } - // Variable to keep track of number of line ports - int line = 1; - // Variable to keep track of number of client ports - int client = 1; - Map lcpMap = new HashMap<>(); - Map mappingMap = new HashMap<>(); - - List circuitPackList = null; + OrgOpenroadmDevice device = deviceObject.get(); if (device.getCircuitPacks() == null) { LOG.warn("Circuit Packs are not present for {}", nodeId); return false; - } else { - circuitPackList = new ArrayList<>(deviceObject.get().getCircuitPacks()); - circuitPackList.sort(Comparator.comparing(CircuitPack::getCircuitPackName)); } + + Map lcpMap = new HashMap<>(); + Map mappingMap = new HashMap<>(); + List circuitPackList = new ArrayList<>(device.nonnullCircuitPacks().values()); + circuitPackList.sort(Comparator.comparing(CircuitPack::getCircuitPackName)); if (device.getXponder() == null) { LOG.warn("{} configuration does not contain a list of xponders", nodeId); + // Variables to keep track of number of line ports and client ports + int line = 1; + int client = 1; + // TODO the treatment here inside the 2 nested for-loop is very similar to the one + // when device.getXponder() != null. Some code mutualization must be considered. for (CircuitPacks cp : circuitPackList) { String circuitPackName = cp.getCircuitPackName(); if (cp.getPorts() == null) { LOG.warn("Ports were not found for circuit pack: {}", circuitPackName); continue; } - List portList = new ArrayList<>(cp.getPorts()); + List portList = new ArrayList<>(cp.nonnullPorts().values()); portList.sort(Comparator.comparing(Ports::getPortName)); for (Ports port : portList) { if (port.getPortQual() == null) { @@ -228,215 +243,282 @@ public class PortMappingVersion221 { circuitPackName); continue; } - if (PortQual.XpdrNetwork.getIntValue() == port.getPortQual().getIntValue() - && port.getPortDirection().getIntValue() == Direction.Bidirectional.getIntValue()) { - String lcp = "XPDR1-" + StringConstants.NETWORK_TOKEN + line; - lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp); - mappingMap.put(lcp, createXpdrMappingObject(nodeId, port, circuitPackName, lcp, null, null, - null, null)); - line++; - } else if (PortQual.XpdrNetwork.getIntValue() == port.getPortQual().getIntValue() - && port.getPortDirection().getIntValue() != Direction.Bidirectional.getIntValue() - && port.getPartnerPort() != null - && port.getPartnerPort().getCircuitPackName() != null - && port.getPartnerPort().getPortName() != null) { - if (lcpMap.containsKey(circuitPackName + '+' + port.getPortName())) { - continue; - } - String lcp1 = "XPDR1-" + StringConstants.NETWORK_TOKEN + line; - Optional cpOpt = circuitPackList.stream().filter(cP -> cP.getCircuitPackName() - .equals(port.getPartnerPort().getCircuitPackName())).findFirst(); - if (cpOpt.isPresent()) { - Optional poOpt = cpOpt.get().getPorts().stream().filter(p -> p.getPortName() - .equals(port.getPartnerPort().getPortName().toString())).findFirst(); - if (poOpt.isPresent()) { - Ports port2 = poOpt.get(); - if (checkPartnerPort(circuitPackName, port, port2)) { - String lcp2 = new StringBuilder("XPDR1-").append(StringConstants.NETWORK_TOKEN) - .append(line + 1).toString(); - if (!lcpMap.containsKey(lcp1) && !lcpMap.containsKey(lcp2)) { - lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp1); - lcpMap.put(cpOpt.get().getCircuitPackName() + '+' + port2.getPortName(), lcp2); - mappingMap.put(lcp1, createXpdrMappingObject(nodeId, port, circuitPackName, - lcp1, lcp2, null, null, null)); - mappingMap.put(lcp2, createXpdrMappingObject(nodeId, port2, cpOpt.get() - .getCircuitPackName(), lcp2, lcp1, null, null, null)); - } else { - LOG.warn("mapping already exists for {} or {}", lcp1, lcp2); - } - line += 2; - } else { - LOG.error("port {} on {} is not a correct partner port of {} on {}", - port2.getPortName(), cpOpt.get().getCircuitPackName(), port.getPortName(), - circuitPackName); - } - } else { + + switch (port.getPortQual()) { + + case XpdrClient: + String lcp0 = "XPDR1-" + StringConstants.CLIENT_TOKEN + client; + lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp0); + mappingMap.put(lcp0, + createXpdrMappingObject(nodeId, port, circuitPackName, lcp0, null, null, null, null)); + client++; + //continue; + break; + + case XpdrNetwork: + if (port.getPortDirection().getIntValue() == Direction.Bidirectional.getIntValue()) { + String lcp = "XPDR1-" + StringConstants.NETWORK_TOKEN + line; + lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp); + mappingMap.put(lcp, + createXpdrMappingObject(nodeId, port, circuitPackName, lcp, null, null, null, null) + ); + line++; + continue; + } + // TODO PortDirection treatment here is similar to the one in createPpPortMapping. + // Some code alignment must be considered. + + if (!checkPartnerPortNotNull(port)) { + LOG.warn("Error in the configuration of port {} of {} for {}", + port.getPortName(), circuitPackName, nodeId); + continue; + } + + if (lcpMap.containsKey(circuitPackName + '+' + port.getPortName())) { + continue; + } + Optional cpOpt = circuitPackList.stream() + .filter( + cP -> cP.getCircuitPackName().equals(port.getPartnerPort().getCircuitPackName())) + .findFirst(); + if (!cpOpt.isPresent()) { + LOG.error("Error fetching circuit-pack {} for {}", + port.getPartnerPort().getCircuitPackName(), nodeId); + continue; + } + Optional poOpt = cpOpt.get().nonnullPorts().values().stream() + .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName().toString())) + .findFirst(); + if (!poOpt.isPresent()) { LOG.error("Error fetching port {} on {} for {}", port.getPartnerPort().getPortName(), port.getPartnerPort().getCircuitPackName(), nodeId); + continue; } - } else { - LOG.error("Error fetching circuit-pack {} for {}", port.getPartnerPort() - .getCircuitPackName(), nodeId); - } - } else if (PortQual.XpdrClient.getIntValue() == port.getPortQual().getIntValue()) { - String lcp = "XPDR1-" + StringConstants.CLIENT_TOKEN + client; - lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp); - mappingMap.put(lcp, createXpdrMappingObject(nodeId, port, circuitPackName, lcp, null, null, - null, null)); - client++; - } else { - LOG.warn("Error in the configuration of port {} of {} for {}", port.getPortName(), - circuitPackName, - nodeId); + Ports port2 = poOpt.get(); + if (!checkPartnerPort(circuitPackName, port, port2)) { + LOG.error("port {} on {} is not a correct partner port of {} on {}", + port2.getPortName(), cpOpt.get().getCircuitPackName(), port.getPortName(), + circuitPackName); + continue; + } + String lcp1 = "XPDR1-" + StringConstants.NETWORK_TOKEN + line; + String lcp2 = new StringBuilder("XPDR1-") + .append(StringConstants.NETWORK_TOKEN) + .append(line + 1) + .toString(); + if (lcpMap.containsKey(lcp1) || lcpMap.containsKey(lcp2)) { + LOG.warn("mapping already exists for {} or {}", lcp1, lcp2); + line += 2; + continue; + } + lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp1); + lcpMap.put(cpOpt.get().getCircuitPackName() + '+' + port2.getPortName(), lcp2); + mappingMap.put(lcp1, + createXpdrMappingObject(nodeId, port, circuitPackName, + lcp1, lcp2, null, null, null)); + mappingMap.put(lcp2, + createXpdrMappingObject(nodeId, port2, cpOpt.get().getCircuitPackName(), + lcp2, lcp1, null, null, null)); + line += 2; + break; + + default: + LOG.warn( + "Error in the configuration of port {} of {} for {} - unsupported PortQual {}", + port.getPortName(), circuitPackName, nodeId, port.getPortQual().getIntValue()); } } } } else { LOG.info("{} configuration contains a list of xponders", nodeId); - for (Xponder xponder:deviceObject.get().getXponder()) { - line = 1; - client = 1; + for (Xponder xponder : deviceObject.get().nonnullXponder().values()) { + // Variables to keep track of number of line ports and client ports + int line = 1; + int client = 1; Integer xponderNb = xponder.getXpdrNumber().toJava(); XpdrNodeTypes xponderType = xponder.getXpdrType(); - for (XpdrPort xpdrPort : xponder.getXpdrPort()) { + for (XpdrPort xpdrPort : xponder.nonnullXpdrPort().values()) { String circuitPackName = xpdrPort.getCircuitPackName(); String portName = xpdrPort.getPortName().toString(); - Ports port = device.getCircuitPacks().stream().filter(cp -> cp.getCircuitPackName() - .equals(circuitPackName)).findFirst().get().getPorts().stream().filter(p -> p.getPortName() - .equals(portName)).findFirst().get(); + // If there xponder-subtree has missing circuit-packs or ports, + // This gives a null-pointer expection, + if (device.nonnullCircuitPacks().values().stream() + .filter(cp -> cp.getCircuitPackName().equals(circuitPackName)) + .findFirst().isEmpty()) { + LOG.warn("Circuit-pack {} is missing in the device - ignoring it in port-mapping", + circuitPackName); + continue; + } + if (device.nonnullCircuitPacks().values().stream() + .filter(cp -> cp.getCircuitPackName().equals(circuitPackName)) + .findFirst().get().nonnullPorts().values().stream() + .filter(p -> p.getPortName().equals(portName)) + .findFirst().isEmpty()) { + LOG.warn("Port {} associated with CP {} is missing in the device - ignoring it in port-mapping", + portName, circuitPackName); + continue; + } + Ports port = device.nonnullCircuitPacks().values().stream() + .filter(cp -> cp.getCircuitPackName().equals(circuitPackName)) + .findFirst().get().nonnullPorts().values().stream() + .filter(p -> p.getPortName().equals(portName)) + .findFirst().get(); if (port.getPortQual() == null) { - LOG.warn("PortQual was not found for port {} on circuit pack: {}", port.getPortName(), - circuitPackName); + LOG.warn("PortQual was not found for port {} on circuit pack: {}", + port.getPortName(), circuitPackName); continue; } - if ((PortQual.XpdrNetwork.getIntValue() == port.getPortQual().getIntValue() - || PortQual.SwitchNetwork.getIntValue() == port.getPortQual().getIntValue()) - && port.getPortDirection().getIntValue() == Direction.Bidirectional.getIntValue()) { - String lcp = "XPDR" + xponderNb + "-" + StringConstants.NETWORK_TOKEN + line; - lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp); - mappingMap.put(lcp, createXpdrMappingObject(nodeId, port, circuitPackName, lcp, null, null, - null, xponderType)); - line++; - } else if ((PortQual.XpdrNetwork.getIntValue() == port.getPortQual().getIntValue() - || PortQual.SwitchNetwork.getIntValue() == port.getPortQual().getIntValue()) - && port.getPortDirection().getIntValue() != Direction.Bidirectional.getIntValue() - && port.getPartnerPort() != null - && port.getPartnerPort().getCircuitPackName() != null - && port.getPartnerPort().getPortName() != null) { - if (lcpMap.containsKey(circuitPackName + '+' + port.getPortName())) { - continue; - } - String lcp1 = "XPDR" + xponderNb + "-" + StringConstants.NETWORK_TOKEN + line; - - Optional cpOpt = circuitPackList.stream().filter(cP -> cP.getCircuitPackName() - .equals(port.getPartnerPort().getCircuitPackName())).findFirst(); - if (cpOpt.isPresent()) { - Optional poOpt = cpOpt.get().getPorts().stream().filter(p -> p.getPortName().equals( - port.getPartnerPort().getPortName().toString())).findFirst(); - if (poOpt.isPresent()) { - Ports port2 = poOpt.get(); - if (checkPartnerPort(circuitPackName, port, port2)) { - String lcp2 = new StringBuilder("XPDR").append(xponderNb).append("-").append( - StringConstants.NETWORK_TOKEN).append(line + 1).toString(); - if (!lcpMap.containsKey(lcp1) && !lcpMap.containsKey(lcp2)) { - lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp1); - lcpMap.put(cpOpt.get().getCircuitPackName() + '+' + port2.getPortName(), lcp2); - mappingMap.put(lcp1, createXpdrMappingObject(nodeId, port, circuitPackName, - lcp1, lcp2, null, null, xponderType)); - mappingMap.put(lcp2, createXpdrMappingObject(nodeId, port2, cpOpt.get() - .getCircuitPackName(), lcp2, lcp1, null, null, xponderType)); - } else { - LOG.warn("mapping already exists for {} or {}", lcp1, lcp2); - } - line += 2; - } else { - LOG.error("port {} on {} is not a correct partner port of {} on {}", port2 - .getPortName(), cpOpt.get().getCircuitPackName(), port.getPortName(), - circuitPackName); - } - } else { + + switch (port.getPortQual()) { + + case XpdrClient: + case SwitchClient: + String lcp0 = "XPDR" + xponderNb + "-" + StringConstants.CLIENT_TOKEN + client; + lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp0); + mappingMap.put(lcp0, + createXpdrMappingObject(nodeId, port, circuitPackName, lcp0, null, null, null, null)); + client++; + //continue; + break; + + case XpdrNetwork: + case SwitchNetwork: + if (port.getPortDirection().getIntValue() == Direction.Bidirectional.getIntValue()) { + String lcp = "XPDR" + xponderNb + "-" + StringConstants.NETWORK_TOKEN + line; + lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp); + mappingMap.put(lcp, + createXpdrMappingObject(nodeId, port, circuitPackName, lcp, null, null, null, + xponderType)); + line++; + continue; + } + // TODO PortDirection treatment here is similar to the one in createPpPortMapping. + // Some code alignment must be considered. + + if (!checkPartnerPortNotNull(port)) { + LOG.warn("Error in the configuration of port {} of {} for {}", + port.getPortName(), circuitPackName, nodeId); + continue; + } + + if (lcpMap.containsKey(circuitPackName + '+' + port.getPortName())) { + continue; + } + + Optional cpOpt = circuitPackList.stream() + .filter( + cP -> cP.getCircuitPackName().equals(port.getPartnerPort().getCircuitPackName())) + .findFirst(); + if (!cpOpt.isPresent()) { + LOG.error("Error fetching circuit-pack {} for {}", + port.getPartnerPort().getCircuitPackName(), nodeId); + continue; + } + + Optional poOpt = cpOpt.get().nonnullPorts().values().stream() + .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName().toString())) + .findFirst(); + if (!poOpt.isPresent()) { LOG.error("Error fetching port {} on {} for {}", port.getPartnerPort().getPortName(), port.getPartnerPort().getCircuitPackName(), nodeId); + continue; } - } else { - LOG.error("Error fetching circuit-pack {} for {}", port.getPartnerPort() - .getCircuitPackName(), nodeId); - } - } else if (PortQual.XpdrClient.getIntValue() == port.getPortQual().getIntValue() - || PortQual.SwitchClient.getIntValue() == port.getPortQual().getIntValue()) { - String lcp = "XPDR" + xponderNb + "-" + StringConstants.CLIENT_TOKEN + client; - lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp); - mappingMap.put(lcp, createXpdrMappingObject(nodeId, port, circuitPackName, lcp, null, null, - null, null)); - client++; - } else { - LOG.warn("Error in the configuration of port {} of {} for {}", port.getPortName(), - circuitPackName, nodeId); + Ports port2 = poOpt.get(); + if (!checkPartnerPort(circuitPackName, port, port2)) { + LOG.error("port {} on {} is not a correct partner port of {} on {}", + port2.getPortName(), cpOpt.get().getCircuitPackName(), port.getPortName(), + circuitPackName); + continue; + } + String lcp1 = "XPDR" + xponderNb + "-" + StringConstants.NETWORK_TOKEN + line; + String lcp2 = new StringBuilder("XPDR") + .append(xponderNb) + .append("-") + .append(StringConstants.NETWORK_TOKEN) + .append(line + 1) + .toString(); + if (lcpMap.containsKey(lcp1) || lcpMap.containsKey(lcp2)) { + LOG.warn("mapping already exists for {} or {}", lcp1, lcp2); + line += 2; + continue; + } + lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp1); + lcpMap.put(cpOpt.get().getCircuitPackName() + '+' + port2.getPortName(), lcp2); + mappingMap.put(lcp1, + createXpdrMappingObject(nodeId, port, circuitPackName, + lcp1, lcp2, null, null, xponderType)); + mappingMap.put(lcp2, + createXpdrMappingObject(nodeId, port2, cpOpt.get().getCircuitPackName(), + lcp2, lcp1, null, null, xponderType)); + line += 2; + break; + + default: + LOG.warn( + "Error in the configuration of port {} of {} for {} - unsupported PortQual {}", + port.getPortName(), circuitPackName, nodeId, port.getPortQual().getIntValue()); } } } } - if (device.getConnectionMap() != null) { - List connectionMap = deviceObject.get().getConnectionMap(); - String slcp = null; - String dlcp = null; + if (device.getConnectionMap() == null) { + LOG.warn("No connection-map inside device configuration"); + } else { + Collection connectionMap = deviceObject.get().nonnullConnectionMap().values(); for (ConnectionMap cm : connectionMap) { String skey = cm.getSource().getCircuitPackName() + "+" + cm.getSource().getPortName(); - if (lcpMap.containsKey(skey)) { - slcp = lcpMap.get(skey); - } - String dkey = cm.getDestination().get(0).getCircuitPackName() + "+" - + cm.getDestination().get(0).getPortName(); - if (lcpMap.containsKey(dkey)) { - dlcp = lcpMap.get(dkey); - } - if (slcp != null) { - Mapping mapping = mappingMap.get(slcp); - mappingMap.remove(slcp); - portMapList.add(createXpdrMappingObject(nodeId, null, null, null, null, mapping, dlcp, null)); - } else { - LOG.error("Error in connection-map analysis"); + String slcp = lcpMap.containsKey(skey) ? lcpMap.get(skey) : null; + Destination destination0 = cm.nonnullDestination().values().iterator().next(); + String dkey = destination0.getCircuitPackName() + "+" + destination0.getPortName(); + if (slcp == null) { + LOG.error("Error in connection-map analysis for source {} and destination (circuitpack+port) {}", + skey, dkey); + continue; } + String dlcp = lcpMap.containsKey(dkey) ? lcpMap.get(dkey) : null; + Mapping mapping = mappingMap.get(slcp); + mappingMap.remove(slcp); + portMapList.add(createXpdrMappingObject(nodeId, null, null, null, null, mapping, dlcp, null)); } - } else { - LOG.warn("No connection-map inside device configuration"); } + if (device.getOduSwitchingPools() != null) { - List oduSwithcingPools = device.getOduSwitchingPools(); + Collection oduSwithcingPools = device.nonnullOduSwitchingPools().values(); List switchingPoolList = new ArrayList<>(); for (OduSwitchingPools odp : oduSwithcingPools) { - List nblList = new ArrayList<>(); + Map nbMap = new HashMap<>(); for (org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org - .openroadm.device.odu.switching.pools.NonBlockingList nbl : odp.getNonBlockingList()) { + .openroadm.device.odu.switching.pools.NonBlockingList nbl : odp.nonnullNonBlockingList().values()) { + if (nbl.getPortList() == null) { + continue; + } List lcpList = new ArrayList<>(); - if (nbl.getPortList() != null) { - for (PortList item : nbl.getPortList()) { - String key = item.getCircuitPackName() + "+" + item.getPortName(); - if (lcpMap.containsKey(key)) { - lcpList.add(lcpMap.get(key)); - } else { - LOG.error("error : port {} of {} is not associated to a logical connection point", - item.getPortName(), item.getCircuitPackName()); - } + for (PortList item : nbl.nonnullPortList().values()) { + String key = item.getCircuitPackName() + "+" + item.getPortName(); + if (!lcpMap.containsKey(key)) { + LOG.error("error : port {} of {} is not associated to a logical connection point", + item.getPortName(), item.getCircuitPackName()); + continue; } - NonBlockingList nonBlockingList = new NonBlockingListBuilder() - .setNblNumber(nbl.getNblNumber()) - .setInterconnectBandwidth(nbl.getInterconnectBandwidth()) - .setInterconnectBandwidthUnit(nbl.getInterconnectBandwidthUnit()) - .setLcpList(lcpList) - .build(); - nblList.add(nonBlockingList); + lcpList.add(lcpMap.get(key)); } + NonBlockingList nonBlockingList = new NonBlockingListBuilder() + .setNblNumber(nbl.getNblNumber()) + .setInterconnectBandwidth(nbl.getInterconnectBandwidth()) + .setInterconnectBandwidthUnit(nbl.getInterconnectBandwidthUnit()) + .setLcpList(lcpList) + .build(); + nbMap.put(nonBlockingList.key(), nonBlockingList); } SwitchingPoolLcp splBldr = new SwitchingPoolLcpBuilder() .setSwitchingPoolNumber(odp.getSwitchingPoolNumber()) - .setSwitchingPoolType(odp.getSwitchingPoolType()) - .setNonBlockingList(nblList) + .setSwitchingPoolType(SwitchingPoolTypes.forValue(odp.getSwitchingPoolType().getIntValue())) + .setNonBlockingList(nbMap) .build(); switchingPoolList.add(splBldr); } - postPortMapping(nodeId, null, null, null, switchingPoolList); + postPortMapping(nodeId, null, null, null, switchingPoolList, null); } if (!mappingMap.isEmpty()) { @@ -445,51 +527,55 @@ public class PortMappingVersion221 { return true; } + private boolean checkPartnerPortNotNull(Ports port) { + if (port.getPartnerPort() == null + || port.getPartnerPort().getCircuitPackName() == null + || port.getPartnerPort().getPortName() == null) { + return false; + } + return true; + } + + private boolean checkPartnerPortNoDir(String circuitPackName, Ports port1, Ports port2) { + if (!checkPartnerPortNotNull(port2) + || !port2.getPartnerPort().getCircuitPackName().equals(circuitPackName) + || !port2.getPartnerPort().getPortName().equals(port1.getPortName())) { + return false; + } + return true; + } + private boolean checkPartnerPort(String circuitPackName, Ports port1, Ports port2) { - if ((Direction.Rx.getIntValue() == port1.getPortDirection().getIntValue() - && Direction.Tx.getIntValue() == port2.getPortDirection().getIntValue() - && port2.getPartnerPort() != null - && port2.getPartnerPort().getCircuitPackName() != null - && port2.getPartnerPort().getPortName() != null - && port2.getPartnerPort().getCircuitPackName().equals(circuitPackName) - && port2.getPartnerPort().getPortName().equals(port1.getPortName())) - || - (Direction.Tx.getIntValue() == port1.getPortDirection().getIntValue() - && Direction.Rx.getIntValue() == port2.getPortDirection().getIntValue() - && port2.getPartnerPort() != null - && port2.getPartnerPort().getCircuitPackName() != null - && port2.getPartnerPort().getPortName() != null - && port2.getPartnerPort().getCircuitPackName().equals(circuitPackName) - && port2.getPartnerPort().getPortName().equals(port1.getPortName()))) { - return true; - } else { + if (!checkPartnerPortNoDir(circuitPackName, port1, port2) + || ((Direction.Rx.getIntValue() != port1.getPortDirection().getIntValue() + || Direction.Tx.getIntValue() != port2.getPortDirection().getIntValue()) + && + (Direction.Tx.getIntValue() != port1.getPortDirection().getIntValue() + || Direction.Rx.getIntValue() != port2.getPortDirection().getIntValue()))) { return false; } + return true; } + private HashMap> getSrgCps(String deviceId, Info ordmInfo) { + .CircuitPacks>> getSrgCps(String deviceId, Info ordmInfo) { HashMap> cpPerSrg = new HashMap<>(); - Integer maxSrg; // Get value for max Srg from info subtree, required for iteration // if not present assume to be 20 (temporary) - if (ordmInfo.getMaxSrgs() != null) { - maxSrg = ordmInfo.getMaxSrgs().toJava(); - } else { - maxSrg = 20; - } + Integer maxSrg = ordmInfo.getMaxSrgs() == null ? 20 : ordmInfo.getMaxSrgs().toJava(); for (int srgCounter = 1; srgCounter <= maxSrg; srgCounter++) { List srgCps = new ArrayList<>(); LOG.info("Getting Circuitpacks for Srg Number {}", srgCounter); InstanceIdentifier srgIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(SharedRiskGroup.class, new SharedRiskGroupKey(srgCounter)); + .child(SharedRiskGroup.class, new SharedRiskGroupKey(Uint16.valueOf(srgCounter))); Optional ordmSrgObject = this.deviceTransactionManager.getDataFromDevice(deviceId, LogicalDatastoreType.OPERATIONAL, srgIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); if (ordmSrgObject.isPresent()) { - srgCps.addAll(ordmSrgObject.get().getCircuitPacks()); + srgCps.addAll(ordmSrgObject.get().nonnullCircuitPacks().values()); cpPerSrg.put(ordmSrgObject.get().getSrgNumber().toJava(), srgCps); } } @@ -497,14 +583,12 @@ public class PortMappingVersion221 { return cpPerSrg; } - //last LOG info message in this method is too long - @SuppressWarnings("checkstyle:linelength") private boolean createPpPortMapping(String nodeId, Info deviceInfo, List portMapList) { // Creating mapping data for SRG's PP HashMap> srgCps = getSrgCps(nodeId, deviceInfo); - - for (Entry> srgCpEntry : srgCps.entrySet()) { + for (Entry> + srgCpEntry : srgCps.entrySet()) { List cpList = srgCps.get(srgCpEntry.getKey()); List keys = new ArrayList<>(); @@ -520,65 +604,89 @@ public class PortMappingVersion221 { LOG.warn("{} : Circuit pack {} not found or without ports.", nodeId, circuitPackName); continue; } - List portList = new ArrayList<>(circuitPackObject.get().getPorts()); + List portList = new ArrayList<>(circuitPackObject.get().nonnullPorts().values()); Collections.sort(portList, new SortPort221ByName()); int portIndex = 1; for (Ports port : portList) { String currentKey = circuitPackName + "-" + port.getPortName(); if (port.getPortQual() == null) { continue; - } else if (PortQual.RoadmExternal.getIntValue() == port.getPortQual().getIntValue() - && Direction.Bidirectional.getIntValue() == port.getPortDirection().getIntValue() - && !keys.contains(currentKey)) { - String logicalConnectionPoint = createLogicalConnectionPort(port, srgCpEntry.getKey(), portIndex); - LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId, circuitPackName, - port.getPortName(), logicalConnectionPoint); - portMapList.add(createMappingObject(nodeId, port, circuitPackName, logicalConnectionPoint)); - portIndex++; - keys.add(currentKey); - } else if (PortQual.RoadmExternal.getIntValue() == port.getPortQual().getIntValue() - && (Direction.Rx.getIntValue() == port.getPortDirection().getIntValue() - || Direction.Tx.getIntValue() == port.getPortDirection().getIntValue()) - && !keys.contains(currentKey) - && port.getPartnerPort() != null) { - String logicalConnectionPoint1 = createLogicalConnectionPort(port, srgCpEntry.getKey(), portIndex); - LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId, circuitPackName, - port.getPortName(), logicalConnectionPoint1); - InstanceIdentifier port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(CircuitPacks.class, new CircuitPacksKey(port.getPartnerPort().getCircuitPackName())) - .child(Ports.class, new PortsKey(port.getPartnerPort().getPortName().toString())); - Optional port2Object = this.deviceTransactionManager.getDataFromDevice(nodeId, - LogicalDatastoreType.OPERATIONAL, port2ID, - Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - if (port2Object.isPresent() - && port2Object.get().getPortQual().getIntValue() - == PortQual.RoadmExternal.getIntValue()) { + } + + if (PortQual.RoadmExternal.getIntValue() != port.getPortQual().getIntValue()) { + LOG.info("{} : port {} on {} is not roadm-external - cannot assign logicalConnectionPoint.", + nodeId, port.getPortName(), circuitPackName); + continue; + } + + if (keys.contains(currentKey)) { + LOG.info("{} : port {} on {} has already been handled - cannot assign logicalConnectionPoint.", + nodeId, port.getPortName(), circuitPackName); + continue; + } + + switch (port.getPortDirection()) { + + case Bidirectional: + String lcp = createLogicalConnectionPort(port, srgCpEntry.getKey(), portIndex); + LOG.info("{} : Logical Connection Point for {} {} is {}", + nodeId, circuitPackName, port.getPortName(), lcp); + portMapList.add(createMappingObject(nodeId, port, circuitPackName, lcp)); + portIndex++; + keys.add(currentKey); + break; + + case Rx: + case Tx: + if (!checkPartnerPortNotNull(port)) { + LOG.info("{} : port {} on {} is unidirectional but has no valid partnerPort" + + " - cannot assign logicalConnectionPoint.", + nodeId, port.getPortName(), circuitPackName); + continue; + } + + String lcp1 = createLogicalConnectionPort(port, srgCpEntry.getKey(), portIndex); + LOG.info("{} : Logical Connection Point for {} {} is {}", + nodeId, circuitPackName, port.getPortName(), lcp1); + InstanceIdentifier port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + .child(CircuitPacks.class, + new CircuitPacksKey(port.getPartnerPort().getCircuitPackName())) + .child(Ports.class, new PortsKey(port.getPartnerPort().getPortName().toString())); + Optional port2Object = this.deviceTransactionManager + .getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, port2ID, + Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); + if (!port2Object.isPresent() + || port2Object.get().getPortQual().getIntValue() + != PortQual.RoadmExternal.getIntValue()) { + LOG.error("error getting partner port {} of {} - {}", + port.getPartnerPort().getPortName().toString(), + port.getPartnerPort().getCircuitPackName(), nodeId); + continue; + } + Ports port2 = port2Object.get(); - if (checkPartnerPort(circuitPackName, port, port2)) { - String logicalConnectionPoint2 = createLogicalConnectionPort(port2, srgCpEntry.getKey(), portIndex); - LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId, circuitPackName, - port2.getPortName(), logicalConnectionPoint2); - portMapList.add(createMappingObject(nodeId, port, circuitPackName, - logicalConnectionPoint1)); - portMapList.add(createMappingObject(nodeId,port2, - port.getPartnerPort().getCircuitPackName(), logicalConnectionPoint2)); - portIndex++; - keys.add(currentKey); - keys.add(port.getPartnerPort().getCircuitPackName() + "-" + port2.getPortName()); - } else { + if (!checkPartnerPort(circuitPackName, port, port2)) { LOG.error("Error with partner port configuration for port {} of {} - {}", port.getPortName(), circuitPackName, nodeId); portIndex++; + continue; } - } else { - LOG.error("error getting partner port {} of {} - {}", - port.getPartnerPort().getPortName().toString(), - port.getPartnerPort().getCircuitPackName(), nodeId); - continue; - } - } else { - LOG.info("{} : port {} on {} is not roadm-external or has already been handled. No logicalConnectionPoint assignment for this port.", - nodeId, port.getPortName(), circuitPackName); + String lcp2 = createLogicalConnectionPort(port2, srgCpEntry.getKey(),portIndex); + LOG.info("{} : Logical Connection Point for {} {} is {}", + nodeId, circuitPackName, port2.getPortName(), lcp2); + portMapList.add(createMappingObject(nodeId, port, circuitPackName, lcp1)); + portMapList.add( + createMappingObject(nodeId ,port2, port.getPartnerPort().getCircuitPackName(), lcp2)); + portIndex++; + keys.add(currentKey); + keys.add(port.getPartnerPort().getCircuitPackName() + "-" + port2.getPortName()); + break; + + default: + LOG.info("{} : port {} on {} - unsupported Direction" + + " - cannot assign logicalConnectionPoint.", + nodeId, port.getPortName(), circuitPackName); + } } } @@ -606,20 +714,15 @@ public class PortMappingVersion221 { private List getDegrees(String deviceId, Info ordmInfo) { List degrees = new ArrayList<>(); - Integer maxDegree; // Get value for max degree from info subtree, required for iteration // if not present assume to be 20 (temporary) - if (ordmInfo.getMaxDegrees() != null) { - maxDegree = ordmInfo.getMaxDegrees().toJava(); - } else { - maxDegree = 20; - } + Integer maxDegree = ordmInfo.getMaxDegrees() == null ? 20 : ordmInfo.getMaxDegrees().toJava(); for (int degreeCounter = 1; degreeCounter <= maxDegree; degreeCounter++) { LOG.info("Getting Connection ports for Degree Number {}", degreeCounter); InstanceIdentifier deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(Degree.class, new DegreeKey(degreeCounter)); + .child(Degree.class, new DegreeKey(Uint16.valueOf(degreeCounter))); Optional ordmDegreeObject = this.deviceTransactionManager.getDataFromDevice(deviceId, LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); @@ -631,24 +734,40 @@ public class PortMappingVersion221 { return degrees; } + private List getSrgs(String deviceId, Info ordmInfo) { + List srgs = new ArrayList<>(); + + // Get value for max Srg from info subtree, required for iteration + // if not present assume to be 20 (temporary) + Integer maxSrg = ordmInfo.getMaxSrgs() == null ? 20 : ordmInfo.getMaxSrgs().toJava(); + for (int srgCounter = 1; srgCounter <= maxSrg; srgCounter++) { + InstanceIdentifier srgIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + .child(SharedRiskGroup.class, new SharedRiskGroupKey(Uint16.valueOf(srgCounter))); + Optional ordmSrgObject = this.deviceTransactionManager.getDataFromDevice(deviceId, + LogicalDatastoreType.OPERATIONAL, srgIID, + Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); + if (ordmSrgObject.isPresent()) { + srgs.add(ordmSrgObject.get()); + + } + } + return srgs; + } + private Map> getPerDegreePorts(String deviceId, Info ordmInfo) { Map> conPortMap = new HashMap<>(); - Integer maxDegree; + Integer maxDegree = ordmInfo.getMaxDegrees() == null ? 20 : ordmInfo.getMaxDegrees().toJava(); - if (ordmInfo.getMaxDegrees() != null) { - maxDegree = ordmInfo.getMaxDegrees().toJava(); - } else { - maxDegree = 20; - } for (int degreeCounter = 1; degreeCounter <= maxDegree; degreeCounter++) { LOG.info("Getting Connection ports for Degree Number {}", degreeCounter); InstanceIdentifier deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(Degree.class, new DegreeKey(degreeCounter)); + .child(Degree.class, new DegreeKey(Uint16.valueOf(degreeCounter))); Optional ordmDegreeObject = this.deviceTransactionManager.getDataFromDevice(deviceId, LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); if (ordmDegreeObject.isPresent()) { - conPortMap.put(degreeCounter, ordmDegreeObject.get().getConnectionPorts()); + conPortMap.put(degreeCounter, new ArrayList<>(ordmDegreeObject.get() + .nonnullConnectionPorts().values())); } } LOG.info("Device {} has {} degree", deviceId, conPortMap.size()); @@ -657,82 +776,117 @@ public class PortMappingVersion221 { private Map getEthInterfaceList(String nodeId) { LOG.info("It is calling get ethernet interface"); - Map cpToInterfaceMap = new HashMap<>(); InstanceIdentifier protocoliid = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(Protocols.class); Optional protocolObject = this.deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, protocoliid, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - if (protocolObject.isPresent() && protocolObject.get().augmentation(Protocols1.class).getLldp() != null) { - Lldp lldp = protocolObject.get().augmentation(Protocols1.class).getLldp(); - for (PortConfig portConfig : lldp.getPortConfig()) { - if (portConfig.getAdminStatus().equals(PortConfig.AdminStatus.Txandrx)) { - InstanceIdentifier interfaceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(Interface.class, new InterfaceKey(portConfig.getIfName())); - Optional interfaceObject = this.deviceTransactionManager.getDataFromDevice(nodeId, - LogicalDatastoreType.OPERATIONAL, interfaceIID, Timeouts.DEVICE_READ_TIMEOUT, - Timeouts.DEVICE_READ_TIMEOUT_UNIT); - if (interfaceObject.isPresent() && (interfaceObject.get().getSupportingCircuitPackName() != null)) { - String supportingCircuitPackName = interfaceObject.get().getSupportingCircuitPackName(); - cpToInterfaceMap.put(supportingCircuitPackName, portConfig.getIfName()); - InstanceIdentifier circuitPacksIID = InstanceIdentifier - .create(OrgOpenroadmDevice.class) - .child(CircuitPacks.class, new CircuitPacksKey(supportingCircuitPackName)); - Optional circuitPackObject = this.deviceTransactionManager.getDataFromDevice( - nodeId, LogicalDatastoreType.OPERATIONAL, circuitPacksIID, Timeouts.DEVICE_READ_TIMEOUT, - Timeouts.DEVICE_READ_TIMEOUT_UNIT); - if (circuitPackObject.isPresent() && (circuitPackObject.get().getParentCircuitPack() != null)) { - cpToInterfaceMap.put(circuitPackObject.get().getParentCircuitPack().getCircuitPackName(), - portConfig.getIfName()); - } - } - } + if (!protocolObject.isPresent() || protocolObject.get().augmentation(Protocols1.class).getLldp() == null) { + LOG.warn("Couldnt find port config under LLDP for Node : {} - Processiong is done.. now returning..", + nodeId); + return new HashMap<>(); + } + Map cpToInterfaceMap = new HashMap<>(); + Lldp lldp = protocolObject.get().augmentation(Protocols1.class).getLldp(); + for (PortConfig portConfig : lldp.nonnullPortConfig().values()) { + if (!portConfig.getAdminStatus().equals(PortConfig.AdminStatus.Txandrx)) { + continue; } - } else { - LOG.warn("Couldnt find port config under LLDP for Node : {}", nodeId); + InstanceIdentifier interfaceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + .child(Interface.class, new InterfaceKey(portConfig.getIfName())); + Optional interfaceObject = this.deviceTransactionManager.getDataFromDevice(nodeId, + LogicalDatastoreType.OPERATIONAL, interfaceIID, Timeouts.DEVICE_READ_TIMEOUT, + Timeouts.DEVICE_READ_TIMEOUT_UNIT); + if (!interfaceObject.isPresent() || (interfaceObject.get().getSupportingCircuitPackName() == null)) { + continue; + } + String supportingCircuitPackName = interfaceObject.get().getSupportingCircuitPackName(); + cpToInterfaceMap.put(supportingCircuitPackName, portConfig.getIfName()); + InstanceIdentifier circuitPacksIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + .child(CircuitPacks.class, new CircuitPacksKey(supportingCircuitPackName)); + Optional circuitPackObject = this.deviceTransactionManager.getDataFromDevice( + nodeId, LogicalDatastoreType.OPERATIONAL, circuitPacksIID, Timeouts.DEVICE_READ_TIMEOUT, + Timeouts.DEVICE_READ_TIMEOUT_UNIT); + if (!circuitPackObject.isPresent() || (circuitPackObject.get().getParentCircuitPack() == null)) { + continue; + } + cpToInterfaceMap.put(circuitPackObject.get().getParentCircuitPack().getCircuitPackName(), + portConfig.getIfName()); } LOG.info("Processiong is done.. now returning.."); return cpToInterfaceMap; } private List getCpToDegreeList(List degrees, String nodeId, - Map interfaceList) { + Map interfaceList) { List cpToDegreeList = new ArrayList<>(); for (Degree degree : degrees) { - if (degree.getCircuitPacks() != null) { - LOG.info("Inside CP to degree list"); - cpToDegreeList.addAll(degree.getCircuitPacks().stream() - .map(cp -> createCpToDegreeObject(cp.getCircuitPackName(), - degree.getDegreeNumber().toString(), nodeId, interfaceList)) - .collect(Collectors.toList())); + if (degree.getCircuitPacks() == null) { + continue; } + LOG.info("Inside CP to degree list"); + cpToDegreeList.addAll(degree.nonnullCircuitPacks().values().stream() + .map(cp -> createCpToDegreeObject(cp.getCircuitPackName(), + degree.getDegreeNumber().toString(), nodeId, interfaceList)) + .collect(Collectors.toList())); } return cpToDegreeList; } + private List getMcCapabilitiesList(List degrees, List srgs, + String nodeId) { + LOG.info("Getting the MC capabilities for degrees of node {}", nodeId); + List mcCapabilitiesList = degrees.stream() + .map(degree -> createMcCapDegreeObject(degree, nodeId)).collect(Collectors.toList()); + // Add the SRG mc-capabilities + LOG.info("Getting the MC capabilities for SRGs of node {}", nodeId); + mcCapabilitiesList.addAll(srgs.stream().map(srg -> createMcCapSrgObject(srg, nodeId)) + .collect(Collectors.toList())); + return mcCapabilitiesList; + } + private boolean postPortMapping(String nodeId, NodeInfo nodeInfo, List portMapList, - List cp2DegreeList, List splList) { + List cp2DegreeList, List splList, List mcCapList) { NodesBuilder nodesBldr = new NodesBuilder().withKey(new NodesKey(nodeId)).setNodeId(nodeId); if (nodeInfo != null) { nodesBldr.setNodeInfo(nodeInfo); } if (portMapList != null) { - nodesBldr.setMapping(portMapList); + Map mappingMap = new HashMap<>(); + // No element in the list below should be null at this stage + for (Mapping mapping: portMapList) { + mappingMap.put(mapping.key(), mapping); + } + nodesBldr.setMapping(mappingMap); } if (cp2DegreeList != null) { - nodesBldr.setCpToDegree(cp2DegreeList); + Map cpToDegreeMap = new HashMap<>(); + // No element in the list below should be null at this stage + for (CpToDegree cp2Degree: cp2DegreeList) { + cpToDegreeMap.put(cp2Degree.key(), cp2Degree); + } + nodesBldr.setCpToDegree(cpToDegreeMap); } + if (splList != null) { - nodesBldr.setSwitchingPoolLcp(splList); + Map splMap = new HashMap<>(); + // No element in the list below should be null at this stage + for (SwitchingPoolLcp spl: splList) { + splMap.put(spl.key(), spl); + } + nodesBldr.setSwitchingPoolLcp(splMap); + } + if (mcCapList != null) { + nodesBldr.setMcCapabilities(mcCapList); } - List nodesList = new ArrayList<>(); - nodesList.add(nodesBldr.build()); + Map nodesList = new HashMap<>(); + Nodes nodes = nodesBldr.build(); + nodesList.put(nodes.key(),nodes); - NetworkBuilder nwBldr = new NetworkBuilder().setNodes(nodesList); + Network network = new NetworkBuilder().setNodes(nodesList).build(); final WriteTransaction writeTransaction = dataBroker.newWriteOnlyTransaction(); InstanceIdentifier nodesIID = InstanceIdentifier.builder(Network.class).build(); - Network network = nwBldr.build(); writeTransaction.merge(LogicalDatastoreType.CONFIGURATION, nodesIID, network); FluentFuture commit = writeTransaction.commit(); try { @@ -745,51 +899,96 @@ public class PortMappingVersion221 { } private CpToDegree createCpToDegreeObject(String circuitPackName, String degreeNumber, String nodeId, - Map interfaceList) { - String interfaceName = null; - if (interfaceList.get(circuitPackName) != null) { - interfaceName = interfaceList.get(circuitPackName); + Map interfaceList) { + return new CpToDegreeBuilder() + .withKey(new CpToDegreeKey(circuitPackName)) + .setCircuitPackName(circuitPackName) + .setDegreeNumber(Uint32.valueOf(degreeNumber)) + .setInterfaceName(interfaceList.get(circuitPackName)).build(); + } + + private McCapabilities createMcCapDegreeObject(Degree degree, String nodeId) { + String mcNodeName = "DEG" + degree.getDegreeNumber().toString() + "-TTP"; + McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder() + .withKey(new McCapabilitiesKey(mcNodeName)) + .setMcNodeName(mcNodeName); + if (degree.getMcCapabilities() == null) { + LOG.warn("Media channel capabilities are not advertised for degree {} of {} - assuming fixed grid", + degree.getDegreeNumber(), nodeId); + mcCapabilitiesBuilder + .setCenterFreqGranularity(FrequencyGHz.getDefaultInstance("50")) + .setSlotWidthGranularity(FrequencyGHz.getDefaultInstance("50")); + } else { + mcCapabilitiesBuilder + .setCenterFreqGranularity(FrequencyGHz.getDefaultInstance(degree.getMcCapabilities() + .getCenterFreqGranularity().getValue().toString())) + .setSlotWidthGranularity(FrequencyGHz.getDefaultInstance(degree.getMcCapabilities() + .getSlotWidthGranularity().getValue().toString())); } - return new CpToDegreeBuilder().withKey(new CpToDegreeKey(circuitPackName)).setCircuitPackName(circuitPackName) - .setDegreeNumber(Long.valueOf(degreeNumber)).setInterfaceName(interfaceName).build(); + return mcCapabilitiesBuilder.build(); + } + + private McCapabilities createMcCapSrgObject(SharedRiskGroup srg, String nodeId) { + String mcNodeName = "SRG" + srg.getSrgNumber().toString() + "-PP"; + McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder() + .withKey(new McCapabilitiesKey(mcNodeName)) + .setMcNodeName(mcNodeName); + if (srg.getMcCapabilities() == null) { + LOG.warn("Media channel capabilities are not advertised for SRG {} of {} - assuming fixed grid", + srg.getSrgNumber(), nodeId); + mcCapabilitiesBuilder + .setCenterFreqGranularity(FrequencyGHz.getDefaultInstance("50")) + .setSlotWidthGranularity(FrequencyGHz.getDefaultInstance("50")); + } else { + mcCapabilitiesBuilder + .setCenterFreqGranularity(FrequencyGHz.getDefaultInstance(srg.getMcCapabilities() + .getCenterFreqGranularity().getValue().toString())) + .setSlotWidthGranularity(FrequencyGHz.getDefaultInstance(srg.getMcCapabilities() + .getSlotWidthGranularity().getValue().toString())); + } + return mcCapabilitiesBuilder.build(); } private Mapping createMappingObject(String nodeId, Ports port, String circuitPackName, - String logicalConnectionPoint) { - MappingBuilder mpBldr = new MappingBuilder(); - mpBldr.withKey(new MappingKey(logicalConnectionPoint)).setLogicalConnectionPoint(logicalConnectionPoint) - .setSupportingCircuitPackName(circuitPackName).setSupportingPort(port.getPortName()) - .setPortDirection(port.getPortDirection().getName()); + String logicalConnectionPoint) { + MappingBuilder mpBldr = new MappingBuilder() + .withKey(new MappingKey(logicalConnectionPoint)) + .setLogicalConnectionPoint(logicalConnectionPoint) + .setSupportingCircuitPackName(circuitPackName) + .setSupportingPort(port.getPortName()) + .setPortDirection(port.getPortDirection().getName()); + if ((port.getInterfaces() == null) + || (!logicalConnectionPoint.contains(StringConstants.TTP_TOKEN) + && !logicalConnectionPoint.contains(StringConstants.NETWORK_TOKEN))) { + return mpBldr.build(); + } // Get OMS and OTS interface provisioned on the TTP's - if ((logicalConnectionPoint.contains(StringConstants.TTP_TOKEN) - || logicalConnectionPoint.contains(StringConstants.NETWORK_TOKEN)) && (port.getInterfaces() != null)) { - for (Interfaces interfaces : port.getInterfaces()) { - try { - Optional openRoadmInterface = this.openRoadmInterfaces.getInterface(nodeId, - interfaces.getInterfaceName()); - if (openRoadmInterface.isPresent()) { - LOG.info("interface get from device is {} and of type {}", openRoadmInterface.get().getName(), - openRoadmInterface.get().getType()); - Class interfaceType - = (Class) openRoadmInterface.get().getType(); - // Check if interface type is OMS or OTS - if (interfaceType.equals(OpenROADMOpticalMultiplex.class)) { - mpBldr.setSupportingOms(interfaces.getInterfaceName()); - } - if (interfaceType.equals(OpticalTransport.class)) { - mpBldr.setSupportingOts(interfaces.getInterfaceName()); - } - if (interfaceType.equals(OtnOdu.class)) { - mpBldr.setSupportingOdu4(interfaces.getInterfaceName()); - } - } else { - LOG.warn("Interface {} from node {} was null!", interfaces.getInterfaceName(), nodeId); - } - } catch (OpenRoadmInterfaceException ex) { - LOG.warn("Error while getting interface {} from node {}!", interfaces.getInterfaceName(), nodeId, - ex); + for (Interfaces interfaces : port.getInterfaces()) { + try { + Optional openRoadmInterface = this.openRoadmInterfaces.getInterface(nodeId, + interfaces.getInterfaceName()); + if (!openRoadmInterface.isPresent()) { + LOG.warn("Interface {} from node {} was null!", interfaces.getInterfaceName(), nodeId); + continue; } + LOG.info("interface get from device is {} and of type {}", + openRoadmInterface.get().getName(), openRoadmInterface.get().getType()); + Class interfaceType + = (Class) openRoadmInterface.get().getType(); + // Check if interface type is OMS or OTS + if (interfaceType.equals(OpenROADMOpticalMultiplex.class)) { + mpBldr.setSupportingOms(interfaces.getInterfaceName()); + } + if (interfaceType.equals(OpticalTransport.class)) { + mpBldr.setSupportingOts(interfaces.getInterfaceName()); + } + if (interfaceType.equals(OtnOdu.class)) { + mpBldr.setSupportingOdu4(interfaces.getInterfaceName()); + } + } catch (OpenRoadmInterfaceException ex) { + LOG.warn("Error while getting interface {} from node {}!", + interfaces.getInterfaceName(), nodeId, ex); } } return mpBldr.build(); @@ -798,44 +997,61 @@ public class PortMappingVersion221 { private Mapping createXpdrMappingObject(String nodeId, Ports port, String circuitPackName, String logicalConnectionPoint, String partnerLcp, Mapping mapping, String connectionMapLcp, XpdrNodeTypes xpdrNodeType) { - MappingBuilder mpBldr; + if (mapping != null && connectionMapLcp != null) { // update existing mapping - mpBldr = new MappingBuilder(mapping).setConnectionMapLcp(connectionMapLcp); - } else { - // create a new mapping - mpBldr = new MappingBuilder() + return new MappingBuilder(mapping).setConnectionMapLcp(connectionMapLcp).build(); + } + + // create a new mapping + String nodeIdLcp = nodeId + "-" + logicalConnectionPoint; + MappingBuilder mpBldr = new MappingBuilder() .withKey(new MappingKey(logicalConnectionPoint)) .setLogicalConnectionPoint(logicalConnectionPoint) .setSupportingCircuitPackName(circuitPackName) .setSupportingPort(port.getPortName()) - .setPortDirection(port.getPortDirection().getName()); - if (port.getPortQual() != null) { - mpBldr.setPortQual(port.getPortQual().getName()); - } - if (port.getSupportedInterfaceCapability() != null) { - mpBldr.setSupportedInterfaceCapability(port.getSupportedInterfaceCapability()); - } - if (xpdrNodeType != null) { - mpBldr.setXponderType(xpdrNodeType); - } - if (partnerLcp != null) { - mpBldr.setPartnerLcp(partnerLcp); + .setPortDirection(port.getPortDirection().getName()) + .setLcpHashVal(FnvUtils.fnv1_64(nodeIdLcp)); + if (port.getPortQual() != null) { + mpBldr.setPortQual(port.getPortQual().getName()); + } + if (xpdrNodeType != null) { + mpBldr.setXponderType( + org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.XpdrNodeTypes.forValue( + xpdrNodeType.getIntValue())); + } + if (partnerLcp != null) { + mpBldr.setPartnerLcp(partnerLcp); + } + if (port.getSupportedInterfaceCapability() != null) { + List> supportedIntf = new ArrayList<>(); + for (Class sup: port.getSupportedInterfaceCapability()) { + @SuppressWarnings("unchecked") Class sup1 = + (Class) sup; + supportedIntf.add(sup1); } + mpBldr.setSupportedInterfaceCapability(supportedIntf); } return mpBldr.build(); } - //some LOG messages are too long - @SuppressWarnings("checkstyle:linelength") - @SuppressFBWarnings("DM_CONVERT_CASE") + private boolean createMcCapabilitiesList(String nodeId, Info deviceInfo, List mcCapabilitiesList) { + List degrees = getDegrees(nodeId, deviceInfo); + List srgs = getSrgs(nodeId, deviceInfo); + mcCapabilitiesList.addAll(getMcCapabilitiesList(degrees, srgs, nodeId)); + return true; + } + private boolean createTtpPortMapping(String nodeId, Info deviceInfo, List portMapList) { // Creating mapping data for degree TTP's List degrees = getDegrees(nodeId, deviceInfo); Map interfaceList = getEthInterfaceList(nodeId); List cpToDegreeList = getCpToDegreeList(degrees, nodeId, interfaceList); LOG.info("Map looks like this {}", interfaceList); - postPortMapping(nodeId, null, null, cpToDegreeList, null); + postPortMapping(nodeId, null, null, cpToDegreeList, null, null); Map> connectionPortMap = getPerDegreePorts(nodeId, deviceInfo); for (Entry> cpMapEntry : connectionPortMap.entrySet()) { @@ -843,40 +1059,44 @@ public class PortMappingVersion221 { case 1: // port is bidirectional InstanceIdentifier portID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(CircuitPacks.class, new CircuitPacksKey(connectionPortMap.get(cpMapEntry.getKey()).get(0) - .getCircuitPackName())) - .child(Ports.class, new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0) - .getPortName().toString())); - LOG.info("Fetching connection-port {} at circuit pack {}", connectionPortMap.get(cpMapEntry.getKey()).get(0) - .getPortName().toString(), connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName()); + .child(CircuitPacks.class, + new CircuitPacksKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName())) + .child(Ports.class, + new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString())); + LOG.info("Fetching connection-port {} at circuit pack {}", + connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString(), + connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName()); Optional portObject = this.deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, portID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - if (portObject.isPresent()) { - Ports port = portObject.get(); - if (port.getPortQual() == null) { - continue; - } else if (PortQual.RoadmExternal.getIntValue() == port.getPortQual().getIntValue() - && Direction.Bidirectional.getIntValue() == port.getPortDirection().getIntValue()) { - String logicalConnectionPoint = new StringBuilder("DEG").append(cpMapEntry.getKey()).append("-TTP-TXRX") - .toString(); - LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId, - connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), port.getPortName(), - logicalConnectionPoint); - portMapList.add(createMappingObject(nodeId, port, - connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), logicalConnectionPoint)); - } else { - LOG.error( - "Impossible to create logical connection point for port {} of {} on node {}" - + "- Error in configuration with port-qual or port-direction", - port.getPortName(), connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), nodeId); - } - } else { + if (!portObject.isPresent()) { LOG.error("No port {} on circuit pack {} for node {}", connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString(), connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), nodeId); return false; } + Ports port = portObject.get(); + if (port.getPortQual() == null) { + continue; + } + if (PortQual.RoadmExternal.getIntValue() != port.getPortQual().getIntValue() + || Direction.Bidirectional.getIntValue() != port.getPortDirection().getIntValue()) { + LOG.error("Impossible to create logical connection point for port {} of {} on node {}" + + " - Error in configuration with port-qual or port-direction", + port.getPortName(), + connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), nodeId); + continue; + } + String logicalConnectionPoint = new StringBuilder("DEG") + .append(cpMapEntry.getKey()) + .append("-TTP-TXRX") + .toString(); + LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId, + connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), port.getPortName(), + logicalConnectionPoint); + portMapList.add(createMappingObject(nodeId, port, + connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), + logicalConnectionPoint)); break; case 2: // ports are unidirectionals @@ -884,71 +1104,76 @@ public class PortMappingVersion221 { String cp2Name = connectionPortMap.get(cpMapEntry.getKey()).get(1).getCircuitPackName(); InstanceIdentifier port1ID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(cp1Name)) - .child(Ports.class, new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString())); - LOG.info("Fetching connection-port {} at circuit pack {}", connectionPortMap.get(cpMapEntry.getKey()).get(0) - .getPortName().toString(), cp1Name); + .child(Ports.class, + new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString())); + LOG.info("Fetching connection-port {} at circuit pack {}", + connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString(), + cp1Name); Optional port1Object = this.deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, port1ID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); InstanceIdentifier port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(cp2Name)) - .child(Ports.class, new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName().toString())); + .child(Ports.class, + new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName().toString())); LOG.info("Fetching connection-port {} at circuit pack {}", connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName().toString(), cp2Name); Optional port2Object = this.deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, port2ID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - if (port1Object.isPresent() && port2Object.isPresent()) { - Ports port1 = port1Object.get(); - Ports port2 = port2Object.get(); - if (port1.getPortQual() == null || port2.getPortQual() == null) { - continue; - } else if ((PortQual.RoadmExternal.getIntValue() == port1.getPortQual().getIntValue() - && PortQual.RoadmExternal.getIntValue() == port2.getPortQual().getIntValue() - && Direction.Rx.getIntValue() == port1.getPortDirection().getIntValue() - && Direction.Tx.getIntValue() == port2.getPortDirection().getIntValue() - && port1.getPartnerPort() != null && port2.getPartnerPort() != null - && port1.getPartnerPort().getCircuitPackName().equals(cp2Name) - && port1.getPartnerPort().getPortName().equals(port2.getPortName()) - && port2.getPartnerPort().getCircuitPackName().equals(cp1Name) - && port2.getPartnerPort().getPortName().equals(port1.getPortName())) - || - (PortQual.RoadmExternal.getIntValue() == port1.getPortQual().getIntValue() - && PortQual.RoadmExternal.getIntValue() == port2.getPortQual().getIntValue() - && Direction.Rx.getIntValue() == port2.getPortDirection().getIntValue() - && Direction.Tx.getIntValue() == port1.getPortDirection().getIntValue() - && port1.getPartnerPort() != null && port2.getPartnerPort() != null - && port1.getPartnerPort().getCircuitPackName().equals(cp2Name) - && port1.getPartnerPort().getPortName().equals(port2.getPortName()) - && port2.getPartnerPort().getCircuitPackName().equals(cp1Name) - && port2.getPartnerPort().getPortName().equals(port1.getPortName()))) { - String logicalConnectionPoint1 = new StringBuilder("DEG").append(cpMapEntry.getKey()).append("-TTP-") - .append(port1.getPortDirection().getName().toUpperCase()).toString(); - LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId, - connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), port1.getPortName(), - logicalConnectionPoint1); - portMapList.add(createMappingObject(nodeId, port1, connectionPortMap.get(cpMapEntry.getKey()).get(0) - .getCircuitPackName(), logicalConnectionPoint1)); - String logicalConnectionPoint2 = new StringBuilder("DEG").append(cpMapEntry.getKey()).append("-TTP-") - .append(port2.getPortDirection().getName().toUpperCase()).toString(); - LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId, - connectionPortMap.get(cpMapEntry.getKey()).get(1).getCircuitPackName(), port2.getPortName(), - logicalConnectionPoint2); - portMapList.add(createMappingObject(nodeId, port2, connectionPortMap.get(cpMapEntry.getKey()).get(1) - .getCircuitPackName(), logicalConnectionPoint2)); - } else { - LOG.error( - "impossible to create logical connection point for port {} or port {} on node {} - " - + "Error in configuration with port-qual, port-direction or partner-port configuration", - port1.getPortName(), port2.getPortName(), nodeId); - } - } else { + if (!port1Object.isPresent() || !port2Object.isPresent()) { LOG.error("No port {} on circuit pack {} for node {}", connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString(), connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), nodeId); return false; } + Ports port1 = port1Object.get(); + Ports port2 = port2Object.get(); + if (port1.getPortQual() == null || port2.getPortQual() == null) { + continue; + } + if (PortQual.RoadmExternal.getIntValue() != port1.getPortQual().getIntValue() + || PortQual.RoadmExternal.getIntValue() != port2.getPortQual().getIntValue()) { + LOG.error("Impossible to create logical connection point for port {} or port {} on node {}" + + " - Error in configuration with port-qual", + port1.getPortName(), port2.getPortName(), nodeId); + continue; + } + if (!checkPartnerPort(cp1Name, port1, port2)) { + LOG.error("port {} on {} is not a correct partner port of {} on {}", + port2.getPortName(), cp2Name, port1.getPortName(), cp1Name); + continue; + } + // Directions checks are the same for cp1 and cp2, no need to check them twice. + if (!checkPartnerPortNoDir(cp2Name, port2, port1)) { + LOG.error("port {} on {} is not a correct partner port of {} on {}", + port1.getPortName(), cp1Name, port2.getPortName(), cp2Name); + continue; + } + + String logicalConnectionPoint1 = new StringBuilder("DEG") + .append(cpMapEntry.getKey()) + .append("-TTP-") + .append(port1.getPortDirection().getName().toUpperCase(Locale.getDefault())) + .toString(); + LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId, + connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), + port1.getPortName(), logicalConnectionPoint1); + portMapList.add(createMappingObject(nodeId, port1, + connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), + logicalConnectionPoint1)); + String logicalConnectionPoint2 = new StringBuilder("DEG") + .append(cpMapEntry.getKey()) + .append("-TTP-") + .append(port2.getPortDirection().getName().toUpperCase(Locale.getDefault())) + .toString(); + LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId, + connectionPortMap.get(cpMapEntry.getKey()).get(1).getCircuitPackName(), + port2.getPortName(), logicalConnectionPoint2); + portMapList.add(createMappingObject(nodeId, port2, + connectionPortMap.get(cpMapEntry.getKey()).get(1).getCircuitPackName(), + logicalConnectionPoint2)); break; default: LOG.error("Number of connection port for DEG{} on {} is incorrect", cpMapEntry.getKey(), nodeId); @@ -959,28 +1184,31 @@ public class PortMappingVersion221 { } private NodeInfo createNodeInfo(Info deviceInfo) { - NodeInfoBuilder nodeInfoBldr = new NodeInfoBuilder(); - if (deviceInfo.getNodeType() != null) { - nodeInfoBldr.setOpenroadmVersion(OpenroadmVersion._221).setNodeType(deviceInfo.getNodeType()); - if (deviceInfo.getClli() != null && !deviceInfo.getClli().isEmpty()) { - nodeInfoBldr.setNodeClli(deviceInfo.getClli()); - } else { - nodeInfoBldr.setNodeClli("defaultCLLI"); - } - if (deviceInfo.getModel() != null) { - nodeInfoBldr.setNodeModel(deviceInfo.getModel()); - } - if (deviceInfo.getVendor() != null) { - nodeInfoBldr.setNodeVendor(deviceInfo.getVendor()); - } - if (deviceInfo.getIpAddress() != null) { - nodeInfoBldr.setNodeIpAddress(deviceInfo.getIpAddress()); - } - } else { - // TODO make mandatory in yang + + if (deviceInfo.getNodeType() == null) { + // TODO make mandatory in yang LOG.error("Node type field is missing"); return null; } + + NodeInfoBuilder nodeInfoBldr = new NodeInfoBuilder() + .setOpenroadmVersion(OpenroadmVersion._221) + .setNodeType(NodeTypes.forValue(deviceInfo.getNodeType().getIntValue())); + if (deviceInfo.getClli() != null && !deviceInfo.getClli().isEmpty()) { + nodeInfoBldr.setNodeClli(deviceInfo.getClli()); + } else { + nodeInfoBldr.setNodeClli("defaultCLLI"); + } + if (deviceInfo.getModel() != null) { + nodeInfoBldr.setNodeModel(deviceInfo.getModel()); + } + if (deviceInfo.getVendor() != null) { + nodeInfoBldr.setNodeVendor(deviceInfo.getVendor()); + } + if (deviceInfo.getIpAddress() != null) { + nodeInfoBldr.setNodeIpAddress(deviceInfo.getIpAddress()); + } + return nodeInfoBldr.build(); }