X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fcommon%2Fmapping%2FPortMappingVersion710.java;h=3f14866360cfde5f93f77854aab179b049e90045;hb=15197bf3dcde69a90f01963ffa524fbf6354555c;hp=077c949550ee54e3a8053534405cf4ff5b603e79;hpb=36238ab5a0c451835fe613f01f53608151345c89;p=transportpce.git diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java index 077c94955..3f1486636 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java @@ -9,13 +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; @@ -31,29 +31,29 @@ 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.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.opendaylight.transportpce.portmapping.rev210310.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.NetworkBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.NodesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.CpToDegree; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.CpToDegreeBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.CpToDegreeKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.McCapabilities; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.McCapabilitiesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.McCapabilitiesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.NodeInfo; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.NodeInfo.OpenroadmVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.NodeInfoBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.SwitchingPoolLcp; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.SwitchingPoolLcpBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.SwitchingPoolLcpKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.switching.pool.lcp.NonBlockingList; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.switching.pool.lcp.NonBlockingListBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.switching.pool.lcp.NonBlockingListKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.alarm.pm.types.rev191129.Direction; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.optical.channel.types.rev200529.FrequencyGHz; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.CircuitPack; @@ -92,20 +92,30 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev200529.lldp.conta import org.opendaylight.yang.gen.v1.http.org.openroadm.port.capability.rev200529.Ports1; import org.opendaylight.yang.gen.v1.http.org.openroadm.port.capability.rev200529.port.capability.grp.port.capabilities.SupportedInterfaceCapability; import org.opendaylight.yang.gen.v1.http.org.openroadm.port.capability.rev200529.port.capability.grp.port.capabilities.SupportedInterfaceCapabilityKey; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.SupportedIfCapability; 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 +@SuppressWarnings("CPD-START") public class PortMappingVersion710 { private static final Logger LOG = LoggerFactory.getLogger(PortMappingVersion710.class); + private static final Map SUFFIX; private final DataBroker dataBroker; private final DeviceTransactionManager deviceTransactionManager; private final OpenRoadmInterfaces openRoadmInterfaces; + static { + SUFFIX = Map.of( + Direction.Tx, "TX", + Direction.Rx, "RX", + Direction.Bidirectional, "TXRX"); + } + public PortMappingVersion710(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager, OpenRoadmInterfaces openRoadmInterfaces) { this.dataBroker = dataBroker; @@ -114,21 +124,19 @@ public class PortMappingVersion710 { } public boolean createMappingData(String nodeId) { - LOG.info("Create Mapping Data for node 7.1.0 {}", nodeId); + LOG.info("{} : OpenROADM version 7.1.0 node - Creating Mapping Data", nodeId); List portMapList = new ArrayList<>(); - List mcCapabilitiesList = new ArrayList<>(); + Map mcCapabilities = new HashMap<>(); 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; + 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); + LOG.warn("{} : Device info subtree is absent", nodeId); return false; } - deviceInfo = deviceInfoOptional.get(); - nodeInfo = createNodeInfo(deviceInfo, nodeId); + Info deviceInfo = deviceInfoOptional.get(); + NodeInfo nodeInfo = createNodeInfo(deviceInfo); if (nodeInfo == null) { return false; } @@ -140,35 +148,35 @@ public class PortMappingVersion710 { // Get TTP port mapping if (!createTtpPortMapping(nodeId, deviceInfo, portMapList)) { // return false if mapping creation for TTP's failed - LOG.warn("Unable to create mapping for TTP's on node {}", nodeId); + LOG.warn("{} : Unable to create mapping for TTP's", nodeId); return false; } // Get PP port mapping if (!createPpPortMapping(nodeId, deviceInfo, portMapList)) { // return false if mapping creation for PP's failed - LOG.warn("Unable to create mapping for PP's on node {}", nodeId); + LOG.warn("{} : Unable to create mapping for PP's", nodeId); return false; } // Get MC capabilities - if (!createMcCapabilitiesList(nodeId, deviceInfo, mcCapabilitiesList)) { + if (!createMcCapabilitiesList(nodeId, deviceInfo, mcCapabilities)) { // return false if MC capabilites failed - LOG.warn("Unable to create MC capabilities on node {}", nodeId); + LOG.warn("{} : Unable to create MC capabilities", nodeId); return false; } break; case Xpdr: if (!createXpdrPortMapping(nodeId, portMapList)) { - LOG.warn("Unable to create mapping for Xponder on node {}", nodeId); + LOG.warn("{} : Unable to create mapping for the Xponder", nodeId); return false; } break; default: - LOG.error("Unable to create mapping for node {} : unknown nodetype ", nodeId); + LOG.error("{} : unknown nodetype - Unable to create mapping", nodeId); break; } - return postPortMapping(nodeId, nodeInfo, portMapList, null, null, mcCapabilitiesList); + return postPortMapping(nodeId, nodeInfo, portMapList, null, null, mcCapabilities); } public boolean updateMapping(String nodeId, Mapping oldMapping) { @@ -189,8 +197,8 @@ public class PortMappingVersion710 { 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); + LOG.debug("{} : Updating old mapping Data {} for {} by new mapping data {}", + nodeId, oldMapping, oldMapping.getLogicalConnectionPoint(), newMapping); final WriteTransaction writeTransaction = this.dataBroker.newWriteOnlyTransaction(); InstanceIdentifier mapIID = InstanceIdentifier.create(Network.class) .child(Nodes.class, new NodesKey(nodeId)) @@ -200,7 +208,8 @@ public class PortMappingVersion710 { commit.get(); return true; } catch (InterruptedException | ExecutionException e) { - LOG.error("Error updating Mapping {} for node {}", oldMapping.getLogicalConnectionPoint(), nodeId, e); + LOG.error("{} : exception when updating Mapping {} - ", + nodeId, oldMapping.getLogicalConnectionPoint(), e); return false; } } @@ -211,113 +220,49 @@ public class PortMappingVersion710 { Optional deviceObject = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - OrgOpenroadmDevice device = null; if (!deviceObject.isPresent()) { - LOG.error("Impossible to get device configuration for node {}", nodeId); + LOG.error("{} : Impossible to get device configuration", nodeId); return false; } - device = deviceObject.get(); - // 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); + LOG.warn("{} : Circuit Packs not present", nodeId); return false; } - circuitPackList = new ArrayList<>(deviceObject.get().nonnullCircuitPacks().values()); - 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); + 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); + LOG.warn("{} : Ports were not found for circuit pack {}", nodeId, circuitPackName); continue; } List portList = new ArrayList<>(cp.nonnullPorts().values()); portList.sort(Comparator.comparing(Ports::getPortName)); for (Ports port : portList) { - if (port.getPortQual() == null) { - LOG.warn("PortQual was not found for port {} on circuit pack: {}", port.getPortName(), - 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().nonnullPorts().values().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 { - LOG.error("Error fetching port {} on {} for {}", port.getPartnerPort().getPortName(), - port.getPartnerPort().getCircuitPackName(), nodeId); - } - } 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); - } + int[] counters = fillXpdrLcpsMaps(line, client, nodeId, + 1, null, circuitPackName, port, + circuitPackList, lcpMap, mappingMap); + line = counters[0]; + client = counters[1]; } } } else { - LOG.info("{} configuration contains a list of xponders", nodeId); - for (Xponder xponder:deviceObject.get().nonnullXponder().values()) { - line = 1; - client = 1; + LOG.info("{} : configuration contains a list of xponders", nodeId); + 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.nonnullXpdrPort().values()) { @@ -326,129 +271,56 @@ public class PortMappingVersion710 { // 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", circuitPackName); - LOG.warn("Port-mapping will continue ignoring this circuit-pack {}", circuitPackName); + .filter(cp -> cp.getCircuitPackName().equals(circuitPackName)) + .findFirst().isEmpty()) { + LOG.warn("{} : Circuit-pack {} is missing in the device - ignoring it in port-mapping", + nodeId, 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", portName, circuitPackName); - LOG.warn("Port-mapping will continue ignoring this port {}", portName); + .filter(cp -> cp.getCircuitPackName().equals(circuitPackName)) + .findFirst().get().nonnullPorts().values().stream() + .filter(p -> p.getPortName().equals(portName)) + .findFirst().isEmpty()) { + LOG.warn("{} : port {} on {} - association missing in the device - ignoring it in port-mapping", + nodeId, 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); - 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().nonnullPorts().values().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 { - LOG.error("Error fetching port {} on {} for {}", - port.getPartnerPort().getPortName(), - port.getPartnerPort().getCircuitPackName(), nodeId); - } - } 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); - } + .filter(cp -> cp.getCircuitPackName().equals(circuitPackName)) + .findFirst().get().nonnullPorts().values().stream() + .filter(p -> p.getPortName().equals(portName)) + .findFirst().get(); + int[] counters = fillXpdrLcpsMaps(line, client, nodeId, + xponderNb, xponderType, circuitPackName, port, + circuitPackList, lcpMap, mappingMap); + line = counters[0]; + client = counters[1]; } } } - if (device.getConnectionMap() != null) { + if (device.getConnectionMap() == null) { + LOG.warn("{} : No connection-map inside device configuration", nodeId); + } else { Collection connectionMap = deviceObject.get().nonnullConnectionMap().values(); - String slcp = null; - String dlcp = null; for (ConnectionMap cm : connectionMap) { String skey = cm.getSource().getCircuitPackName() + "+" + cm.getSource().getPortName(); - if (lcpMap.containsKey(skey)) { - slcp = lcpMap.get(skey); - } + String slcp = lcpMap.containsKey(skey) ? lcpMap.get(skey) : null; Destination destination0 = cm.nonnullDestination().values().iterator().next(); String dkey = destination0.getCircuitPackName() + "+" + destination0.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"); + if (slcp == null) { + LOG.error("{} : Error in connection-map analysis for source {} and destination (CP+port) {}", + nodeId, 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) { Collection oduSwithcingPools = device.nonnullOduSwitchingPools().values(); List switchingPoolList = new ArrayList<>(); @@ -456,29 +328,31 @@ public class PortMappingVersion710 { Map nbMap = new HashMap<>(); for (org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device.container.org .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.nonnullPortList().values()) { - 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("{} : port {} on {} is not associated to a logical connection point", + nodeId, item.getPortName(), item.getCircuitPackName()); + continue; } - NonBlockingList nonBlockingList = new NonBlockingListBuilder() - .setNblNumber(nbl.getNblNumber()) - .setInterconnectBandwidth(nbl.getInterconnectBandwidth()) - .setInterconnectBandwidthUnit(nbl.getInterconnectBandwidthUnit()) - .setLcpList(lcpList) - .build(); - nbMap.put(nonBlockingList.key(),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()) + //TODO differs from 2.2.1 SwitchingPoolTypes.forValue(odp.getSwitchingPoolType().getIntValue() .setNonBlockingList(nbMap) .build(); switchingPoolList.add(splBldr); @@ -492,45 +366,48 @@ public class PortMappingVersion710 { 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); + LOG.debug("{} : Getting Circuitpacks for Srg Number {}", deviceId, srgCounter); InstanceIdentifier srgIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(SharedRiskGroup.class, new SharedRiskGroupKey(Uint16.valueOf(srgCounter))); Optional ordmSrgObject = this.deviceTransactionManager.getDataFromDevice(deviceId, @@ -541,17 +418,16 @@ public class PortMappingVersion710 { cpPerSrg.put(ordmSrgObject.get().getSrgNumber().toJava(), srgCps); } } - LOG.info("Device {} has {} Srg", deviceId, cpPerSrg.size()); + LOG.info("{} : Device has {} Srg", deviceId, cpPerSrg.size()); 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<>(); @@ -574,59 +450,82 @@ public class PortMappingVersion710 { 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.debug("{} : port {} on {} is not roadm-external - cannot assign logicalConnectionPoint.", + nodeId, port.getPortName(), circuitPackName); + continue; + } + + if (keys.contains(currentKey)) { + LOG.debug("{} : 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("{} : port {} on {} - associated Logical Connection Point is {}", + nodeId, port.getPortName(), circuitPackName, 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("{} : port {} on {} - associated Logical Connection Point is {}", + nodeId, port.getPortName(), circuitPackName, 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("{} : port {} on {} - error getting partner", + nodeId, port.getPartnerPort().getPortName().toString(), + port.getPartnerPort().getCircuitPackName()); + 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 { - LOG.error("Error with partner port configuration for port {} of {} - {}", - port.getPortName(), circuitPackName, nodeId); + if (!checkPartnerPort(circuitPackName, port, port2)) { + LOG.error("{} : port {} on {} - Error with partner port configuration", + nodeId, port.getPortName(), circuitPackName); 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("{} : port {} on {} - associated Logical Connection Point is {}", + nodeId, port2.getPortName(), circuitPackName, 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.error("{} : port {} on {} - unsupported Direction {}" + + " - cannot assign logicalConnectionPoint.", + nodeId, port.getPortName(), circuitPackName, port.getPortDirection()); + } } } @@ -635,21 +534,18 @@ public class PortMappingVersion710 { } private String createLogicalConnectionPort(Ports port, int index, int portIndex) { - String lcp = null; - switch (port.getPortDirection()) { - case Tx: - lcp = "SRG" + index + "-PP" + portIndex + "-TX"; - break; - case Rx: - lcp = "SRG" + index + "-PP" + portIndex + "-RX"; - break; - case Bidirectional: - lcp = "SRG" + index + "-PP" + portIndex + "-TXRX"; - break; - default: - LOG.error("Unsupported port direction for port {} : {}", port, port.getPortDirection()); + if (SUFFIX.containsKey(port.getPortDirection())) { + return String.join("-", "SRG" + index, "PP" + portIndex, SUFFIX.get(port.getPortDirection())); } - return lcp; + LOG.error("port {} : Unsupported port direction {}", port, port.getPortDirection()); + return null; + } + + private String createXpdrLogicalConnectionPort(int xponderNb, int lcpNb, String token) { + return new StringBuilder("XPDR").append(xponderNb) + .append("-") + .append(token).append(lcpNb) + .toString(); } private Map getMcCapabilityProfiles(String deviceId, Info ordmInfo) { @@ -669,44 +565,41 @@ public class PortMappingVersion710 { return mcCapabilityProfiles; } - private List getDegrees(String deviceId, Info ordmInfo) { - List degrees = new ArrayList<>(); - Integer maxDegree; + private Map getDegreesMap(String deviceId, Info ordmInfo) { + Map degrees = new HashMap<>(); // 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); + LOG.debug("{} : Getting Connection ports for Degree Number {}", deviceId, degreeCounter); InstanceIdentifier deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .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()) { - degrees.add(ordmDegreeObject.get()); + degrees.put(degreeCounter, ordmDegreeObject.get()); } } - LOG.info("Device {} has {} degree", deviceId, degrees.size()); + LOG.info("{} : Device has {} degree(s)", deviceId, degrees.size()); return degrees; } + private Map> getPerDegreePorts(String deviceId, Info ordmInfo) { + Map> conPortMap = new HashMap<>(); + getDegreesMap(deviceId, ordmInfo).forEach( + (index, degree) -> conPortMap.put(index, new ArrayList<>(degree.nonnullConnectionPorts().values()))); + return conPortMap; + } + private List getSrgs(String deviceId, Info ordmInfo) { List srgs = new ArrayList<>(); - 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++) { InstanceIdentifier srgIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(SharedRiskGroup.class, new SharedRiskGroupKey(Uint16.valueOf(srgCounter))); @@ -721,190 +614,149 @@ public class PortMappingVersion710 { return srgs; } - private Map> getPerDegreePorts(String deviceId, Info ordmInfo) { - Map> conPortMap = new HashMap<>(); - Integer maxDegree; - - 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(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, new ArrayList<>(ordmDegreeObject.get() - .nonnullConnectionPorts().values())); - } - } - LOG.info("Device {} has {} degree", deviceId, conPortMap.size()); - return conPortMap; - } - private Map getEthInterfaceList(String nodeId) { - LOG.info("It is calling get ethernet interface"); - Map cpToInterfaceMap = new HashMap<>(); + LOG.info("{} : It is calling get ethernet interface", nodeId); 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.nonnullPortConfig().values()) { - 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 - 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.."); + LOG.info("{} : Processiong is done.. now returning..", nodeId); return cpToInterfaceMap; } - private List getCpToDegreeList(List degrees, String nodeId, - Map interfaceList) { + private List getCpToDegreeList(Map degrees, Map interfaceList) { List cpToDegreeList = new ArrayList<>(); - for (Degree degree : degrees) { - if (degree.getCircuitPacks() != null) { - 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())); - } + for (Degree degree : degrees.values()) { + LOG.debug("Inside CP to degree list"); + cpToDegreeList.addAll(degree.nonnullCircuitPacks().values().stream() + .map(cp -> createCpToDegreeObject(cp.getCircuitPackName(), + degree.getDegreeNumber().toString(), interfaceList)) + .collect(Collectors.toList())); } return cpToDegreeList; } - private List getMcCapabilitiesList(List degrees, List srgs, - Info deviceInfo, String nodeId) { - LOG.info("Getting the MC capabilities for degrees of node {}", nodeId); + private Map getMcCapabilities(Map degrees, + List srgs, Info deviceInfo, String nodeId) { + //TODO some divergences with 2.2.1 here + LOG.info("{} : Getting the MC capabilities for degrees", nodeId); //Get all the mc-capability profiles from the device - Map mcCapabilityProfiles = getMcCapabilityProfiles(nodeId, - deviceInfo); + Map mcCapabilityProfiles = + getMcCapabilityProfiles(nodeId, deviceInfo); // Add the DEG mc-capabilities - List mcCapabilitiesList = createMcCapDegreeObject(degrees, mcCapabilityProfiles, nodeId); + Map mcCapabilities = createMcCapDegreeObject(degrees, mcCapabilityProfiles, + nodeId); // Add the SRG mc-capabilities - LOG.info("Getting the MC capabilities for SRGs of node {}", nodeId); - mcCapabilitiesList.addAll(createMcCapSrgObject(srgs, mcCapabilityProfiles, nodeId)); - - return mcCapabilitiesList; + LOG.info("{} : Getting the MC capabilities for SRGs", nodeId); + mcCapabilities.putAll(createMcCapSrgObject(srgs, mcCapabilityProfiles, nodeId)); + return mcCapabilities; } private boolean postPortMapping(String nodeId, NodeInfo nodeInfo, List portMapList, - List cp2DegreeList, List splList, List mcCapList) { + List cp2DegreeList, List splList, + Map mcCapMap) { NodesBuilder nodesBldr = new NodesBuilder().withKey(new NodesKey(nodeId)).setNodeId(nodeId); if (nodeInfo != null) { nodesBldr.setNodeInfo(nodeInfo); } if (portMapList != null) { Map mappingMap = new HashMap<>(); + // No element in the list below should be null at this stage for (Mapping mapping: portMapList) { - if (mapping != null) { - mappingMap.put(mapping.key(), mapping); - } + mappingMap.put(mapping.key(), mapping); } nodesBldr.setMapping(mappingMap); } if (cp2DegreeList != null) { Map cpToDegreeMap = new HashMap<>(); + // No element in the list below should be null at this stage for (CpToDegree cp2Degree: cp2DegreeList) { - if (cp2Degree != null) { - cpToDegreeMap.put(cp2Degree.key(), cp2Degree); - } + cpToDegreeMap.put(cp2Degree.key(), cp2Degree); } nodesBldr.setCpToDegree(cpToDegreeMap); } if (splList != null) { Map splMap = new HashMap<>(); + // No element in the list below should be null at this stage for (SwitchingPoolLcp spl: splList) { - if (spl != null) { - splMap.put(spl.key(), spl); - } + splMap.put(spl.key(), spl); } nodesBldr.setSwitchingPoolLcp(splMap); } - if (mcCapList != null) { - nodesBldr.setMcCapabilities(mcCapList); + if (mcCapMap != null) { + nodesBldr.setMcCapabilities(mcCapMap); } 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 { commit.get(); return true; } catch (InterruptedException | ExecutionException e) { - LOG.warn("Failed to post {}", network, e); + LOG.warn("{} : Failed to post {}", nodeId, network, e); return false; } } - private CpToDegree createCpToDegreeObject(String circuitPackName, String degreeNumber, String nodeId, - Map interfaceList) { - String interfaceName = null; - if (interfaceList.get(circuitPackName) != null) { - interfaceName = interfaceList.get(circuitPackName); - } - return new CpToDegreeBuilder().withKey(new CpToDegreeKey(circuitPackName)).setCircuitPackName(circuitPackName) - .setDegreeNumber(Uint32.valueOf(degreeNumber)).setInterfaceName(interfaceName).build(); + private CpToDegree createCpToDegreeObject(String circuitPackName, String degreeNumber, + Map interfaceList) { + return new CpToDegreeBuilder() + .withKey(new CpToDegreeKey(circuitPackName)) + .setCircuitPackName(circuitPackName) + .setDegreeNumber(Uint32.valueOf(degreeNumber)) + .setInterfaceName(interfaceList.get(circuitPackName)).build(); } - private List createMcCapDegreeObject(List degrees, - Map mcCapabilityProfileMap, String nodeId) { - List mcCapabilitiesList = new ArrayList<>(); - for (Degree degree : degrees) { - if (!degree.getMcCapabilityProfileName().isEmpty()) { - for (String mcCapabilityProfileName : degree.getMcCapabilityProfileName()) { - McCapabilityProfileKey mcKey = new McCapabilityProfileKey(mcCapabilityProfileName); - McCapabilityProfile mcCapabilityProfile = mcCapabilityProfileMap.get(mcKey); - String mcNodeName = "DEG" + degree.getDegreeNumber().toString() + "-TTP-" + mcCapabilityProfile; - McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder() - .withKey(new McCapabilitiesKey(mcNodeName)) - .setMcNodeName(mcNodeName); - mcCapabilitiesBuilder - .setCenterFreqGranularity(mcCapabilityProfile.getCenterFreqGranularity()) - .setSlotWidthGranularity(mcCapabilityProfile.getSlotWidthGranularity()); - mcCapabilitiesList.add(mcCapabilitiesBuilder.build()); - } // end for - } - else { - LOG.warn("No MC profiles are found for node {} on degree {}", nodeId, degree.getDegreeNumber()); - LOG.warn("Assuming the fixed grid capabilities for degree {}", degree.getDegreeNumber()); - LOG.warn("Assuming a default MC profile-name for degree {}", degree.getDegreeNumber()); + private Map createMcCapDegreeObject(Map degrees, + Map mcCapabilityProfileMap, String nodeId) { + //TODO some divergences here with 2.2.1 + Map mcCapabilitiesMap = new HashMap<>(); + for (Degree degree : degrees.values()) { + + if ((degree.getMcCapabilityProfileName() == null) || (degree.getMcCapabilityProfileName().isEmpty())) { + LOG.warn("{} : No MC profiles are found on degree {} - " + + "assuming the fixed grid capabilities and a default profile-name", + nodeId, degree.getDegreeNumber()); String mcNodeName = "DEG" + degree.getDegreeNumber().toString() + "-TTP-" + "default-profile"; McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder() .withKey(new McCapabilitiesKey(mcNodeName)) @@ -912,33 +764,37 @@ public class PortMappingVersion710 { mcCapabilitiesBuilder .setCenterFreqGranularity(FrequencyGHz.getDefaultInstance("50")) .setSlotWidthGranularity(FrequencyGHz.getDefaultInstance("50")); + mcCapabilitiesMap.put(mcCapabilitiesBuilder.key(), mcCapabilitiesBuilder.build()); + continue; + } + + for (String mcCapabilityProfileName : degree.getMcCapabilityProfileName()) { + McCapabilityProfileKey mcKey = new McCapabilityProfileKey(mcCapabilityProfileName); + McCapabilityProfile mcCapabilityProfile = mcCapabilityProfileMap.get(mcKey); + String mcNodeName = "DEG" + degree.getDegreeNumber().toString() + "-TTP-" + mcCapabilityProfile; + McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder() + .withKey(new McCapabilitiesKey(mcNodeName)) + .setMcNodeName(mcNodeName); + mcCapabilitiesBuilder + .setCenterFreqGranularity(mcCapabilityProfile.getCenterFreqGranularity()) + .setSlotWidthGranularity(mcCapabilityProfile.getSlotWidthGranularity()); + mcCapabilitiesMap.put(mcCapabilitiesBuilder.key(), mcCapabilitiesBuilder.build()); } + } - return mcCapabilitiesList; + return mcCapabilitiesMap; } - private List createMcCapSrgObject(List srgs, - Map mcCapabilityProfileMap, String nodeId) { - List mcCapabilitiesList = new ArrayList<>(); + private Map createMcCapSrgObject(List srgs, + Map mcCapabilityProfileMap, String nodeId) { + + Map mcCapabilitiesMap = new HashMap<>(); for (SharedRiskGroup srg : srgs) { - if (!srg.getMcCapabilityProfileName().isEmpty()) { - for (String mcCapabilityProfileName : srg.getMcCapabilityProfileName()) { - McCapabilityProfileKey mcKey = new McCapabilityProfileKey(mcCapabilityProfileName); - McCapabilityProfile mcCapabilityProfile = mcCapabilityProfileMap.get(mcKey); - String mcNodeName = "SRG" + srg.getSrgNumber().toString() + "-PP-" + mcCapabilityProfile; - McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder() - .withKey(new McCapabilitiesKey(mcNodeName)) - .setMcNodeName(mcNodeName); - mcCapabilitiesBuilder - .setCenterFreqGranularity(mcCapabilityProfile.getCenterFreqGranularity()) - .setSlotWidthGranularity(mcCapabilityProfile.getSlotWidthGranularity()); - mcCapabilitiesList.add(mcCapabilitiesBuilder.build()); - } // end for - } - else { - LOG.warn("No MC profiles are found for node {} on SRG {}", nodeId, srg.getSrgNumber()); - LOG.warn("Assuming the fixed grid capabilities for SRG {}", srg.getSrgNumber()); - LOG.warn("Assuming a default MC profile-name for SRG {}", srg.getSrgNumber()); + + if ((srg.getMcCapabilityProfileName() == null) || (srg.getMcCapabilityProfileName().isEmpty())) { + LOG.warn("{} : No MC profiles are found on SRG {} - " + + "assuming the fixed grid capabilities and a default MC profile-name", + nodeId, srg.getSrgNumber()); String mcNodeName = "SRG" + srg.getSrgNumber().toString() + "-PP-" + "default-profile"; McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder() .withKey(new McCapabilitiesKey(mcNodeName)) @@ -946,115 +802,273 @@ public class PortMappingVersion710 { mcCapabilitiesBuilder .setCenterFreqGranularity(FrequencyGHz.getDefaultInstance("50")) .setSlotWidthGranularity(FrequencyGHz.getDefaultInstance("50")); + mcCapabilitiesMap.put(mcCapabilitiesBuilder.key(), mcCapabilitiesBuilder.build()); + continue; + } + + for (String mcCapabilityProfileName : srg.getMcCapabilityProfileName()) { + McCapabilityProfileKey mcKey = new McCapabilityProfileKey(mcCapabilityProfileName); + McCapabilityProfile mcCapabilityProfile = mcCapabilityProfileMap.get(mcKey); + String mcNodeName = "SRG" + srg.getSrgNumber().toString() + "-PP-" + mcCapabilityProfile; + McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder() + .withKey(new McCapabilitiesKey(mcNodeName)) + .setMcNodeName(mcNodeName); + mcCapabilitiesBuilder + .setCenterFreqGranularity(mcCapabilityProfile.getCenterFreqGranularity()) + .setSlotWidthGranularity(mcCapabilityProfile.getSlotWidthGranularity()); + mcCapabilitiesMap.put(mcCapabilitiesBuilder.key(), mcCapabilitiesBuilder.build()); } } - return mcCapabilitiesList; + return mcCapabilitiesMap; } 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.getAdministrativeState() != null) { + mpBldr.setPortAdminState(port.getAdministrativeState().name()); + } + if (port.getOperationalState() != null) { + mpBldr.setPortOperState(port.getOperationalState().name()); + } + 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 {} was null!", nodeId, interfaces.getInterfaceName()); + continue; + } + LOG.debug("{} : interface get from device is {} and of type {}", + nodeId, 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 {} - ", + nodeId, interfaces.getInterfaceName(), ex); } } return mpBldr.build(); } - private Mapping createXpdrMappingObject(String nodeId, Ports ports, String circuitPackName, - String logicalConnectionPoint, String partnerLcp, Mapping mapping, String connectionMapLcp, - XpdrNodeTypes xpdrNodeType) { - MappingBuilder mpBldr; + private Mapping createXpdrMappingObject(String nodeId, Ports port, String circuitPackName, + String logicalConnectionPoint, String partnerLcp, Mapping mapping, String connectionMapLcp, + XpdrNodeTypes xpdrNodeType) { + + //TODO some divergens here with 2.2.1 if (mapping != null && connectionMapLcp != null) { // update existing mapping - mpBldr = new MappingBuilder(mapping).setConnectionMapLcp(connectionMapLcp); - } else { - // create a new mapping - String nodeIdLcp = nodeId + "-" + logicalConnectionPoint; - 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(ports.getPortName()) - .setPortDirection(ports.getPortDirection().getName()) + .setSupportingPort(port.getPortName()) + .setPortDirection(port.getPortDirection().getName()) .setLcpHashVal(FnvUtils.fnv1_64(nodeIdLcp)); - - if (ports.getPortQual() != null) { - mpBldr.setPortQual(ports.getPortQual().getName()); + if (port.getPortQual() != null) { + mpBldr.setPortQual(port.getPortQual().getName()); + } + if (xpdrNodeType != null) { + mpBldr.setXponderType(xpdrNodeType); + } + if (partnerLcp != null) { + mpBldr.setPartnerLcp(partnerLcp); + } + if (port.augmentation(Ports1.class) != null && port.augmentation(Ports1.class).getPortCapabilities() != null) { + List> supportedIntf = new ArrayList<>(); + Map supIfCapMap = port + .augmentation(Ports1.class).getPortCapabilities().nonnullSupportedInterfaceCapability(); + for (SupportedInterfaceCapability sic : supIfCapMap.values()) { + supportedIntf.add(sic.getIfCapType()); } + mpBldr.setSupportedInterfaceCapability(supportedIntf); + } + if (port.getAdministrativeState() != null) { + mpBldr.setPortAdminState(port.getAdministrativeState().name()); + } + if (port.getOperationalState() != null) { + mpBldr.setPortOperState(port.getOperationalState().name()); + } + return mpBldr.build(); + } - if (ports.augmentation(Ports1.class).getPortCapabilities().getSupportedInterfaceCapability() != null) { - mpBldr.setSupportedInterfaceCapability(getSupportedIfCapability(ports)); - } + private Ports getPort2(Ports port, String nodeId, String circuitPackName, StringBuilder circuitPackName2, + //circuitPackName2 will be updated by reference contrary to circuitPackName + List circuitPackList, Map lcpMap) { + if (!checkPartnerPortNotNull(port)) { + LOG.warn("{} : port {} on {} - Error in the configuration ", + nodeId, port.getPortName(), circuitPackName); + return null; + } + if (lcpMap.containsKey(circuitPackName + '+' + port.getPortName())) { + return null; + } + Optional cpOpt = circuitPackList.stream() + .filter( + cP -> cP.getCircuitPackName().equals(port.getPartnerPort().getCircuitPackName())) + .findFirst(); + if (!cpOpt.isPresent()) { + LOG.error("{} : Error fetching circuit-pack {}", + nodeId, port.getPartnerPort().getCircuitPackName()); + return null; + } + 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 {}", + nodeId, port.getPartnerPort().getPortName(), port.getPartnerPort().getCircuitPackName()); + return null; + } + Ports port2 = poOpt.get(); + circuitPackName2.append(cpOpt.get().getCircuitPackName()); + if (!checkPartnerPort(circuitPackName, port, port2)) { + LOG.error("{} : port {} on {} is not a correct partner port of {} on {}", + nodeId, port2.getPortName(), circuitPackName2, port.getPortName(), circuitPackName); + return null; + } + return port2; + } - if (xpdrNodeType != null) { - mpBldr.setXponderType(xpdrNodeType); - } - if (partnerLcp != null) { - mpBldr.setPartnerLcp(partnerLcp); - } + + private void putXpdrLcpsInMaps(int line, String nodeId, + Integer xponderNb, XpdrNodeTypes xponderType, + String circuitPackName, String circuitPackName2, Ports port, Ports port2, + Map lcpMap, Map mappingMap) { + String lcp1 = createXpdrLogicalConnectionPort(xponderNb, line, StringConstants.NETWORK_TOKEN); + String lcp2 = createXpdrLogicalConnectionPort(xponderNb, line + 1, StringConstants.NETWORK_TOKEN); + if (lcpMap.containsKey(lcp1) || lcpMap.containsKey(lcp2)) { + LOG.warn("{} : mapping already exists for {} or {}", nodeId, lcp1, lcp2); + return; } - return mpBldr.build(); + lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp1); + lcpMap.put(circuitPackName2 + '+' + port2.getPortName(), lcp2); + mappingMap.put(lcp1, + createXpdrMappingObject(nodeId, port, circuitPackName, lcp1, lcp2, null, null, xponderType)); + mappingMap.put(lcp2, + createXpdrMappingObject(nodeId, port2, circuitPackName2, lcp2, lcp1, null, null, xponderType)); + return; } + private int[] fillXpdrLcpsMaps(int line, int client, String nodeId, + Integer xponderNb, XpdrNodeTypes xponderType, + String circuitPackName, Ports port, + List circuitPackList, Map lcpMap, Map mappingMap) { + + if (port.getPortQual() == null) { + LOG.warn("{} : port {} on {} - PortQual was not found", + nodeId, port.getPortName(), circuitPackName); + return new int[] {line, client}; + } + + switch (port.getPortQual()) { - private List> getSupportedIfCapability(Ports ports) { - Map supportedInterfaceCapabilityMap = - ports.augmentation(Ports1.class).getPortCapabilities().getSupportedInterfaceCapability(); - List> supportedInterfaceCapabilityList = new ArrayList<>(); + case XpdrClient: + case SwitchClient: + String lcp0 = createXpdrLogicalConnectionPort(xponderNb, client, StringConstants.CLIENT_TOKEN); + lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp0); + mappingMap.put(lcp0, + createXpdrMappingObject(nodeId, port, circuitPackName, lcp0, null, null, null, null)); + client++; + break; + + case XpdrNetwork: + case SwitchNetwork: + line = fillXpdrNetworkLcpsMaps(line, nodeId, + xponderNb, xponderType, + circuitPackName, port, + circuitPackList, lcpMap, mappingMap); + break; - supportedInterfaceCapabilityMap.forEach((k, v) -> supportedInterfaceCapabilityList.add(k.getIfCapType())); - return supportedInterfaceCapabilityList; + default: + LOG.error("{} : port {} on {} - unsupported PortQual {}", + nodeId, port.getPortName(), circuitPackName, port.getPortQual()); + } + return new int[] {line, client}; } - private boolean createMcCapabilitiesList(String nodeId, Info deviceInfo, List mcCapabilitiesList) { - List degrees = getDegrees(nodeId, deviceInfo); - List srgs = getSrgs(nodeId, deviceInfo); - mcCapabilitiesList.addAll(getMcCapabilitiesList(degrees, srgs, deviceInfo, nodeId)); + private int fillXpdrNetworkLcpsMaps(int line, String nodeId, + Integer xponderNb, XpdrNodeTypes xponderType, + String circuitPackName, Ports port, + List circuitPackList, Map lcpMap, Map mappingMap) { + + switch (port.getPortDirection()) { + + case Bidirectional: + String lcp = createXpdrLogicalConnectionPort(xponderNb, line, StringConstants.NETWORK_TOKEN); + lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp); + mappingMap.put(lcp, + createXpdrMappingObject(nodeId, port, circuitPackName, lcp, null, null, null, xponderType)); + line++; + break; + + case Rx: + case Tx: + StringBuilder circuitPackName2 = new StringBuilder(); + Ports port2 = getPort2(port, nodeId, circuitPackName, circuitPackName2, + circuitPackList, lcpMap); + + if (port2 == null) { + //key already present or an error occured and was logged + return line; + } + + putXpdrLcpsInMaps(line, nodeId, xponderNb, xponderType, + circuitPackName, circuitPackName2.toString(), port, port2, + lcpMap, mappingMap); + line += 2; + break; + default: + LOG.error("{} : port {} on {} - unsupported Direction {}", + nodeId, port.getPortName(), circuitPackName, port.getPortDirection()); + } + + return line; + } + + private boolean createMcCapabilitiesList(String nodeId, Info deviceInfo, + Map mcCapabilitiesMap) { + Map degrees = getDegreesMap(nodeId, deviceInfo); + List srgs = getSrgs(nodeId, deviceInfo); + mcCapabilitiesMap.putAll(getMcCapabilities(degrees, srgs, deviceInfo, nodeId)); return true; } - //some LOG messages are too long - @SuppressWarnings("checkstyle:linelength") - @SuppressFBWarnings("DM_CONVERT_CASE") private boolean createTtpPortMapping(String nodeId, Info deviceInfo, List portMapList) { // Creating mapping data for degree TTP's - List degrees = getDegrees(nodeId, deviceInfo); + Map degrees = getDegreesMap(nodeId, deviceInfo); Map interfaceList = getEthInterfaceList(nodeId); - List cpToDegreeList = getCpToDegreeList(degrees, nodeId, interfaceList); - LOG.info("Map looks like this {}", interfaceList); + List cpToDegreeList = getCpToDegreeList(degrees, interfaceList); + LOG.info("{} : Map looks like this {}", nodeId, interfaceList); postPortMapping(nodeId, null, null, cpToDegreeList, null, null); Map> connectionPortMap = getPerDegreePorts(nodeId, deviceInfo); @@ -1063,41 +1077,47 @@ public class PortMappingVersion710 { 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.debug("{} : Fetching connection-port {} at circuit pack {}", + nodeId, + connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), + 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 { - 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); + if (!portObject.isPresent()) { + LOG.error("{} : No port {} on circuit pack {}", + nodeId, + connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), + connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName()); 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("{} : port {} on {} - Impossible to create logical connection point" + + " - Error in configuration with port-qual or port-direction", + nodeId, port.getPortName(), + connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName()); + continue; + } + String logicalConnectionPoint = new StringBuilder("DEG") + .append(cpMapEntry.getKey()) + .append("-TTP-TXRX") + .toString(); + LOG.info("{} : Logical Connection Point for {} on {} is {}", + nodeId, + port.getPortName(), connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), + logicalConnectionPoint); + portMapList.add(createMappingObject(nodeId, port, + connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), + logicalConnectionPoint)); break; case 2: // ports are unidirectionals @@ -1105,107 +1125,114 @@ public class PortMappingVersion710 { 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.debug("{} : Fetching connection-port {} at circuit pack {}", + nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), 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())); - LOG.info("Fetching connection-port {} at circuit pack {}", - connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName().toString(), cp2Name); + .child(Ports.class, + new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName().toString())); + LOG.debug("{} : Fetching connection-port {} at circuit pack {}", + nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName(), 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 { - 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); + if (!port1Object.isPresent() || !port2Object.isPresent()) { + LOG.error("{} : No port {} on circuit pack {}", + nodeId, + connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), + connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName()); 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 {}" + + " - Error in configuration with port-qual", + nodeId, port1.getPortName(), port2.getPortName()); + continue; + } + if (!checkPartnerPort(cp1Name, port1, port2)) { + LOG.error("{} : port {} on {} is not a correct partner port of {} on {}", + nodeId, 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 {}", + nodeId, 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); + LOG.error("{} : Number of connection port for DEG{} is incorrect", nodeId, cpMapEntry.getKey()); continue; } } return true; } - private NodeInfo createNodeInfo(Info deviceInfo, String nodeId) { - NodeInfoBuilder nodeInfoBldr = new NodeInfoBuilder(); + private NodeInfo createNodeInfo(Info deviceInfo) { + if (deviceInfo.getNodeType() == null) { // TODO make mandatory in yang LOG.error("Node type field is missing"); return null; } - nodeInfoBldr.setOpenroadmVersion(OpenroadmVersion._710).setNodeType(deviceInfo.getNodeType()); + NodeInfoBuilder nodeInfoBldr = new NodeInfoBuilder() + .setOpenroadmVersion(OpenroadmVersion._710) + .setNodeType(deviceInfo.getNodeType()); + // TODO: 221 versions expects an int value - need to check whether it is bug or an evolution here 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(); } + }