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=1cc524d23ba7772500d9a2e5ffb4cfc20501bc32;hb=4378fca1d31d1f75c0480c752aa711fb885e6135;hp=92a547c9d1686a1f53b156724834796d5e6c8c7e;hpb=1bf7f298852d03faf47011c75978ce44bee135d7;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 92a547c9d..1cc524d23 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 @@ -19,31 +19,36 @@ import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNull; -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.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.rev200128.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.NetworkBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.NodesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.CpToDegree; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.CpToDegreeBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.CpToDegreeKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.NodeInfo; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.NodeInfo.OpenroadmVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.NodeInfoBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.SwitchingPoolLcp; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.SwitchingPoolLcpBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.switching.pool.lcp.NonBlockingList; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.switching.pool.lcp.NonBlockingListBuilder; import org.opendaylight.yang.gen.v1.http.org.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; @@ -57,10 +62,14 @@ 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; @@ -99,7 +108,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,7 +143,7 @@ public class PortMappingVersion221 { break; } - return postPortMapping(nodeId, nodeInfo, portMapList, null); + return postPortMapping(nodeId, nodeInfo, portMapList, null, null); } public boolean updateMapping(String nodeId, Mapping oldMapping) { @@ -178,137 +187,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 = 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 = 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(); + 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 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,12 +719,13 @@ 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(); @@ -589,7 +735,6 @@ public class PortMappingVersion221 { try { commit.get(); return true; - } catch (InterruptedException | ExecutionException e) { LOG.warn("Failed to post {}", network, e); return false; @@ -642,16 +787,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 +804,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); } @@ -674,7 +825,7 @@ public class PortMappingVersion221 { 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()) { @@ -695,7 +846,7 @@ 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") .toString(); @@ -706,7 +857,8 @@ public class PortMappingVersion221 { connectionPortMap.get(k).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", + "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); } } else { @@ -741,8 +893,8 @@ 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 @@ -751,8 +903,8 @@ public class PortMappingVersion221 { && 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 @@ -776,7 +928,8 @@ public class PortMappingVersion221 { .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 {