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=207d0bad6c6a122aa8fa44090a31b9e1f8476ca8;hb=268165cb2822b6ce4c55f00cac63eed2bb222ec7;hp=9687e666c280d98f4c9f2af891fdb5070333cd72;hpb=a506290d8abacdebd23a8b3dc1e671ee7601e7af;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 9687e666c..207d0bad6 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 @@ -19,41 +19,42 @@ import java.util.Locale; import java.util.Map; import java.util.Map.Entry; import java.util.Optional; +import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.ReadTransaction; 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.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.opendaylight.transportpce.portmapping.rev220316.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.NetworkBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.OpenroadmNodeVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.cp.to.degree.CpToDegree; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.cp.to.degree.CpToDegreeBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.cp.to.degree.CpToDegreeKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mc.capabilities.McCapabilities; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mc.capabilities.McCapabilitiesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mc.capabilities.McCapabilitiesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mpdr.restrictions.grp.MpdrRestrictionsBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.NodesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.nodes.NodeInfo; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.nodes.NodeInfoBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.switching.pool.lcp.SwitchingPoolLcp; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.switching.pool.lcp.SwitchingPoolLcpBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.switching.pool.lcp.SwitchingPoolLcpKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.switching.pool.lcp.switching.pool.lcp.NonBlockingList; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.switching.pool.lcp.switching.pool.lcp.NonBlockingListBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.switching.pool.lcp.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; @@ -71,6 +72,8 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.open import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device.container.org.openroadm.device.Info; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device.container.org.openroadm.device.McCapabilityProfile; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device.container.org.openroadm.device.McCapabilityProfileKey; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device.container.org.openroadm.device.MuxpProfile; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device.container.org.openroadm.device.MuxpProfileKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device.container.org.openroadm.device.OduSwitchingPools; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device.container.org.openroadm.device.Protocols; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device.container.org.openroadm.device.SharedRiskGroup; @@ -80,34 +83,39 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.open import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device.container.org.openroadm.device.odu.switching.pools.non.blocking.list.PortList; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.port.Interfaces; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.xponder.XpdrPort; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.NodeTypes; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.PortQual; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.XpdrNodeTypes; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev191129.InterfaceType; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev191129.OpenROADMOpticalMultiplex; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev191129.OpticalTransport; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev191129.OtnOdu; +import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev191129.OtnOtu; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev200529.Protocols1; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev200529.lldp.container.Lldp; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev200529.lldp.container.lldp.PortConfig; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.OpucnTribSlotDef; 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.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; 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 static final Set TXRX_SET = Set.of(Direction.Tx.getIntValue(), Direction.Rx.getIntValue()); private final DataBroker dataBroker; private final DeviceTransactionManager deviceTransactionManager; - private final OpenRoadmInterfaces openRoadmInterfaces; static { SUFFIX = Map.of( @@ -116,23 +124,21 @@ public class PortMappingVersion710 { Direction.Bidirectional, "TXRX"); } - public PortMappingVersion710(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager, - OpenRoadmInterfaces openRoadmInterfaces) { + public PortMappingVersion710(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager) { this.dataBroker = dataBroker; this.deviceTransactionManager = deviceTransactionManager; - this.openRoadmInterfaces = openRoadmInterfaces; } public boolean createMappingData(String nodeId) { - LOG.info("{} : OpenROADM version 7.1.0 node - Creating Mapping Data", nodeId); + LOG.info(PortMappingUtils.CREATE_MAPPING_DATA_LOGMSG, nodeId, "7.1"); List portMapList = 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); - if (!deviceInfoOptional.isPresent()) { - LOG.warn("{} : Device info subtree is absent", nodeId); + if (deviceInfoOptional.isEmpty()) { + LOG.warn(PortMappingUtils.DEVICE_HAS_LOGMSG, nodeId, "no info", "subtree"); return false; } Info deviceInfo = deviceInfoOptional.get(); @@ -148,31 +154,40 @@ 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", nodeId); + LOG.warn(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, PortMappingUtils.CREATE, "TTP's"); 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", nodeId); + LOG.warn(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, PortMappingUtils.CREATE, "PP's"); return false; } // Get MC capabilities if (!createMcCapabilitiesList(nodeId, deviceInfo, mcCapabilities)) { // return false if MC capabilites failed - LOG.warn("{} : Unable to create MC capabilities", nodeId); + LOG.warn(PortMappingUtils.UNABLE_MC_CAPA_LOGMSG, nodeId); return false; } break; case Xpdr: if (!createXpdrPortMapping(nodeId, portMapList)) { - LOG.warn("{} : Unable to create mapping for the Xponder", nodeId); + LOG.warn(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, PortMappingUtils.CREATE, "Xponder"); + return false; + } + // In the case of 7.1 models, even XPDR advertizes mc-capabilities, + // hence we need to populate this information into the port-mapping data + // Get MC capabilities + if (!createMcCapabilitiesList(nodeId, deviceInfo, mcCapabilities)) { + // return false if MC capabilites failed + LOG.warn(PortMappingUtils.UNABLE_MC_CAPA_LOGMSG, nodeId); return false; } break; default: - LOG.error("{} : unknown nodetype - Unable to create mapping", nodeId); + LOG.error(PortMappingUtils.UNABLE_MAPPING_LOGMSG, + nodeId, PortMappingUtils.CREATE, deviceInfo.getNodeType() + " - unknown nodetype"); break; } @@ -180,19 +195,23 @@ public class PortMappingVersion710 { } public boolean updateMapping(String nodeId, Mapping oldMapping) { + if (nodeId == null) { + LOG.error(PortMappingUtils.UNABLE_MAPPING_LOGMSG, "node id null" , PortMappingUtils.UPDATE, "a null value"); + return false; + } + if (oldMapping == null) { + LOG.error(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, PortMappingUtils.UPDATE, "a null value"); + return false; + } InstanceIdentifier portId = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(oldMapping.getSupportingCircuitPackName())) .child(Ports.class, new PortsKey(oldMapping.getSupportingPort())); - if ((oldMapping == null) || (nodeId == null)) { - LOG.error("Impossible to update mapping"); - return false; - } try { Ports port = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, portId, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT).get(); Mapping newMapping = updateMappingObject(nodeId, port, oldMapping); - LOG.debug("{} : Updating old mapping Data {} for {} by new mapping data {}", - nodeId, oldMapping, oldMapping.getLogicalConnectionPoint(), newMapping); + LOG.debug(PortMappingUtils.UPDATE_MAPPING_LOGMSG, + nodeId, oldMapping, oldMapping.getLogicalConnectionPoint(), newMapping); final WriteTransaction writeTransaction = this.dataBroker.newWriteOnlyTransaction(); InstanceIdentifier mapIID = InstanceIdentifier.create(Network.class) .child(Nodes.class, new NodesKey(nodeId)) @@ -202,34 +221,137 @@ public class PortMappingVersion710 { commit.get(); return true; } catch (InterruptedException | ExecutionException e) { - LOG.error("{} : exception when updating Mapping {} - ", - nodeId, oldMapping.getLogicalConnectionPoint(), e); + LOG.error(PortMappingUtils.UNABLE_MAPPING_LOGMSG, + nodeId, PortMappingUtils.UPDATE, oldMapping.getLogicalConnectionPoint(), e); + return false; + } + } + + public boolean updatePortMappingWithOduSwitchingPools(String nodeId, InstanceIdentifier ospIID, + Map>> nbliidMap) { + + KeyedInstanceIdentifier portMappingNodeIID = + InstanceIdentifier.create(Network.class).child(Nodes.class, new NodesKey(nodeId)); + Nodes portmappingNode = null; + try (ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction()) { + portmappingNode = readTx.read(LogicalDatastoreType.CONFIGURATION, portMappingNodeIID).get().get(); + } catch (InterruptedException | ExecutionException ex) { + LOG.error("Unable to read the port-mapping for nodeId {}", nodeId, ex); + } + if (portmappingNode == null) { return false; } + + OduSwitchingPools osp = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, + ospIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT).get(); + Uint16 ospNumber = osp.getSwitchingPoolNumber(); + Map splMap = + new HashMap(portmappingNode.nonnullSwitchingPoolLcp()); + SwitchingPoolLcpBuilder splBldr = splMap.containsKey(new SwitchingPoolLcpKey(ospNumber)) + ? new SwitchingPoolLcpBuilder(splMap.get(new SwitchingPoolLcpKey(ospNumber))) + : new SwitchingPoolLcpBuilder().setSwitchingPoolNumber(ospNumber) + .setSwitchingPoolType(osp.getSwitchingPoolType()); + Map nblMap = new HashMap<>(); + for (Entry>> entry : nbliidMap.entrySet()) { + NonBlockingList nbl = createNonBlockingList( + splBldr, + osp.getNonBlockingList() + .get(new org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529 + .org.openroadm.device.container.org.openroadm.device.odu.switching.pools + .NonBlockingListKey(entry.getKey())) + .getInterconnectBandwidth(), + entry, + portmappingNode.nonnullMapping(), + nodeId); + if (nbl == null) { + return false; + } + nblMap.put(nbl.key(), nbl); + } + SwitchingPoolLcp switchingPoolLcp = splBldr.setNonBlockingList(nblMap).build(); + splMap.put(switchingPoolLcp.key(), switchingPoolLcp); + postPortMapping(nodeId, null, null, null, new ArrayList(splMap.values()), null); + return true; + } + + private NonBlockingList createNonBlockingList(SwitchingPoolLcpBuilder splBldr, Uint32 interconnectBw, + Entry>> entry, Map mappings, String nodeId) { + NonBlockingListBuilder nblBldr = splBldr.getNonBlockingList() == null + || !splBldr.getNonBlockingList().containsKey(new NonBlockingListKey(entry.getKey())) + ? new NonBlockingListBuilder().setNblNumber(entry.getKey()).setInterconnectBandwidth(interconnectBw) + : new NonBlockingListBuilder(splBldr.getNonBlockingList().get(new NonBlockingListKey(entry.getKey()))); + List lcpList = nblBldr.getLcpList() != null ? nblBldr.getLcpList() : new ArrayList<>(); + for (InstanceIdentifier id : entry.getValue()) { + PortList portList = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, + id, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT).get(); + String lcp = getLcpFromCpAndPort(mappings, portList.getCircuitPackName(), portList.getPortName()); + if (lcp == null || lcpList.contains(lcp)) { + return null; + } + lcpList.add(lcp); + } + return nblBldr.setLcpList(lcpList).build(); } private boolean createXpdrPortMapping(String nodeId, List portMapList) { // Creating for Xponder Line and Client Ports + OrgOpenroadmDevice device = getXpdrDevice(nodeId); + if (device == null) { + return false; + } + Map lcpMap = new HashMap<>(); + Map mappingMap = new HashMap<>(); + getXpdrMaps(device, nodeId, lcpMap, mappingMap); + if (device.getConnectionMap() == null) { + LOG.warn(PortMappingUtils.NO_CONMAP_LOGMSG, nodeId); + } else { + for (ConnectionMap cm : device.nonnullConnectionMap().values()) { + String skey = cm.getSource().getCircuitPackName() + "+" + cm.getSource().getPortName(); + Destination destination0 = cm.nonnullDestination().values().iterator().next(); + String dkey = destination0.getCircuitPackName() + "+" + destination0.getPortName(); + if (!lcpMap.containsKey(skey)) { + LOG.error(PortMappingUtils.CONMAP_ISSUE_LOGMSG, nodeId, skey, dkey); + continue; + } + String slcp = lcpMap.get(skey); + Mapping mapping = mappingMap.get(slcp); + mappingMap.remove(slcp); + portMapList.add(createXpdrMappingObject(nodeId, null, null, null, null, mapping, + //dlcp + lcpMap.containsKey(dkey) ? lcpMap.get(dkey) : null, + null)); + } + } + if (device.getOduSwitchingPools() != null) { + postPortMapping(nodeId, null, null, null, getSwitchingPoolList(device, lcpMap, nodeId), null); + } + mappingMap.forEach((k,v) -> portMapList.add(v)); + return true; + } + + private OrgOpenroadmDevice getXpdrDevice(String nodeId) { InstanceIdentifier deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class); Optional deviceObject = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - if (!deviceObject.isPresent()) { - LOG.error("{} : Impossible to get device configuration", nodeId); - return false; + if (deviceObject.isEmpty()) { + LOG.error(PortMappingUtils.CANNOT_GET_DEV_CONF_LOGMSG, nodeId); + return null; } OrgOpenroadmDevice device = deviceObject.get(); if (device.getCircuitPacks() == null) { - LOG.warn("{} : Circuit Packs not present", nodeId); - return false; + LOG.warn(PortMappingUtils.MISSING_CP_LOGMSG, nodeId, PortMappingUtils.FOUND); + return null; } + return device; + } - Map lcpMap = new HashMap<>(); - Map mappingMap = new HashMap<>(); + private void getXpdrMaps(OrgOpenroadmDevice device, String nodeId, + Map lcpMap, Map mappingMap) { 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(PortMappingUtils.XPDR_LIST_IN_CONF_LOGMSG, nodeId, "not found"); // Variables to keep track of number of line ports and client ports int line = 1; int client = 1; @@ -238,22 +360,22 @@ public class PortMappingVersion710 { for (CircuitPacks cp : circuitPackList) { String circuitPackName = cp.getCircuitPackName(); if (cp.getPorts() == null) { - LOG.warn("{} : Ports were not found for circuit pack {}", nodeId, circuitPackName); + LOG.warn(PortMappingUtils.NO_PORT_ON_CP_LOGMSG, nodeId, PortMappingUtils.FOUND, circuitPackName); continue; } List portList = new ArrayList<>(cp.nonnullPorts().values()); portList.sort(Comparator.comparing(Ports::getPortName)); for (Ports port : portList) { int[] counters = fillXpdrLcpsMaps(line, client, nodeId, - 1, null, circuitPackName, port, + 1, XpdrNodeTypes.Tpdr, 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()) { + LOG.info(PortMappingUtils.XPDR_LIST_IN_CONF_LOGMSG, nodeId, PortMappingUtils.FOUND); + for (Xponder xponder : device.nonnullXponder().values()) { // Variables to keep track of number of line ports and client ports int line = 1; int client = 1; @@ -261,134 +383,97 @@ public class PortMappingVersion710 { XpdrNodeTypes xponderType = xponder.getXpdrType(); for (XpdrPort xpdrPort : xponder.nonnullXpdrPort().values().stream() .sorted((xp1, xp2) -> xp1.getIndex().compareTo(xp2.getIndex())).collect(Collectors.toList())) { - String circuitPackName = xpdrPort.getCircuitPackName(); - String portName = xpdrPort.getPortName().toString(); - // If there xponder-subtree has missing circuit-packs or ports, - // This gives a null-pointer expection, - if (device.nonnullCircuitPacks().values().stream() - .filter(cp -> cp.getCircuitPackName().equals(circuitPackName)) - .findFirst().isEmpty()) { - LOG.warn("{} : Circuit-pack {} is missing in the device - ignoring it in port-mapping", - nodeId, circuitPackName); + Ports port = getXpdrPorts(device, xpdrPort, nodeId); + if (port == null) { 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 {} 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(); int[] counters = fillXpdrLcpsMaps(line, client, nodeId, - xponderNb, xponderType, circuitPackName, port, + xponderNb, xponderType, xpdrPort.getCircuitPackName(), port, circuitPackList, lcpMap, mappingMap); line = counters[0]; client = counters[1]; } } } + } - if (device.getConnectionMap() == null) { - LOG.warn("{} : No connection-map inside device configuration", nodeId); - } else { - Collection connectionMap = deviceObject.get().nonnullConnectionMap().values(); - for (ConnectionMap cm : connectionMap) { - String skey = cm.getSource().getCircuitPackName() + "+" + cm.getSource().getPortName(); - String slcp = lcpMap.containsKey(skey) ? lcpMap.get(skey) : null; - Destination destination0 = cm.nonnullDestination().values().iterator().next(); - String dkey = destination0.getCircuitPackName() + "+" + destination0.getPortName(); - if (slcp == null) { - LOG.error("{} : Error in connection-map analysis for source {} and destination (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)); - } + private Ports getXpdrPorts(OrgOpenroadmDevice device, XpdrPort xpdrPort, String nodeId) { + String circuitPackName = xpdrPort.getCircuitPackName(); + String portName = xpdrPort.getPortName(); + // If there xponder-subtree has missing circuit-packs or ports, + // This gives a null-pointer expection, + Optional cpList = device.nonnullCircuitPacks().values().stream() + .filter(cp -> cp.getCircuitPackName().equals(circuitPackName)).findFirst(); + if (cpList.isEmpty()) { + LOG.warn(PortMappingUtils.MISSING_CP_LOGMSG + PortMappingUtils.PORTMAPPING_IGNORE_LOGMSG, + nodeId, circuitPackName); + return null; } + Optional portsList = cpList.get().nonnullPorts().values().stream() + .filter(p -> p.getPortName().equals(portName)).findFirst(); + if (portsList.isEmpty()) { + LOG.warn(PortMappingUtils.NO_ASSOC_FOUND_LOGMSG + PortMappingUtils.PORTMAPPING_IGNORE_LOGMSG, + nodeId, portName, circuitPackName, "in the device"); + return null; + } + return portsList.get(); + } - if (device.getOduSwitchingPools() != null) { - Collection oduSwithcingPools = device.nonnullOduSwitchingPools().values(); - List switchingPoolList = new ArrayList<>(); - for (OduSwitchingPools odp : oduSwithcingPools) { - 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) { + private List getSwitchingPoolList(OrgOpenroadmDevice device, + Map lcpMap, String nodeId) { + List switchingPoolList = new ArrayList<>(); + for (OduSwitchingPools odp : device.nonnullOduSwitchingPools().values()) { + 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<>(); + for (PortList item : nbl.nonnullPortList().values()) { + String key = item.getCircuitPackName() + "+" + item.getPortName(); + if (!lcpMap.containsKey(key)) { + LOG.error(PortMappingUtils.NO_ASSOC_FOUND_LOGMSG, + nodeId, item.getPortName(), item.getCircuitPackName(), "to a logical connection point"); continue; } - List lcpList = new ArrayList<>(); - 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; - } - 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); + lcpList.add(lcpMap.get(key)); } - SwitchingPoolLcp splBldr = new SwitchingPoolLcpBuilder() + NonBlockingList nonBlockingList = new NonBlockingListBuilder() + .setNblNumber(nbl.getNblNumber()) + .setInterconnectBandwidth(nbl.getInterconnectBandwidth()) + .setInterconnectBandwidthUnit(nbl.getInterconnectBandwidthUnit()) + .setLcpList(lcpList) + .build(); + nbMap.put(nonBlockingList.key(), nonBlockingList); + } + switchingPoolList.add( + new SwitchingPoolLcpBuilder() .setSwitchingPoolNumber(odp.getSwitchingPoolNumber()) .setSwitchingPoolType(odp.getSwitchingPoolType()) - //TODO differs from 2.2.1 SwitchingPoolTypes.forValue(odp.getSwitchingPoolType().getIntValue() + //TODO differs from 2.2.1 SwitchingPoolTypes.forValue(odp.getSwitchingPoolType().getIntValue()) .setNonBlockingList(nbMap) - .build(); - switchingPoolList.add(splBldr); - } - postPortMapping(nodeId, null, null, null, switchingPoolList, null); - } - - if (!mappingMap.isEmpty()) { - mappingMap.forEach((k,v) -> portMapList.add(v)); + .build()); } - return true; + return switchingPoolList; } private boolean checkPartnerPortNotNull(Ports port) { - if (port.getPartnerPort() == null - || port.getPartnerPort().getCircuitPackName() == null - || port.getPartnerPort().getPortName() == null) { - return false; - } - return true; + return (port.getPartnerPort() != null + && port.getPartnerPort().getCircuitPackName() != null + && port.getPartnerPort().getPortName() != null); } 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; + return (checkPartnerPortNotNull(port2) + && port2.getPartnerPort().getCircuitPackName().equals(circuitPackName) + && port2.getPartnerPort().getPortName().equals(port1.getPortName())); } private boolean checkPartnerPort(String circuitPackName, Ports port1, Ports port2) { - 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; + return checkPartnerPortNoDir(circuitPackName, port1, port2) + && Set.of(port1.getPortDirection().getIntValue(), port2.getPortDirection().getIntValue()) + .equals(TXRX_SET); } @@ -402,7 +487,7 @@ public class PortMappingVersion710 { for (int srgCounter = 1; srgCounter <= maxSrg; srgCounter++) { List srgCps = new ArrayList<>(); - LOG.debug("{} : Getting Circuitpacks for Srg Number {}", deviceId, srgCounter); + LOG.debug(PortMappingUtils.GETTING_CP_LOGMSG, deviceId, srgCounter); InstanceIdentifier srgIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(SharedRiskGroup.class, new SharedRiskGroupKey(Uint16.valueOf(srgCounter))); Optional ordmSrgObject = this.deviceTransactionManager.getDataFromDevice(deviceId, @@ -413,101 +498,52 @@ public class PortMappingVersion710 { cpPerSrg.put(ordmSrgObject.get().getSrgNumber().toJava(), srgCps); } } - LOG.info("{} : Device has {} Srg", deviceId, cpPerSrg.size()); + LOG.info(PortMappingUtils.DEVICE_HAS_LOGMSG, deviceId, cpPerSrg.size(), "SRG"); return cpPerSrg; } 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()) { - List cpList = - srgCps.get(srgCpEntry.getKey()); + srgCpEntry : getSrgCps(nodeId, deviceInfo).entrySet()) { List keys = new ArrayList<>(); - for (org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.srg.CircuitPacks cp : cpList) { + int portIndex = 1; + for (org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.srg.CircuitPacks + cp : srgCpEntry.getValue()) { String circuitPackName = cp.getCircuitPackName(); - InstanceIdentifier cpIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(CircuitPacks.class, new CircuitPacksKey(circuitPackName)); - Optional circuitPackObject = this.deviceTransactionManager.getDataFromDevice(nodeId, - LogicalDatastoreType.OPERATIONAL, cpIID, - Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - - if (!circuitPackObject.isPresent() || (circuitPackObject.get().getPorts() == null)) { - LOG.warn("{} : Circuit pack {} not found or without ports.", nodeId, circuitPackName); - continue; - } - List portList = new ArrayList<>(circuitPackObject.get().nonnullPorts().values()); + List portList = getPortList(circuitPackName, nodeId); Collections.sort(portList, new SortPort710ByName()); - int portIndex = 1; for (Ports port : portList) { - String currentKey = circuitPackName + "-" + port.getPortName(); - if (port.getPortQual() == null) { + if (!checkPortQual(port, circuitPackName, nodeId)) { continue; } - - if (PortQual.RoadmExternal.getIntValue() != port.getPortQual().getIntValue()) { - LOG.debug("{} : port {} on {} is not roadm-external - cannot assign logicalConnectionPoint.", - nodeId, port.getPortName(), circuitPackName); - continue; - } - + String currentKey = circuitPackName + "-" + port.getPortName(); if (keys.contains(currentKey)) { - LOG.debug("{} : port {} on {} has already been handled - cannot assign logicalConnectionPoint.", - nodeId, port.getPortName(), circuitPackName); + LOG.debug(PortMappingUtils.PORT_ALREADY_HANDLED_LOGMSG + PortMappingUtils.CANNOT_AS_LCP_LOGMSG, + 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); + LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG, + 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); + Ports port2 = getPartnerPort(port, circuitPackName, nodeId); + if (port2 == null) { 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)) { - LOG.error("{} : port {} on {} - Error with partner port configuration", - nodeId, port.getPortName(), circuitPackName); - portIndex++; - continue; - } + LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG, + nodeId, port.getPortName(), circuitPackName, lcp1); String lcp2 = createLogicalConnectionPort(port2, srgCpEntry.getKey(),portIndex); - LOG.info("{} : port {} on {} - associated Logical Connection Point is {}", - nodeId, port2.getPortName(), circuitPackName, lcp2); + LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG, + nodeId, port2.getPortName(), circuitPackName, lcp2); portMapList.add(createMappingObject(nodeId, port, circuitPackName, lcp1)); portMapList.add( createMappingObject(nodeId ,port2, port.getPartnerPort().getCircuitPackName(), lcp2)); @@ -515,12 +551,9 @@ public class PortMappingVersion710 { keys.add(currentKey); keys.add(port.getPartnerPort().getCircuitPackName() + "-" + port2.getPortName()); break; - default: - LOG.error("{} : port {} on {} - unsupported Direction {}" - + " - cannot assign logicalConnectionPoint.", + LOG.error(PortMappingUtils.UNSUPPORTED_DIR_LOGMSG + PortMappingUtils.CANNOT_AS_LCP_LOGMSG, nodeId, port.getPortName(), circuitPackName, port.getPortDirection()); - } } } @@ -528,21 +561,64 @@ public class PortMappingVersion710 { return true; } + private Ports getPartnerPort(Ports port, String circuitPackName, String nodeId) { + if (!checkPartnerPortNotNull(port)) { + LOG.info(PortMappingUtils.NO_VALID_PARTNERPORT_LOGMSG + PortMappingUtils.CANNOT_AS_LCP_LOGMSG, + nodeId, port.getPortName(), circuitPackName); + return null; + } + InstanceIdentifier port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + .child(CircuitPacks.class, new CircuitPacksKey(port.getPartnerPort().getCircuitPackName())) + .child(Ports.class, new PortsKey(port.getPartnerPort().getPortName())); + Optional port2Object = this.deviceTransactionManager + .getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, port2ID, + Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); + if (port2Object.isEmpty() + || port2Object.get().getPortQual().getIntValue() != PortQual.RoadmExternal.getIntValue()) { + LOG.error(PortMappingUtils.NOT_CORRECT_PARTNERPORT_LOGMSG + PortMappingUtils.PARTNERPORT_GET_ERROR_LOGMSG, + nodeId, port.getPartnerPort().getPortName(), port.getPartnerPort().getCircuitPackName(), + port.getPortName(), circuitPackName); + return null; + } + Ports port2 = port2Object.get(); + if (!checkPartnerPort(circuitPackName, port, port2)) { + LOG.error(PortMappingUtils.NOT_CORRECT_PARTNERPORT_LOGMSG + PortMappingUtils.PARTNERPORT_CONF_ERROR_LOGMSG, + nodeId, port2.getPortName(), port.getPartnerPort().getCircuitPackName(), + port.getPortName(), circuitPackName); + //TODO check if we really needed to increment portIndex in this condition + // if yes this block should not be in getPartnerPort and must move back to createPpPortMapping + return null; + } + return port2; + } + + private List getPortList(String circuitPackName, String nodeId) { + InstanceIdentifier cpIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + .child(CircuitPacks.class, new CircuitPacksKey(circuitPackName)); + Optional circuitPackObject = this.deviceTransactionManager.getDataFromDevice(nodeId, + LogicalDatastoreType.OPERATIONAL, cpIID, + Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); + if (circuitPackObject.isEmpty()) { + LOG.warn(PortMappingUtils.MISSING_CP_LOGMSG + PortMappingUtils.PORTMAPPING_IGNORE_LOGMSG, + nodeId, circuitPackName); + return new ArrayList<>(); + } + if (circuitPackObject.get().getPorts() == null) { + LOG.warn(PortMappingUtils.NO_PORT_ON_CP_LOGMSG, nodeId, PortMappingUtils.FOUND, circuitPackName); + return new ArrayList<>(); + } + return new ArrayList<>(circuitPackObject.get().nonnullPorts().values()); + } + private String createLogicalConnectionPort(Ports port, int index, int portIndex) { if (SUFFIX.containsKey(port.getPortDirection())) { return String.join("-", "SRG" + index, "PP" + portIndex, SUFFIX.get(port.getPortDirection())); } - LOG.error("port {} : Unsupported port direction {}", port, port.getPortDirection()); + LOG.error(PortMappingUtils.UNSUPPORTED_DIR_LOGMSG, + "createLogicalConnectionPort", port, "SRG" + index + "-PP" + portIndex, 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) { Map mcCapabilityProfiles = new HashMap<>(); InstanceIdentifier deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class); @@ -550,8 +626,8 @@ public class PortMappingVersion710 { 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 {}", deviceId); + if (deviceObject.isEmpty()) { + LOG.error(PortMappingUtils.CANNOT_GET_DEV_CONF_LOGMSG, deviceId); LOG.warn("MC-capabilities profile will be empty for node {}", deviceId); return mcCapabilityProfiles; } @@ -568,7 +644,7 @@ public class PortMappingVersion710 { Integer maxDegree = ordmInfo.getMaxDegrees() == null ? 20 : ordmInfo.getMaxDegrees().toJava(); for (int degreeCounter = 1; degreeCounter <= maxDegree; degreeCounter++) { - LOG.debug("{} : Getting Connection ports for Degree Number {}", deviceId, degreeCounter); + LOG.debug(PortMappingUtils.GETTING_CONPORT_LOGMSG, deviceId, degreeCounter); InstanceIdentifier deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(Degree.class, new DegreeKey(Uint16.valueOf(degreeCounter))); Optional ordmDegreeObject = this.deviceTransactionManager.getDataFromDevice(deviceId, @@ -578,7 +654,8 @@ public class PortMappingVersion710 { degrees.put(degreeCounter, ordmDegreeObject.get()); } } - LOG.info("{} : Device has {} degree(s)", deviceId, degrees.size()); + LOG.info(PortMappingUtils.DEVICE_HAS_LOGMSG, + deviceId, degrees.size(), degrees.size() <= 1 ? "degree" : "degrees"); return degrees; } @@ -610,14 +687,14 @@ public class PortMappingVersion710 { } private Map getEthInterfaceList(String nodeId) { - LOG.info("{} : It is calling get ethernet interface", nodeId); + LOG.info(PortMappingUtils.GETTING_ETH_LIST_LOGMSG, 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) { - LOG.warn("{} : Couldnt find port config under LLDP - Processiong is done.. now returning..", nodeId); + if (protocolObject.isEmpty() || protocolObject.get().augmentation(Protocols1.class).getLldp() == null) { + LOG.warn(PortMappingUtils.PROCESSING_DONE_LOGMSG, nodeId, PortMappingUtils.CANNOT_GET_LLDP_CONF_LOGMSG); return new HashMap<>(); } Map cpToInterfaceMap = new HashMap<>(); @@ -631,7 +708,7 @@ public class PortMappingVersion710 { 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)) { + if (interfaceObject.isEmpty() || interfaceObject.get().getSupportingCircuitPackName() == null) { continue; } String supportingCircuitPackName = interfaceObject.get().getSupportingCircuitPackName(); @@ -641,20 +718,19 @@ public class PortMappingVersion710 { 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)) { + if (circuitPackObject.isEmpty() || circuitPackObject.get().getParentCircuitPack() == null) { continue; } cpToInterfaceMap.put(circuitPackObject.get().getParentCircuitPack().getCircuitPackName(), portConfig.getIfName()); } - LOG.info("{} : Processiong is done.. now returning..", nodeId); + LOG.info(PortMappingUtils.PROCESSING_DONE_LOGMSG, nodeId, " - success"); return cpToInterfaceMap; } private List getCpToDegreeList(Map degrees, Map interfaceList) { List cpToDegreeList = new ArrayList<>(); 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)) @@ -666,7 +742,7 @@ public class PortMappingVersion710 { 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); + LOG.info(PortMappingUtils.GETTING_MC_CAPA_LOGMSG , nodeId, "degrees"); //Get all the mc-capability profiles from the device Map mcCapabilityProfiles = getMcCapabilityProfiles(nodeId, deviceInfo); @@ -674,7 +750,7 @@ public class PortMappingVersion710 { Map mcCapabilities = createMcCapDegreeObject(degrees, mcCapabilityProfiles, nodeId); // Add the SRG mc-capabilities - LOG.info("{} : Getting the MC capabilities for SRGs", nodeId); + LOG.info(PortMappingUtils.GETTING_MC_CAPA_LOGMSG , nodeId, "SRGs"); mcCapabilities.putAll(createMcCapSrgObject(srgs, mcCapabilityProfiles, nodeId)); return mcCapabilities; } @@ -728,7 +804,7 @@ public class PortMappingVersion710 { commit.get(); return true; } catch (InterruptedException | ExecutionException e) { - LOG.warn("{} : Failed to post {}", nodeId, network, e); + LOG.warn(PortMappingUtils.PORTMAPPING_POST_FAIL_LOGMSG, nodeId, network, e); return false; } } @@ -749,10 +825,10 @@ public class PortMappingVersion710 { 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"; + String mcNodeName = + PortMappingUtils.degreeTtpNodeName(degree.getDegreeNumber().toString(), "default-profile"); + LOG.warn(PortMappingUtils.NO_MC_LOGMSG, nodeId, "degree", + degree.getDegreeNumber() + " - using " + mcNodeName + " as default MC profile name"); McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder() .withKey(new McCapabilitiesKey(mcNodeName)) .setMcNodeName(mcNodeName); @@ -766,7 +842,8 @@ public class PortMappingVersion710 { for (String mcCapabilityProfileName : degree.getMcCapabilityProfileName()) { McCapabilityProfileKey mcKey = new McCapabilityProfileKey(mcCapabilityProfileName); McCapabilityProfile mcCapabilityProfile = mcCapabilityProfileMap.get(mcKey); - String mcNodeName = "DEG" + degree.getDegreeNumber().toString() + "-TTP-" + mcCapabilityProfile; + String mcNodeName = PortMappingUtils.degreeTtpNodeName(degree.getDegreeNumber().toString(), + mcCapabilityProfile.toString()); McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder() .withKey(new McCapabilitiesKey(mcNodeName)) .setMcNodeName(mcNodeName); @@ -787,10 +864,9 @@ public class PortMappingVersion710 { for (SharedRiskGroup srg : srgs) { 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"; + LOG.warn(PortMappingUtils.NO_MC_LOGMSG, nodeId, "SRG", + srg.getSrgNumber() + " - using " + mcNodeName + " as default MC profile name"); McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder() .withKey(new McCapabilitiesKey(mcNodeName)) .setMcNodeName(mcNodeName); @@ -844,9 +920,7 @@ public class PortMappingVersion710 { private Mapping updateMappingObject(String nodeId, Ports port, Mapping oldmapping) { MappingBuilder mpBldr = new MappingBuilder(oldmapping); updateMappingStates(mpBldr, port, oldmapping); - if ((port.getInterfaces() == null) - || (!oldmapping.getLogicalConnectionPoint().contains(StringConstants.TTP_TOKEN) - && !oldmapping.getLogicalConnectionPoint().contains(StringConstants.NETWORK_TOKEN))) { + if (port.getInterfaces() == null) { return mpBldr.build(); } // Get interfaces provisioned on the port @@ -867,31 +941,49 @@ public class PortMappingVersion710 { } private MappingBuilder updateMappingInterfaces(String nodeId, MappingBuilder mpBldr, Ports port) { + mpBldr.setSupportingOtu4(null) + .setSupportingOdu4(null) + .setSupportingOducn(null) + .setSupportingOtucn(null); 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); + Optional openRoadmInterface = getInterfaceFromDevice(nodeId, + interfaces.getInterfaceName()); + if (openRoadmInterface.isEmpty()) { + LOG.warn(PortMappingUtils.INTF_ISSUE_LOGMSG, + nodeId, interfaces.getInterfaceName() + "- empty interface"); + continue; + } + LOG.debug(PortMappingUtils.GOT_INTF_LOGMSG, + 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()); + } + String interfaceName = interfaces.getInterfaceName(); + if (interfaceType.equals(OtnOtu.class) + && (interfaceName.substring(interfaceName.lastIndexOf("-") + 1) + .equals("OTU4"))) { + mpBldr.setSupportingOtu4(interfaces.getInterfaceName()); + } + if ((interfaceType.equals(OtnOtu.class)) + && (interfaceName.substring(interfaceName.lastIndexOf("-") + 1) + .contains("OTUC"))) { + mpBldr.setSupportingOtucn(interfaces.getInterfaceName()); + } + if (interfaceType.equals(OtnOdu.class) + && (interfaceName.substring(interfaceName.lastIndexOf("-") + 1) + .equals("ODU4"))) { + mpBldr.setSupportingOdu4(interfaces.getInterfaceName()); + } + if ((interfaceType.equals(OtnOdu.class)) + && (interfaceName.substring(interfaceName.lastIndexOf("-") + 1) + .contains("ODUC"))) { + mpBldr.setSupportingOducn(interfaces.getInterfaceName()); } } return mpBldr; @@ -906,16 +998,18 @@ public class PortMappingVersion710 { // update existing mapping return new MappingBuilder(mapping).setConnectionMapLcp(connectionMapLcp).build(); } + return createNewXpdrMapping(nodeId, port, circuitPackName, logicalConnectionPoint, partnerLcp, xpdrNodeType); + } - // create a new mapping - String nodeIdLcp = nodeId + "-" + logicalConnectionPoint; + private Mapping createNewXpdrMapping(String nodeId, Ports port, String circuitPackName, + String logicalConnectionPoint, String partnerLcp, XpdrNodeTypes xpdrNodeType) { MappingBuilder mpBldr = new MappingBuilder() .withKey(new MappingKey(logicalConnectionPoint)) .setLogicalConnectionPoint(logicalConnectionPoint) .setSupportingCircuitPackName(circuitPackName) .setSupportingPort(port.getPortName()) .setPortDirection(port.getPortDirection().getName()) - .setLcpHashVal(FnvUtils.fnv1_64(nodeIdLcp)); + .setLcpHashVal(PortMappingUtils.fnv1size64(nodeId + "-" + logicalConnectionPoint)); if (port.getPortQual() != null) { mpBldr.setPortQual(port.getPortQual().getName()); } @@ -925,15 +1019,32 @@ public class PortMappingVersion710 { if (partnerLcp != null) { mpBldr.setPartnerLcp(partnerLcp); } - if (port.augmentation(Ports1.class) != null && port.augmentation(Ports1.class).getPortCapabilities() != null) { - List supIntfCapaList = getSupIntfCapaList(port); + if (supIntfCapaList != null) { + List> supportedIntf = new ArrayList<>(); - Map supIfCapMap = port - .augmentation(Ports1.class).getPortCapabilities().nonnullSupportedInterfaceCapability(); - for (SupportedInterfaceCapability sic : supIfCapMap.values()) { - supportedIntf.add(sic.getIfCapType()); + SupportedInterfaceCapability sic1 = null; + for (SupportedInterfaceCapability sic : supIntfCapaList) { + supportedIntf.add(MappingUtilsImpl.convertSupIfCapa(sic.getIfCapType().getSimpleName())); + sic1 = sic; } mpBldr.setSupportedInterfaceCapability(supportedIntf); + if (port.getPortQual() == PortQual.SwitchClient + && !sic1.getOtnCapability().getMpdrClientRestriction().isEmpty()) { + // Here we assume all the supported-interfaces has the support same rates, and the + // trib-slot numbers are assumed to be the same + String mxpProfileName = + sic1.getOtnCapability().getMpdrClientRestriction().get(0).getMuxpProfileName().get(0); + // From this muxponder-profile get the min-trib-slot and the max-trib-slot + LOG.info("{}: Muxp-profile used for trib information {}", nodeId, mxpProfileName); + // This provides the tribSlot information from muxProfile + List minMaxOpucnTribSlots = getOpucnTribSlots(nodeId, mxpProfileName); + mpBldr.setMpdrRestrictions( + new MpdrRestrictionsBuilder() + .setMinTribSlot(minMaxOpucnTribSlots.get(0)) + .setMaxTribSlot(minMaxOpucnTribSlots.get(1)) + .build()); + } } if (port.getAdministrativeState() != null) { mpBldr.setPortAdminState(port.getAdministrativeState().name()); @@ -944,12 +1055,41 @@ public class PortMappingVersion710 { return mpBldr.build(); } + private Collection getSupIntfCapaList(Ports port) { + return + port.augmentation(Ports1.class) == null || port.augmentation(Ports1.class).getPortCapabilities() == null + ? null + : port.augmentation(Ports1.class).getPortCapabilities().nonnullSupportedInterfaceCapability().values(); + } + + private ArrayList getOpucnTribSlots(String deviceId, String mxpProfileName) { + ArrayList minMaxOpucnTribSlots = new ArrayList<>(2); + + LOG.info("{} : Getting Min/Max Trib-slots from {}", deviceId, mxpProfileName); + InstanceIdentifier deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + .child(MuxpProfile.class, new MuxpProfileKey(mxpProfileName)); + + Optional muxpProfileObject = this.deviceTransactionManager.getDataFromDevice(deviceId, + LogicalDatastoreType.OPERATIONAL, deviceIID, + Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); + + List ntwHoOduOpucnTribSlots = muxpProfileObject.get().getNetworkHoOduOpucnTribSlots(); + // Sort the tib-slots in ascending order and pick min and max + List sortedNtwHoOduOpucnTribSlots = ntwHoOduOpucnTribSlots.stream().sorted( + Comparator.comparingDouble(x -> Double.parseDouble( + x.getValue().substring(x.getValue().lastIndexOf('.') + 1)))) + .collect(Collectors.toList()); + minMaxOpucnTribSlots.add(sortedNtwHoOduOpucnTribSlots.get(0)); + minMaxOpucnTribSlots.add(sortedNtwHoOduOpucnTribSlots.get(sortedNtwHoOduOpucnTribSlots.size() - 1)); + LOG.debug("Min, Max trib slot list {}", minMaxOpucnTribSlots); + return minMaxOpucnTribSlots; + } + 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); + LOG.warn(PortMappingUtils.NO_VALID_PARTNERPORT_LOGMSG, nodeId, port.getPortName(), circuitPackName); return null; } if (lcpMap.containsKey(circuitPackName + '+' + port.getPortName())) { @@ -959,24 +1099,23 @@ public class PortMappingVersion710 { .filter( cP -> cP.getCircuitPackName().equals(port.getPartnerPort().getCircuitPackName())) .findFirst(); - if (!cpOpt.isPresent()) { - LOG.error("{} : Error fetching circuit-pack {}", - nodeId, port.getPartnerPort().getCircuitPackName()); + if (cpOpt.isEmpty()) { + LOG.error(PortMappingUtils.MISSING_CP_LOGMSG, nodeId, port.getPartnerPort().getCircuitPackName()); return null; } Optional poOpt = cpOpt.get().nonnullPorts().values().stream() - .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName().toString())) + .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName())) .findFirst(); - if (!poOpt.isPresent()) { - LOG.error("{} : Error fetching port {} on {}", - nodeId, port.getPartnerPort().getPortName(), port.getPartnerPort().getCircuitPackName()); + if (poOpt.isEmpty()) { + LOG.error(PortMappingUtils.NO_PORT_ON_CP_LOGMSG, + 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); + LOG.error(PortMappingUtils.NOT_CORRECT_PARTNERPORT_LOGMSG, + nodeId, port2.getPortName(), circuitPackName2, port.getPortName(), circuitPackName); return null; } return port2; @@ -987,10 +1126,16 @@ public class PortMappingVersion710 { 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); + String lcp1 = + PortMappingUtils.createXpdrLogicalConnectionPort(xponderNb, line, StringConstants.NETWORK_TOKEN); + if (lcpMap.containsKey(lcp1)) { + LOG.warn(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, "add", lcp1 + " - already exist"); + return; + } + String lcp2 = + PortMappingUtils.createXpdrLogicalConnectionPort(xponderNb, line + 1, StringConstants.NETWORK_TOKEN); + if (lcpMap.containsKey(lcp2)) { + LOG.warn(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, "add", lcp2 + " - already exist"); return; } lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp1); @@ -1008,8 +1153,7 @@ public class PortMappingVersion710 { List circuitPackList, Map lcpMap, Map mappingMap) { if (port.getPortQual() == null) { - LOG.warn("{} : port {} on {} - PortQual was not found", - nodeId, port.getPortName(), circuitPackName); + LOG.warn(PortMappingUtils.PORTQUAL_LOGMSG, nodeId, port.getPortName(), circuitPackName, "not found"); return new int[] {line, client}; } @@ -1017,10 +1161,11 @@ public class PortMappingVersion710 { case XpdrClient: case SwitchClient: - String lcp0 = createXpdrLogicalConnectionPort(xponderNb, client, StringConstants.CLIENT_TOKEN); + String lcp0 = + PortMappingUtils.createXpdrLogicalConnectionPort(xponderNb, client, StringConstants.CLIENT_TOKEN); lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp0); mappingMap.put(lcp0, - createXpdrMappingObject(nodeId, port, circuitPackName, lcp0, null, null, null, null)); + createXpdrMappingObject(nodeId, port, circuitPackName, lcp0, null, null, null, xponderType)); client++; break; @@ -1033,8 +1178,8 @@ public class PortMappingVersion710 { break; default: - LOG.error("{} : port {} on {} - unsupported PortQual {}", - nodeId, port.getPortName(), circuitPackName, port.getPortQual()); + LOG.error(PortMappingUtils.PORTQUAL_LOGMSG, + nodeId, port.getPortName(), circuitPackName, port.getPortQual() + " not supported"); } return new int[] {line, client}; } @@ -1047,7 +1192,8 @@ public class PortMappingVersion710 { switch (port.getPortDirection()) { case Bidirectional: - String lcp = createXpdrLogicalConnectionPort(xponderNb, line, StringConstants.NETWORK_TOKEN); + String lcp = + PortMappingUtils.createXpdrLogicalConnectionPort(xponderNb, line, StringConstants.NETWORK_TOKEN); lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp); mappingMap.put(lcp, createXpdrMappingObject(nodeId, port, circuitPackName, lcp, null, null, null, xponderType)); @@ -1072,7 +1218,7 @@ public class PortMappingVersion710 { break; default: - LOG.error("{} : port {} on {} - unsupported Direction {}", + LOG.error(PortMappingUtils.UNSUPPORTED_DIR_LOGMSG, nodeId, port.getPortName(), circuitPackName, port.getPortDirection()); } @@ -1081,9 +1227,33 @@ public class PortMappingVersion710 { 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)); + if (deviceInfo.getNodeType() == NodeTypes.Rdm) { + Map degrees = getDegreesMap(nodeId, deviceInfo); + List srgs = getSrgs(nodeId, deviceInfo); + mcCapabilitiesMap.putAll(getMcCapabilities(degrees, srgs, deviceInfo, nodeId)); + } else if ((deviceInfo.getNodeType() == NodeTypes.Xpdr)) { + Map mcProfileXpdr = getMcCapabilityProfiles(nodeId, + deviceInfo); + if (mcProfileXpdr.size() > 1) { + LOG.warn("Re-check the mc-capability-profiles for XPDR port-mapping"); + } + // Typically for a XPDR there will be only one mc-capability-profile + for (Map.Entry mcCapProfile : mcProfileXpdr.entrySet()) { + String mcNodeName = "XPDR" + "-" + "mcprofile"; + McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder() + .withKey(new McCapabilitiesKey(mcNodeName)) + .setMcNodeName(mcNodeName); + mcCapabilitiesBuilder + .setCenterFreqGranularity(mcCapProfile.getValue().getCenterFreqGranularity()) + .setSlotWidthGranularity(mcCapProfile.getValue().getSlotWidthGranularity()); + // Build and add to the Map + mcCapabilitiesMap.put(mcCapabilitiesBuilder.key(), mcCapabilitiesBuilder.build()); + LOG.info("Finished building mc-capability profile for XPDR {}", nodeId); + // Since we only have one mc-profile for XPDR, we can break the for-loop + break; + } + + } return true; } @@ -1092,160 +1262,140 @@ public class PortMappingVersion710 { Map degrees = getDegreesMap(nodeId, deviceInfo); Map interfaceList = getEthInterfaceList(nodeId); List cpToDegreeList = getCpToDegreeList(degrees, interfaceList); - LOG.info("{} : Map looks like this {}", nodeId, interfaceList); + LOG.info(PortMappingUtils.MAP_LOOKS_LOGMSG, nodeId, interfaceList); postPortMapping(nodeId, null, null, cpToDegreeList, null, null); - Map> connectionPortMap = getPerDegreePorts(nodeId, deviceInfo); - for (Entry> cpMapEntry : connectionPortMap.entrySet()) { - switch (connectionPortMap.get(cpMapEntry.getKey()).size()) { + for (Entry> cpMapEntry : getPerDegreePorts(nodeId, deviceInfo).entrySet()) { + List cpMapValue = cpMapEntry.getValue(); + ConnectionPorts cp1 = cpMapValue.get(0); + String cp1Name = cp1.getCircuitPackName(); + switch (cpMapValue.size()) { 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.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()) { - LOG.error("{} : No port {} on circuit pack {}", - nodeId, - connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), - connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName()); + Ports port = getTtpPort(cp1, cp1Name, nodeId); + if (port == null) { 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()); + if (!checkTtpPort(port, cp1Name, nodeId, true)) { 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)); + String logicalConnectionPoint = + PortMappingUtils.degreeTtpNodeName(cpMapEntry.getKey().toString(), "TXRX"); + LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG, + nodeId, port.getPortName(), cp1Name, logicalConnectionPoint); + portMapList.add(createMappingObject(nodeId, port, cp1Name, logicalConnectionPoint)); break; case 2: // ports are unidirectionals - 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(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.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()) { - LOG.error("{} : No port {} on circuit pack {}", - nodeId, - connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), - connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName()); + Ports port1 = getTtpPort(cp1, cp1Name, nodeId); + if (port1 == null) { 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; + ConnectionPorts cp2 = cpMapValue.get(1); + String cp2Name = cp2.getCircuitPackName(); + Ports port2 = getTtpPort(cp2, cp2Name, nodeId); + if (port2 == null) { + return false; } - // 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); + if (!checkTtpPortsUnidir(port1, port2, cp1Name, cp2Name, nodeId)) { 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)); + String logicalConnectionPoint1 = PortMappingUtils.degreeTtpNodeName(cpMapEntry.getKey().toString(), + port1.getPortDirection().getName().toUpperCase(Locale.getDefault())); + LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG, + nodeId, port1.getPortName(), cp1Name, logicalConnectionPoint1); + portMapList.add(createMappingObject(nodeId, port1, cp1Name, logicalConnectionPoint1)); + String logicalConnectionPoint2 = PortMappingUtils.degreeTtpNodeName(cpMapEntry.getKey().toString(), + port2.getPortDirection().getName().toUpperCase(Locale.getDefault())); + LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG, + nodeId, port2.getPortName(), cp2Name, logicalConnectionPoint2); + portMapList.add(createMappingObject(nodeId, port2, cp2Name, logicalConnectionPoint2)); break; default: - LOG.error("{} : Number of connection port for DEG{} is incorrect", nodeId, cpMapEntry.getKey()); + LOG.error(PortMappingUtils.NOT_CORRECT_CONPORT_LOGMSG, nodeId, cpMapEntry.getKey()); continue; + //TODO should it be continue or return false ? } } return true; } - private NodeInfo createNodeInfo(Info deviceInfo) { + private Ports getTtpPort(ConnectionPorts cp, String cpName, String nodeId) { + InstanceIdentifier portID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + .child(CircuitPacks.class, new CircuitPacksKey(cpName)) + .child(Ports.class, new PortsKey(cp.getPortName())); + LOG.debug(PortMappingUtils.FETCH_CONNECTIONPORT_LOGMSG, nodeId, cp.getPortName(), cpName); + Optional portObject = this.deviceTransactionManager.getDataFromDevice(nodeId, + LogicalDatastoreType.OPERATIONAL, portID, Timeouts.DEVICE_READ_TIMEOUT, + Timeouts.DEVICE_READ_TIMEOUT_UNIT); + if (portObject.isEmpty()) { + LOG.error(PortMappingUtils.NO_PORT_ON_CP_LOGMSG, nodeId, cp.getPortName(), cpName); + return null; + } + return portObject.get(); + } + + private boolean checkPortQual(Ports port, String cpName, String nodeId) { + if (port.getPortQual() == null) { + return false; + } + if (PortQual.RoadmExternal.getIntValue() != port.getPortQual().getIntValue()) { + //used to be LOG.error when called from createTtpPortMapping + LOG.debug(PortMappingUtils.PORT_NOT_RDMEXT_LOGMSG + PortMappingUtils.CANNOT_AS_LCP_LOGMSG, + nodeId, port.getPortName(), cpName); + return false; + } + return true; + } + + private boolean checkTtpPort(Ports port, String cpName, String nodeId, boolean bidirectional) { + if (!checkPortQual(port, cpName, nodeId)) { + return false; + } + if (Direction.Bidirectional.getIntValue() == port.getPortDirection().getIntValue() ^ bidirectional) { + // (a ^ b) makes more sense than (!a && b) here since it can also work for unidirectional links + LOG.error(PortMappingUtils.PORTDIR_ERROR_LOGMSG + PortMappingUtils.CANNOT_AS_LCP_LOGMSG, + nodeId, port.getPortName(), cpName); + return false; + } + return true; + } + private boolean checkTtpPortsUnidir(Ports port1, Ports port2, String cp1Name, String cp2Name, String nodeId) { + if (!checkTtpPort(port1, cp1Name, nodeId, false)) { + return false; + } + if (!checkTtpPort(port2, cp2Name, nodeId, false)) { + return false; + } + if (!checkPartnerPort(cp1Name, port1, port2)) { + LOG.error(PortMappingUtils.NOT_CORRECT_PARTNERPORT_LOGMSG, + nodeId, port2.getPortName(), cp2Name, port1.getPortName(), cp1Name); + return false; + } + // Directions checks are the same for cp1 and cp2, no need to check them twice. + if (!checkPartnerPortNoDir(cp2Name, port2, port1)) { + LOG.error(PortMappingUtils.NOT_CORRECT_PARTNERPORT_LOGMSG, + nodeId, port1.getPortName(), cp1Name, port2.getPortName(), cp2Name); + return false; + } + return true; + } + + private NodeInfo createNodeInfo(Info deviceInfo) { if (deviceInfo.getNodeType() == null) { // TODO make mandatory in yang - LOG.error("Node type field is missing"); + LOG.error(PortMappingUtils.NODE_TYPE_LOGMSG, deviceInfo.getNodeId(), "field missing"); return null; } - NodeInfoBuilder nodeInfoBldr = new NodeInfoBuilder() - .setOpenroadmVersion(OpenroadmVersion._710) + .setOpenroadmVersion(OpenroadmNodeVersion._71) + .setNodeClli( + deviceInfo.getClli() == null || deviceInfo.getClli().isEmpty() + ? "defaultCLLI" + : deviceInfo.getClli()) .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()); } @@ -1255,8 +1405,23 @@ public class PortMappingVersion710 { if (deviceInfo.getIpAddress() != null) { nodeInfoBldr.setNodeIpAddress(deviceInfo.getIpAddress()); } - return nodeInfoBldr.build(); } + private String getLcpFromCpAndPort(Map mappings, String cpName, String portName) { + for (Mapping mapping : mappings.values()) { + if (cpName.equals(mapping.getSupportingCircuitPackName()) + && portName.equals(mapping.getSupportingPort())) { + return mapping.getLogicalConnectionPoint(); + } + } + return null; + } + + private Optional getInterfaceFromDevice(String nodeId, String interfaceName) { + InstanceIdentifier interfacesIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + .child(Interface.class, new InterfaceKey(interfaceName)); + return deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.CONFIGURATION, + interfacesIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); + } }