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=e84eefbe4d232640d02d3f7a161b7f55105998f6;hb=04b9194abd5955a6ce7334a25ee55aa18ed2e776;hp=2ff91ffe1acd53b1b37a1f2d5e83cf924d34ccbd;hpb=7600ff43d8769cc58fd46d908f29d39129133853;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 2ff91ffe1..e84eefbe4 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 @@ -8,41 +8,49 @@ package org.opendaylight.transportpce.common.mapping; -import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.FluentFuture; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; - -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.eclipse.jdt.annotation.NonNull; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.WriteTransaction; +import org.opendaylight.mdsal.common.api.CommitInfo; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.StringConstants; 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.rev190702.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.NetworkBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.NodesBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.NodesKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.CpToDegree; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.CpToDegreeBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.CpToDegreeKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.MappingBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.MappingKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.NodeInfo; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.NodeInfo.OpenroadmVersion; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.NodeInfoBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.NetworkBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.NodesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.CpToDegree; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.CpToDegreeBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.CpToDegreeKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.NodeInfo; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.NodeInfo.OpenroadmVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.NodeInfoBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.SwitchingPoolLcp; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.SwitchingPoolLcpBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.switching.pool.lcp.NonBlockingList; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.switching.pool.lcp.NonBlockingListBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.Direction; -import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.Port; +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; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.CircuitPack; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.circuit.pack.Ports; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.circuit.pack.PortsKey; @@ -56,14 +64,18 @@ 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.Degree; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.DegreeKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.Info; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.OduSwitchingPools; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.Protocols; 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.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.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; +import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev170626.OtnOdu; 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; @@ -72,7 +84,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class PortMappingVersion221 { - private static final Logger LOG = LoggerFactory.getLogger(PortMappingImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(PortMappingVersion221.class); private final DataBroker dataBroker; private final DeviceTransactionManager deviceTransactionManager; @@ -99,7 +111,7 @@ public class PortMappingVersion221 { if (nodeInfo == null) { return false; } else { - postPortMapping(nodeId, nodeInfo, null, null); + postPortMapping(nodeId, nodeInfo, null, null, null); } } else { LOG.warn("Device info subtree is absent for {}", nodeId); @@ -134,11 +146,10 @@ public class PortMappingVersion221 { break; } - return postPortMapping(nodeId, nodeInfo, portMapList, null); + return postPortMapping(nodeId, nodeInfo, portMapList, null, null); } public boolean updateMapping(String nodeId, Mapping oldMapping) { - LOG.info("Updating Mapping Data {} for node {}", oldMapping, nodeId); InstanceIdentifier portIId = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(oldMapping.getSupportingCircuitPackName())) .child(Ports.class, new PortsKey(oldMapping.getSupportingPort())); @@ -151,14 +162,15 @@ public class PortMappingVersion221 { 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); - ListenableFuture submit = writeTransaction.submit(); - submit.get(); + FluentFuture commit = writeTransaction.commit(); + commit.get(); return true; } return false; @@ -178,137 +190,283 @@ 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 { + 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; - if (!deviceObject.isPresent() || deviceObject.get().getCircuitPacks() == null) { - LOG.warn("Circuit Packs are not present for {}", nodeId); - return false; - // TODO return false or continue? - } Map lcpMap = new HashMap<>(); Map mappingMap = new HashMap<>(); - List circuitPackList = deviceObject.get().getCircuitPacks(); - circuitPackList.sort(Comparator.comparing(CircuitPack::getCircuitPackName)); - - 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 = cp.getPorts(); - 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); + List circuitPackList = null; + 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)); + } + if (device.getXponder() == null) { + LOG.warn("{} configuration does not contain a list of xponders", nodeId); + for (CircuitPacks cp : circuitPackList) { + String circuitPackName = cp.getCircuitPackName(); + if (cp.getPorts() == null) { + LOG.warn("Ports were not found for circuit pack: {}", circuitPackName); continue; } - if (Port.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)); - line++; - } else if (Port.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())) { + List portList = new ArrayList<>(cp.getPorts()); + 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; } - 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 ((Direction.Rx.getIntValue() == port.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(port.getPortName())) - || - (Direction.Tx.getIntValue() == port.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(port.getPortName()))) { - 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)); - mappingMap.put(lcp2, createXpdrMappingObject(nodeId, port2, cpOpt.get() - .getCircuitPackName(), lcp2, lcp1, null, null)); + 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.warn("mapping already exists for {} or {}", lcp1, lcp2); + LOG.error("port {} on {} is not a correct partner port of {} on {}", + port2.getPortName(), cpOpt.get().getCircuitPackName(), port.getPortName(), + circuitPackName); } - line += 2; } else { - LOG.error("port {} on {} is not a correct partner port of {} on {}", - port2.getPortName(), cpOpt.get().getCircuitPackName(), port.getPortName(), - circuitPackName); + LOG.error("Error fetching port {} on {} for {}", port.getPartnerPort().getPortName(), + port.getPartnerPort().getCircuitPackName(), nodeId); } } else { - LOG.error("Error fetching port {} on {} for {}", port.getPartnerPort().getPortName(), - port.getPartnerPort().getCircuitPackName(), nodeId); + 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.error("Error fetching circuit-pack {} for {}", port.getPartnerPort().getCircuitPackName(), + LOG.warn("Error in the configuration of port {} of {} for {}", port.getPortName(), + circuitPackName, nodeId); } - } else if (Port.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)); - client++; - } else { - LOG.warn("Error in the configuration of port {} of {} for {}", port.getPortName(), circuitPackName, - nodeId); } } - } - List connectionMap = deviceObject.get().getConnectionMap(); - 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); + } else { + LOG.info("{} configuration contains a list of xponders", nodeId); + for (Xponder xponder:deviceObject.get().getXponder()) { + line = 1; + client = 1; + Integer xponderNb = xponder.getXpdrNumber().toJava(); + XpdrNodeTypes xponderType = xponder.getXpdrType(); + for (XpdrPort xpdrPort : xponder.getXpdrPort()) { + 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 (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().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 { + 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); + } + } } - String dkey = cm.getDestination().get(0).getCircuitPackName() + "+" - + cm.getDestination().get(0).getPortName(); - if (lcpMap.containsKey(dkey)) { - dlcp = lcpMap.get(dkey); + } + + if (device.getConnectionMap() != null) { + List connectionMap = deviceObject.get().getConnectionMap(); + 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 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"); + } } - if (slcp != null) { - Mapping mapping = mappingMap.get(slcp); - mappingMap.remove(slcp); - portMapList.add(createXpdrMappingObject(nodeId, null, null, null, null, mapping, dlcp)); - } else { - LOG.error("Error in connection-map analysis"); + } else { + LOG.warn("No connection-map inside device configuration"); + } + if (device.getOduSwitchingPools() != null) { + List oduSwithcingPools = device.getOduSwitchingPools(); + List switchingPoolList = new ArrayList<>(); + for (OduSwitchingPools odp : oduSwithcingPools) { + List nblList = new ArrayList<>(); + 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()) { + 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()); + } + } + NonBlockingList nonBlockingList = new NonBlockingListBuilder() + .setNblNumber(nbl.getNblNumber()) + .setInterconnectBandwidth(nbl.getInterconnectBandwidth()) + .setInterconnectBandwidthUnit(nbl.getInterconnectBandwidthUnit()) + .setLcpList(lcpList) + .build(); + nblList.add(nonBlockingList); + } + } + SwitchingPoolLcp splBldr = new SwitchingPoolLcpBuilder() + .setSwitchingPoolNumber(odp.getSwitchingPoolNumber()) + .setSwitchingPoolType(odp.getSwitchingPoolType()) + .setNonBlockingList(nblList) + .build(); + switchingPoolList.add(splBldr); } + postPortMapping(nodeId, null, null, null, switchingPoolList); } + if (!mappingMap.isEmpty()) { - for (Mapping m : mappingMap.values()) { - portMapList.add(m); - } + mappingMap.forEach((k,v) -> portMapList.add(v)); } 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 { + return false; + } + } + private HashMap> getSrgCps(String deviceId, Info ordmInfo) { HashMap> srgCps = getSrgCps(nodeId, deviceInfo); - for (Integer k : srgCps.keySet()) { + for (Entry> srgCpEntry : srgCps.entrySet()) { List cpList = - srgCps.get(k); + srgCps.get(srgCpEntry.getKey()); List keys = new ArrayList<>(); for (org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.srg.CircuitPacks cp : cpList) { String circuitPackName = cp.getCircuitPackName(); @@ -362,28 +520,28 @@ public class PortMappingVersion221 { LOG.warn("{} : Circuit pack {} not found or without ports.", nodeId, circuitPackName); continue; } - List portList = circuitPackObject.get().getPorts(); + List portList = new ArrayList<>(circuitPackObject.get().getPorts()); Collections.sort(portList, new SortPort221ByName()); int portIndex = 1; for (Ports port : portList) { String currentKey = circuitPackName + "-" + port.getPortName(); if (port.getPortQual() == null) { continue; - } else if (Port.PortQual.RoadmExternal.getIntValue() == port.getPortQual().getIntValue() + } else if (PortQual.RoadmExternal.getIntValue() == port.getPortQual().getIntValue() && Direction.Bidirectional.getIntValue() == port.getPortDirection().getIntValue() && !keys.contains(currentKey)) { - String logicalConnectionPoint = createLogicalConnectionPort(port, k, portIndex); + 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 (Port.PortQual.RoadmExternal.getIntValue() == port.getPortQual().getIntValue() + } 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, k, portIndex); + 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) @@ -394,20 +552,10 @@ public class PortMappingVersion221 { Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); if (port2Object.isPresent() && port2Object.get().getPortQual().getIntValue() - == Port.PortQual.RoadmExternal.getIntValue()) { + == PortQual.RoadmExternal.getIntValue()) { Ports port2 = port2Object.get(); - if ((port.getPortDirection().getIntValue() == Direction.Rx.getIntValue() - && port2.getPortDirection().getIntValue() == Direction.Tx.getIntValue() - && port2.getPartnerPort() != null - && port2.getPartnerPort().getCircuitPackName().equals(circuitPackName) - && port2.getPartnerPort().getPortName().toString().equals(port.getPortName())) - || - (port.getPortDirection().getIntValue() == Direction.Tx.getIntValue() - && port2.getPortDirection().getIntValue() == Direction.Rx.getIntValue() - && port2.getPartnerPort() != null - && port2.getPartnerPort().getCircuitPackName().equals(circuitPackName) - && port2.getPartnerPort().getPortName().toString().equals(port.getPortName()))) { - String logicalConnectionPoint2 = createLogicalConnectionPort(port2, k, portIndex); + 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, @@ -423,8 +571,9 @@ public class PortMappingVersion221 { portIndex++; } } else { - LOG.error("error getting partner port {} of {} - {}", port.getPartnerPort().getPortName() - .toString(), port.getPartnerPort().getCircuitPackName(), nodeId); + LOG.error("error getting partner port {} of {} - {}", + port.getPartnerPort().getPortName().toString(), + port.getPartnerPort().getCircuitPackName(), nodeId); continue; } } else { @@ -462,7 +611,7 @@ public class PortMappingVersion221 { // 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(); + maxDegree = ordmInfo.getMaxDegrees().toJava(); } else { maxDegree = 20; } @@ -478,7 +627,7 @@ public class PortMappingVersion221 { degrees.add(ordmDegreeObject.get()); } } - LOG.info("Device {} has {} degree", degrees.size()); + LOG.info("Device {} has {} degree", deviceId, degrees.size()); return degrees; } @@ -487,7 +636,7 @@ public class PortMappingVersion221 { Integer maxDegree; if (ordmInfo.getMaxDegrees() != null) { - maxDegree = ordmInfo.getMaxDegrees(); + maxDegree = ordmInfo.getMaxDegrees().toJava(); } else { maxDegree = 20; } @@ -562,9 +711,8 @@ public class PortMappingVersion221 { } private boolean postPortMapping(String nodeId, NodeInfo nodeInfo, List portMapList, - List cp2DegreeList) { - NodesBuilder nodesBldr = new NodesBuilder(); - nodesBldr.withKey(new NodesKey(nodeId)).setNodeId(nodeId); + List cp2DegreeList, List splList) { + NodesBuilder nodesBldr = new NodesBuilder().withKey(new NodesKey(nodeId)).setNodeId(nodeId); if (nodeInfo != null) { nodesBldr.setNodeInfo(nodeInfo); } @@ -574,22 +722,22 @@ public class PortMappingVersion221 { if (cp2DegreeList != null) { nodesBldr.setCpToDegree(cp2DegreeList); } - + if (splList != null) { + nodesBldr.setSwitchingPoolLcp(splList); + } List nodesList = new ArrayList<>(); nodesList.add(nodesBldr.build()); - NetworkBuilder nwBldr = new NetworkBuilder(); - nwBldr.setNodes(nodesList); + NetworkBuilder nwBldr = new NetworkBuilder().setNodes(nodesList); final WriteTransaction writeTransaction = dataBroker.newWriteOnlyTransaction(); InstanceIdentifier nodesIID = InstanceIdentifier.builder(Network.class).build(); Network network = nwBldr.build(); writeTransaction.merge(LogicalDatastoreType.CONFIGURATION, nodesIID, network); - ListenableFuture submit = writeTransaction.submit(); + FluentFuture commit = writeTransaction.commit(); try { - submit.get(); + commit.get(); return true; - } catch (InterruptedException | ExecutionException e) { LOG.warn("Failed to post {}", network, e); return false; @@ -603,7 +751,7 @@ public class PortMappingVersion221 { interfaceName = interfaceList.get(circuitPackName); } return new CpToDegreeBuilder().withKey(new CpToDegreeKey(circuitPackName)).setCircuitPackName(circuitPackName) - .setDegreeNumber(new Long(degreeNumber)).setInterfaceName(interfaceName).build(); + .setDegreeNumber(Long.valueOf(degreeNumber)).setInterfaceName(interfaceName).build(); } private Mapping createMappingObject(String nodeId, Ports port, String circuitPackName, @@ -614,12 +762,15 @@ public class PortMappingVersion221 { .setPortDirection(port.getPortDirection().getName()); // Get OMS and OTS interface provisioned on the TTP's - if (logicalConnectionPoint.contains(StringConstants.TTP_TOKEN) && (port.getInterfaces() != null)) { + 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 @@ -629,6 +780,9 @@ public class PortMappingVersion221 { 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); } @@ -642,16 +796,16 @@ public class PortMappingVersion221 { } private Mapping createXpdrMappingObject(String nodeId, Ports port, String circuitPackName, - String logicalConnectionPoint, String partnerLcp, Mapping mapping, String assoLcp) { + String logicalConnectionPoint, String partnerLcp, Mapping mapping, String connectionMapLcp, + XpdrNodeTypes xpdrNodeType) { MappingBuilder mpBldr; - if (mapping != null && assoLcp != null) { + if (mapping != null && connectionMapLcp != null) { // update existing mapping - mpBldr = new MappingBuilder(mapping); - mpBldr.setAssociatedLcp(assoLcp); + mpBldr = new MappingBuilder(mapping).setConnectionMapLcp(connectionMapLcp); } else { // create a new mapping - mpBldr = new MappingBuilder(); - mpBldr.withKey(new MappingKey(logicalConnectionPoint)) + mpBldr = new MappingBuilder() + .withKey(new MappingKey(logicalConnectionPoint)) .setLogicalConnectionPoint(logicalConnectionPoint) .setSupportingCircuitPackName(circuitPackName) .setSupportingPort(port.getPortName()) @@ -659,6 +813,12 @@ public class PortMappingVersion221 { 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); } @@ -668,26 +828,27 @@ public class PortMappingVersion221 { //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 interfaceList = getEthInterfaceList(nodeId); List cpToDegreeList = getCpToDegreeList(degrees, nodeId, interfaceList); LOG.info("Map looks like this {}", interfaceList); - postPortMapping(nodeId, null, null, cpToDegreeList); + postPortMapping(nodeId, null, null, cpToDegreeList, null); Map> connectionPortMap = getPerDegreePorts(nodeId, deviceInfo); - for (Integer k : connectionPortMap.keySet()) { - switch (connectionPortMap.get(k).size()) { + for (Entry> cpMapEntry : connectionPortMap.entrySet()) { + switch (connectionPortMap.get(cpMapEntry.getKey()).size()) { case 1: // port is bidirectional InstanceIdentifier portID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(CircuitPacks.class, new CircuitPacksKey(connectionPortMap.get(k).get(0) + .child(CircuitPacks.class, new CircuitPacksKey(connectionPortMap.get(cpMapEntry.getKey()).get(0) .getCircuitPackName())) - .child(Ports.class, new PortsKey(connectionPortMap.get(k).get(0) + .child(Ports.class, new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0) .getPortName().toString())); - LOG.info("Fetching connection-port {} at circuit pack {}", connectionPortMap.get(k).get(0) - .getPortName().toString(), connectionPortMap.get(k).get(0).getCircuitPackName()); + 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); @@ -695,44 +856,45 @@ public class PortMappingVersion221 { Ports port = portObject.get(); if (port.getPortQual() == null) { continue; - } else if (Port.PortQual.RoadmExternal.getIntValue() == port.getPortQual().getIntValue() + } else if (PortQual.RoadmExternal.getIntValue() == port.getPortQual().getIntValue() && Direction.Bidirectional.getIntValue() == port.getPortDirection().getIntValue()) { - String logicalConnectionPoint = new StringBuilder("DEG").append(k).append("-TTP-TXRX") + String logicalConnectionPoint = new StringBuilder("DEG").append(cpMapEntry.getKey()).append("-TTP-TXRX") .toString(); LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId, - connectionPortMap.get(k).get(0).getCircuitPackName(), port.getPortName(), + connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), port.getPortName(), logicalConnectionPoint); portMapList.add(createMappingObject(nodeId, port, - connectionPortMap.get(k).get(0).getCircuitPackName(), logicalConnectionPoint)); + 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(k).get(0).getCircuitPackName(), nodeId); + "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(k).get(0).getPortName().toString(), - connectionPortMap.get(k).get(0).getCircuitPackName(), nodeId); + connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString(), + connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), nodeId); return false; } break; case 2: // ports are unidirectionals - String cp1Name = connectionPortMap.get(k).get(0).getCircuitPackName(); - String cp2Name = connectionPortMap.get(k).get(1).getCircuitPackName(); + String cp1Name = connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(); + 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(k).get(0).getPortName().toString())); - LOG.info("Fetching connection-port {} at circuit pack {}", connectionPortMap.get(k).get(0) + .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(k).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(k).get(1).getPortName().toString(), cp2Name); + 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); @@ -741,54 +903,55 @@ public class PortMappingVersion221 { Ports port2 = port2Object.get(); if (port1.getPortQual() == null || port2.getPortQual() == null) { continue; - } else if ((Port.PortQual.RoadmExternal.getIntValue() == port1.getPortQual().getIntValue() - && Port.PortQual.RoadmExternal.getIntValue() == port2.getPortQual().getIntValue() + } 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().toString()) + && port1.getPartnerPort().getPortName().equals(port2.getPortName()) && port2.getPartnerPort().getCircuitPackName().equals(cp1Name) && port2.getPartnerPort().getPortName().equals(port1.getPortName())) || - (Port.PortQual.RoadmExternal.getIntValue() == port1.getPortQual().getIntValue() - && Port.PortQual.RoadmExternal.getIntValue() == port2.getPortQual().getIntValue() + (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().toString()) + && port1.getPartnerPort().getPortName().equals(port2.getPortName()) && port2.getPartnerPort().getCircuitPackName().equals(cp1Name) - && port2.getPartnerPort().getPortName().equals(port1.getPortName().toString()))) { - String logicalConnectionPoint1 = new StringBuilder("DEG").append(k).append("-TTP-") + && 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(k).get(0).getCircuitPackName(), port1.getPortName(), + connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), port1.getPortName(), logicalConnectionPoint1); - portMapList.add(createMappingObject(nodeId, port1, connectionPortMap.get(k).get(0) + portMapList.add(createMappingObject(nodeId, port1, connectionPortMap.get(cpMapEntry.getKey()).get(0) .getCircuitPackName(), logicalConnectionPoint1)); - String logicalConnectionPoint2 = new StringBuilder("DEG").append(k).append("-TTP-") + 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(k).get(1).getCircuitPackName(), port2.getPortName(), + connectionPortMap.get(cpMapEntry.getKey()).get(1).getCircuitPackName(), port2.getPortName(), logicalConnectionPoint2); - portMapList.add(createMappingObject(nodeId, port2, connectionPortMap.get(k).get(1) + 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", + "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(k).get(0).getPortName().toString(), - connectionPortMap.get(k).get(0).getCircuitPackName(), nodeId); + connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString(), + connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), nodeId); return false; } break; default: - LOG.error("Number of connection port for DEG{} on {} is incorrect", k, nodeId); + LOG.error("Number of connection port for DEG{} on {} is incorrect", cpMapEntry.getKey(), nodeId); continue; } } @@ -798,9 +961,7 @@ public class PortMappingVersion221 { private NodeInfo createNodeInfo(Info deviceInfo) { NodeInfoBuilder nodeInfoBldr = new NodeInfoBuilder(); if (deviceInfo.getNodeType() != null) { - nodeInfoBldr = new NodeInfoBuilder() - .setOpenroadmVersion(OpenroadmVersion._221) - .setNodeType(deviceInfo.getNodeType()); + nodeInfoBldr.setOpenroadmVersion(OpenroadmVersion._221).setNodeType(deviceInfo.getNodeType()); if (deviceInfo.getClli() != null && !deviceInfo.getClli().isEmpty()) { nodeInfoBldr.setNodeClli(deviceInfo.getClli()); } else {