X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fcommon%2Fmapping%2FPortMappingVersion121.java;h=c1cb74097e2af0fde40658c0f5e1a57b98fb0aef;hb=refs%2Fchanges%2F46%2F100646%2F27;hp=5ad42df29c3aeae672961446b02dfba51c63151f;hpb=e8bca6a0b00c9a8b186621244f16a12d9023128d;p=transportpce.git diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java index 5ad42df29..c1cb74097 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java @@ -10,19 +10,19 @@ package org.opendaylight.transportpce.common.mapping; import com.google.common.util.concurrent.FluentFuture; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; +import java.util.HashSet; import java.util.List; 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.eclipse.jdt.annotation.Nullable; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.WriteTransaction; import org.opendaylight.mdsal.common.api.CommitInfo; @@ -30,24 +30,23 @@ 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.rev210426.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.NetworkBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.OpenroadmNodeVersion; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.cp.to.degree.CpToDegree; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.cp.to.degree.CpToDegreeBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.cp.to.degree.CpToDegreeKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.mapping.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.mapping.MappingBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.mapping.MappingKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.network.NodesBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.network.NodesKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.network.nodes.NodeInfo; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.network.nodes.NodeInfoBuilder; +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.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.openroadm.common.types.rev161014.Direction; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.CircuitPack; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.OrgOpenroadmDeviceData; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.Port; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.circuit.pack.Ports; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.circuit.pack.PortsKey; @@ -67,12 +66,17 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.open import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.connection.map.Destination; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.port.Interfaces; 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.XpdrNodeTypes; +import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.EthernetCsmacd; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.InterfaceType; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.OpenROADMOpticalMultiplex; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.OpticalTransport; +import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.OtnOdu; +import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.OtnOtu; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.Protocols1; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.lldp.container.Lldp; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.lldp.container.lldp.PortConfig; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev170929.SupportedIfCapability; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint32; @@ -86,10 +90,10 @@ public class PortMappingVersion121 { private static final Logger LOG = LoggerFactory.getLogger(PortMappingVersion121.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( @@ -98,17 +102,16 @@ public class PortMappingVersion121 { Direction.Bidirectional, "TXRX"); } - public PortMappingVersion121(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager, - OpenRoadmInterfaces openRoadmInterfaces) { + public PortMappingVersion121(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager) { this.dataBroker = dataBroker; this.deviceTransactionManager = deviceTransactionManager; - this.openRoadmInterfaces = openRoadmInterfaces; } public boolean createMappingData(String nodeId) { LOG.info(PortMappingUtils.CREATE_MAPPING_DATA_LOGMSG, nodeId, "1.2.1"); List portMapList = new ArrayList<>(); - InstanceIdentifier infoIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child(Info.class); + InstanceIdentifier infoIID = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class).child(Info.class).build(); Optional deviceInfoOptional = this.deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType .OPERATIONAL, infoIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); if (deviceInfoOptional.isEmpty()) { @@ -128,26 +131,26 @@ public class PortMappingVersion121 { // Get TTP port mapping if (!createTtpPortMapping(nodeId, deviceInfo, portMapList)) { // return false if mapping creation for TTP's failed - LOG.warn(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, "create", "TTP's"); + 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(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, "create", "PP's"); + LOG.warn(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, PortMappingUtils.CREATE, "PP's"); return false; } break; case Xpdr: if (!createXpdrPortMapping(nodeId, portMapList)) { - LOG.warn(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, "create", "Xponder"); + LOG.warn(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, PortMappingUtils.CREATE, "Xponder"); return false; } break; default: LOG.error(PortMappingUtils.UNABLE_MAPPING_LOGMSG, - nodeId, "create", deviceInfo.getNodeType() + " - unknown nodetype"); + nodeId, PortMappingUtils.CREATE, deviceInfo.getNodeType() + " - unknown nodetype"); break; } @@ -156,21 +159,23 @@ public class PortMappingVersion121 { public boolean updateMapping(String nodeId, Mapping oldMapping) { if (nodeId == null) { - LOG.error(PortMappingUtils.UNABLE_MAPPING_LOGMSG, "node id null" , "update", "a null value"); + 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, "update", "a null value"); + LOG.error(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, PortMappingUtils.UPDATE, "a null value"); return false; } - InstanceIdentifier portId = InstanceIdentifier.create(OrgOpenroadmDevice.class) + InstanceIdentifier portId = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(oldMapping.getSupportingCircuitPackName())) - .child(Ports.class, new PortsKey(oldMapping.getSupportingPort())); + .child(Ports.class, new PortsKey(oldMapping.getSupportingPort())) + .build(); 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 {}", + LOG.debug(PortMappingUtils.UPDATE_MAPPING_LOGMSG, nodeId, oldMapping, oldMapping.getLogicalConnectionPoint(), newMapping); final WriteTransaction writeTransaction = this.dataBroker.newWriteOnlyTransaction(); InstanceIdentifier mapIID = InstanceIdentifier.create(Network.class) @@ -182,24 +187,25 @@ public class PortMappingVersion121 { return true; } catch (InterruptedException | ExecutionException e) { LOG.error(PortMappingUtils.UNABLE_MAPPING_LOGMSG, - nodeId, "update", oldMapping.getLogicalConnectionPoint(), e); + nodeId, PortMappingUtils.UPDATE, oldMapping.getLogicalConnectionPoint(), e); return false; } } private boolean createXpdrPortMapping(String nodeId, List portMapList) { // Creating for Xponder Line and Client Ports - InstanceIdentifier deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class); + InstanceIdentifier deviceIID = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class).build(); Optional deviceObject = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - if (!deviceObject.isPresent()) { + if (deviceObject.isEmpty()) { LOG.error(PortMappingUtils.CANNOT_GET_DEV_CONF_LOGMSG, nodeId); return false; } OrgOpenroadmDevice device = deviceObject.get(); if (device.getCircuitPacks() == null) { - LOG.warn(PortMappingUtils.MISSING_CP_LOGMSG, nodeId, "found"); + LOG.warn(PortMappingUtils.MISSING_CP_LOGMSG, nodeId, PortMappingUtils.FOUND); return false; } // Variable to keep track of number of line ports @@ -214,11 +220,9 @@ public class PortMappingVersion121 { for (CircuitPacks cp : circuitPackList) { String circuitPackName = cp.getCircuitPackName(); if (cp.getPorts() == null) { - LOG.warn(PortMappingUtils.NO_PORT_ON_CP_LOGMSG, nodeId, "found", circuitPackName); + LOG.warn(PortMappingUtils.NO_PORT_ON_CP_LOGMSG, nodeId, PortMappingUtils.FOUND, circuitPackName); continue; } - - // com.google.common.collect.ImmutableList implementation of List List portList = new ArrayList<>(cp.nonnullPorts().values()); portList.sort(Comparator.comparing(Ports::getPortName)); for (Ports port : portList) { @@ -230,28 +234,23 @@ public class PortMappingVersion121 { } } - Collection connectionMap = deviceObject.get().nonnullConnectionMap().values(); - for (ConnectionMap cm : connectionMap) { + for (ConnectionMap cm : deviceObject.get().nonnullConnectionMap().values()) { 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); + if (!lcpMap.containsKey(skey)) { + LOG.error(PortMappingUtils.CONMAP_ISSUE_LOGMSG, nodeId, skey, dkey); continue; } - String dlcp = lcpMap.containsKey(dkey) ? lcpMap.get(dkey) : null; + String slcp = lcpMap.get(skey); Mapping mapping = mappingMap.get(slcp); mappingMap.remove(slcp); - portMapList.add(createXpdrMappingObject(nodeId, null, null, null, null, mapping, dlcp)); + portMapList.add(createXpdrMappingObject(nodeId, null, null, null, null, mapping, + //dlcp + lcpMap.containsKey(dkey) ? lcpMap.get(dkey) : null)); } - if (!mappingMap.isEmpty()) { - for (Mapping m : mappingMap.values()) { - portMapList.add(m); - } - } + mappingMap.forEach((k,v) -> portMapList.add(v)); return true; } @@ -268,12 +267,9 @@ public class PortMappingVersion121 { } private boolean checkPartnerPort(String circuitPackName, Ports port1, Ports port2) { - return (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 checkPartnerPortNoDir(circuitPackName, port1, port2) + && Set.of(port1.getPortDirection().getIntValue(), port2.getPortDirection().getIntValue()) + .equals(TXRX_SET); } private HashMap srgCps = new ArrayList<>(); - LOG.debug("{} : Getting Circuitpacks for Srg Number {}", deviceId, srgCounter); - InstanceIdentifier srgIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(SharedRiskGroup.class, new SharedRiskGroupKey(Uint16.valueOf(srgCounter))); + LOG.debug(PortMappingUtils.GETTING_CP_LOGMSG, deviceId, srgCounter); + InstanceIdentifier srgIID = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(SharedRiskGroup.class, new SharedRiskGroupKey(Uint16.valueOf(srgCounter))) + .build(); Optional ordmSrgObject = this.deviceTransactionManager.getDataFromDevice(deviceId, LogicalDatastoreType.OPERATIONAL, srgIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); @@ -303,57 +301,26 @@ public class PortMappingVersion121 { 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.rev170206.srg.CircuitPacks cp : cpList) { + int portIndex = 1; + for (org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.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.isEmpty()) { - LOG.warn(PortMappingUtils.MISSING_CP_LOGMSG + PortMappingUtils.PORTMAPPING_IGNORE_LOGMSG, - nodeId, circuitPackName); - continue; - } - if (circuitPackObject.get().getPorts() == null) { - LOG.warn(PortMappingUtils.NO_PORT_ON_CP_LOGMSG, nodeId, "found", circuitPackName); - continue; - } - - // com.google.common.collect.ImmutableList implementation of List - @Nullable - List portList = new ArrayList<>(circuitPackObject.get().nonnullPorts().values()); + List portList = getPortList(circuitPackName, nodeId); Collections.sort(portList, new SortPort121ByName()); - int portIndex = 1; for (Ports port : portList) { - String currentKey = circuitPackName + "-" + port.getPortName(); - if (port.getPortQual() == null) { - continue; - } - - if (Port.PortQual.RoadmExternal.getIntValue() != port.getPortQual().getIntValue()) { - LOG.debug("{} : port {} on {} is not roadm-external" + PortMappingUtils.CANNOT_AS_LCP_LOGMSG, - nodeId, port.getPortName(), circuitPackName); + if (!checkPortQual(port, circuitPackName, nodeId)) { continue; } - + String currentKey = circuitPackName + "-" + port.getPortName(); if (keys.contains(currentKey)) { - LOG.debug("{} : port {} on {} has already been handled" + PortMappingUtils.CANNOT_AS_LCP_LOGMSG, + 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(PortMappingUtils.ASSOCIATED_LCP_LOGMSG, @@ -362,47 +329,15 @@ public class PortMappingVersion121 { portIndex++; keys.add(currentKey); break; - case Rx: case Tx: - if (!checkPartnerPortNotNull(port)) { - LOG.info(PortMappingUtils.NO_VALID_PARTNERPORT_UNIDIR_LOGMSG - + PortMappingUtils.CANNOT_AS_LCP_LOGMSG, - nodeId, port.getPortName(), circuitPackName); + Ports port2 = getPartnerPort(port, circuitPackName, nodeId); + if (port2 == null) { continue; } - String lcp1 = createLogicalConnectionPort(port, srgCpEntry.getKey(), portIndex); LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG, - 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())); - 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() - != Port.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); - - continue; - } - - 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); - portIndex++; - continue; - } + nodeId, port.getPortName(), circuitPackName, lcp1); String lcp2 = createLogicalConnectionPort(port2, srgCpEntry.getKey(),portIndex); LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG, nodeId, port2.getPortName(), circuitPackName, lcp2); @@ -413,11 +348,9 @@ public class PortMappingVersion121 { keys.add(currentKey); keys.add(port.getPartnerPort().getCircuitPackName() + "-" + port2.getPortName()); break; - default: LOG.error(PortMappingUtils.UNSUPPORTED_DIR_LOGMSG + PortMappingUtils.CANNOT_AS_LCP_LOGMSG, nodeId, port.getPortName(), circuitPackName, port.getPortDirection()); - } } } @@ -425,6 +358,59 @@ public class PortMappingVersion121 { 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 + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(CircuitPacks.class, new CircuitPacksKey(port.getPartnerPort().getCircuitPackName())) + .child(Ports.class, new PortsKey(port.getPartnerPort().getPortName())) + .build(); + 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() != Port.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 + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(CircuitPacks.class, new CircuitPacksKey(circuitPackName)) + .build(); + 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())); @@ -434,6 +420,9 @@ public class PortMappingVersion121 { return null; } + @edu.umd.cs.findbugs.annotations.SuppressFBWarnings( + value = "SLF4J_UNKNOWN_ARRAY", + justification = "False positive") private Map getDegreesMap(String deviceId, Info ordmInfo) { Map degrees = new HashMap<>(); @@ -442,9 +431,11 @@ public class PortMappingVersion121 { 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); - InstanceIdentifier deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(Degree.class, new DegreeKey(Uint16.valueOf(degreeCounter))); + LOG.debug(PortMappingUtils.GETTING_CONPORT_LOGMSG, deviceId, degreeCounter); + InstanceIdentifier deviceIID = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(Degree.class, new DegreeKey(Uint16.valueOf(degreeCounter))) + .build(); Optional ordmDegreeObject = this.deviceTransactionManager.getDataFromDevice(deviceId, LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); @@ -466,12 +457,14 @@ public class PortMappingVersion121 { private Map getEthInterfaceList(String nodeId) { LOG.info(PortMappingUtils.GETTING_ETH_LIST_LOGMSG, nodeId); - InstanceIdentifier protocoliid = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(Protocols.class); + InstanceIdentifier protocoliid = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(Protocols.class) + .build(); 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) { + 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<>(); } @@ -481,23 +474,26 @@ public class PortMappingVersion121 { if (!portConfig.getAdminStatus().equals(PortConfig.AdminStatus.Txandrx)) { continue; } - InstanceIdentifier interfaceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(Interface.class, new InterfaceKey(portConfig.getIfName())); + InstanceIdentifier interfaceIID = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(Interface.class, new InterfaceKey(portConfig.getIfName())) + .build(); 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(); cpToInterfaceMap.put(supportingCircuitPackName, portConfig.getIfName()); InstanceIdentifier circuitPacksIID = InstanceIdentifier - .create(OrgOpenroadmDevice.class) - .child(CircuitPacks.class, new CircuitPacksKey(supportingCircuitPackName)); + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(CircuitPacks.class, new CircuitPacksKey(supportingCircuitPackName)) + .build(); 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(), @@ -510,7 +506,6 @@ public class PortMappingVersion121 { 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)) @@ -556,7 +551,7 @@ public class PortMappingVersion121 { commit.get(); return true; } catch (InterruptedException | ExecutionException e) { - LOG.warn("Failed to post {}", network, e); + LOG.warn(PortMappingUtils.PORTMAPPING_POST_FAIL_LOGMSG, nodeId, network, e); return false; } } @@ -594,9 +589,7 @@ public class PortMappingVersion121 { 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 @@ -617,27 +610,34 @@ public class PortMappingVersion121 { } private MappingBuilder updateMappingInterfaces(String nodeId, MappingBuilder mpBldr, Ports port) { + mpBldr.setSupportingOtu4(null) + .setSupportingOdu4(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()); - } - } 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()); + } + if (interfaceType.equals(OtnOtu.class)) { + mpBldr.setSupportingOtu4(interfaces.getInterfaceName()); + } + if (interfaceType.equals(OtnOdu.class)) { + mpBldr.setSupportingOdu4(interfaces.getInterfaceName()); + } + if (interfaceType.equals(EthernetCsmacd.class)) { + mpBldr.setSupportingEthernet(interfaces.getInterfaceName()); } } return mpBldr; @@ -650,16 +650,27 @@ public class PortMappingVersion121 { // update existing mapping return new MappingBuilder(mapping).setConnectionMapLcp(assoLcp).build(); } + return createNewXpdrMapping(nodeId, port, circuitPackName, logicalConnectionPoint, partnerLcp); + } - // create a new mapping - String nodeIdLcp = nodeId + "-" + logicalConnectionPoint; + private Mapping createNewXpdrMapping(String nodeId, Ports port, String circuitPackName, + String logicalConnectionPoint, String partnerLcp) { + Set> supportedIntf = new HashSet<>(); + for (String sup: getSupIfCapList(port)) { + if (MappingUtilsImpl.convertSupIfCapa(sup) != null) { + supportedIntf.add(MappingUtilsImpl.convertSupIfCapa(sup)); + } + } MappingBuilder mpBldr = new MappingBuilder() .withKey(new MappingKey(logicalConnectionPoint)) .setLogicalConnectionPoint(logicalConnectionPoint) .setSupportingCircuitPackName(circuitPackName) .setSupportingPort(port.getPortName()) .setPortDirection(port.getPortDirection().getName()) - .setLcpHashVal(PortMappingUtils.fnv1size64(nodeIdLcp)); + .setXponderType(XpdrNodeTypes.Tpdr) + .setLcpHashVal(PortMappingUtils.fnv1size64(nodeId + "-" + logicalConnectionPoint)) + .setSupportedInterfaceCapability(supportedIntf); if (port.getPortQual() != null) { mpBldr.setPortQual(port.getPortQual().getName()); } @@ -675,11 +686,21 @@ public class PortMappingVersion121 { return mpBldr.build(); } + private List getSupIfCapList(Ports port) { + Set> supIfCapClassList = port.getSupportedInterfaceCapability(); + return + supIfCapClassList == null + ? Collections.emptyList() + : supIfCapClassList + .stream().map(e -> e.getSimpleName()) + .collect(Collectors.toList()); + } + 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())) { @@ -688,15 +709,15 @@ public class PortMappingVersion121 { Optional cpOpt = circuitPackList.stream() .filter(cP -> cP.getCircuitPackName().equals(port.getPartnerPort().getCircuitPackName())) .findFirst(); - if (!cpOpt.isPresent()) { - LOG.error("{} : Error fetching circuit-pack {}", nodeId, port.getPartnerPort().getCircuitPackName()); + 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())) .findFirst(); - if (!poOpt.isPresent()) { - LOG.error("{} : Error fetching port {} on {}", + if (poOpt.isEmpty()) { + LOG.error(PortMappingUtils.NO_PORT_ON_CP_LOGMSG, nodeId, port.getPartnerPort().getPortName(), port.getPartnerPort().getCircuitPackName()); return null; } @@ -741,7 +762,7 @@ public class PortMappingVersion121 { 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}; } @@ -764,8 +785,8 @@ public class PortMappingVersion121 { 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}; } @@ -817,111 +838,45 @@ public class PortMappingVersion121 { 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); Map> connectionPortMap = getPerDegreePorts(nodeId, deviceInfo); for (Entry> cpMapEntry : connectionPortMap.entrySet()) { - switch (connectionPortMap.get(cpMapEntry.getKey()).size()) { + List cpMapValue = cpMapEntry.getValue(); + ConnectionPorts cp1 = cpMapValue.get(0); + String cp1Name = cp1.getCircuitPackName(); + switch (cpMapValue.size()) { case 1: // port is bidirectional - String cpName = connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(); - InstanceIdentifier portID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(CircuitPacks.class, new CircuitPacksKey(cpName)) - .child(Ports.class, - new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName())); - LOG.debug(PortMappingUtils.FETCH_CONNECTIONPORT_LOGMSG, - nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), cpName); - Optional portObject = this.deviceTransactionManager.getDataFromDevice(nodeId, - LogicalDatastoreType.OPERATIONAL, portID, Timeouts.DEVICE_READ_TIMEOUT, - Timeouts.DEVICE_READ_TIMEOUT_UNIT); - if (!portObject.isPresent()) { - LOG.error(PortMappingUtils.NO_PORT_ON_CP_LOGMSG, - nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), cpName); + Ports port = getTtpPort(cp1, cp1Name, nodeId); + if (port == null) { return false; } - Ports port = portObject.get(); - if (port.getPortQual() == null) { - continue; - } - if (Port.PortQual.RoadmExternal.getIntValue() != port.getPortQual().getIntValue()) { - LOG.error(PortMappingUtils.CANNOT_CREATE_LCP_LOGMSG + PortMappingUtils.PORTQUAL_ERROR_LOGMSG, - nodeId, port.getPortName(), cpName); + if (!checkTtpPort(port, cp1Name, nodeId, true)) { continue; } - if (Direction.Bidirectional.getIntValue() != port.getPortDirection().getIntValue()) { - LOG.error(PortMappingUtils.CANNOT_CREATE_LCP_LOGMSG + PortMappingUtils.PORTDIR_ERROR_LOGMSG, - nodeId, port.getPortName(), cpName); - continue; - } - String logicalConnectionPoint = PortMappingUtils.degreeTtpNodeName(cpMapEntry.getKey().toString(), "TXRX"); LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG, - nodeId, port.getPortName(), cpName, logicalConnectionPoint); - portMapList.add(createMappingObject(nodeId, port, cpName, logicalConnectionPoint)); + 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())); - LOG.debug(PortMappingUtils.FETCH_CONNECTIONPORT_LOGMSG, - 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())); - LOG.debug(PortMappingUtils.FETCH_CONNECTIONPORT_LOGMSG, - 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(PortMappingUtils.NO_PORT_ON_CP_LOGMSG, - nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), cp1Name); + Ports port1 = getTtpPort(cp1, cp1Name, nodeId); + if (port1 == null) { return false; } - if (!port2Object.isPresent()) { - LOG.error(PortMappingUtils.NO_PORT_ON_CP_LOGMSG, - nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName(), cp2Name); + ConnectionPorts cp2 = cpMapValue.get(1); + String cp2Name = cp2.getCircuitPackName(); + Ports port2 = getTtpPort(cp2, cp2Name, nodeId); + if (port2 == null) { return false; } - - Ports port1 = port1Object.get(); - Ports port2 = port2Object.get(); - if (port1.getPortQual() == null || port2.getPortQual() == null) { - continue; - } - if (Port.PortQual.RoadmExternal.getIntValue() != port1.getPortQual().getIntValue()) { - LOG.error(PortMappingUtils.CANNOT_CREATE_LCP_LOGMSG + PortMappingUtils.PORTQUAL_ERROR_LOGMSG, - nodeId, port1.getPortName(), cp1Name); - continue; - } - if (Port.PortQual.RoadmExternal.getIntValue() != port2.getPortQual().getIntValue()) { - LOG.error(PortMappingUtils.CANNOT_CREATE_LCP_LOGMSG + PortMappingUtils.PORTQUAL_ERROR_LOGMSG, - nodeId, port2.getPortName(), cp2Name); - continue; - } - - if (!checkPartnerPort(cp1Name, port1, port2)) { - LOG.error(PortMappingUtils.NOT_CORRECT_PARTNERPORT_LOGMSG, - nodeId, port2.getPortName(), cp2Name, port1.getPortName(), cp1Name); - continue; - } - // Directions checks are the same for cp1 and cp2, no need to check them twice. - if (!checkPartnerPortNoDir(cp2Name, port2, port1)) { - LOG.error(PortMappingUtils.NOT_CORRECT_PARTNERPORT_LOGMSG, - nodeId, port1.getPortName(), cp1Name, port2.getPortName(), cp2Name); + if (!checkTtpPortsUnidir(port1, port2, cp1Name, cp2Name, nodeId)) { continue; } - String logicalConnectionPoint1 = PortMappingUtils.degreeTtpNodeName(cpMapEntry.getKey().toString(), port1.getPortDirection().getName().toUpperCase(Locale.getDefault())); LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG, @@ -934,23 +889,90 @@ public class PortMappingVersion121 { 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 + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(CircuitPacks.class, new CircuitPacksKey(cpName)) + .child(Ports.class, new PortsKey(cp.getPortName())) + .build(); + 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 (Port.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(OpenroadmNodeVersion._121); + .setOpenroadmVersion(OpenroadmNodeVersion._121) + .setNodeClli( + deviceInfo.getClli() == null || deviceInfo.getClli().isEmpty() + ? "defaultCLLI" + : deviceInfo.getClli()); // TODO check if we can use here .setNodeType(NodeTypes.forValue(..) such as with 221 switch (deviceInfo.getNodeType().getIntValue()) { case 1: @@ -958,14 +980,9 @@ public class PortMappingVersion121 { nodeInfoBldr.setNodeType(NodeTypes.forValue(deviceInfo.getNodeType().getIntValue())); break; default: - LOG.error("Error with node-type of {}", deviceInfo.getNodeId()); + LOG.error(PortMappingUtils.NODE_TYPE_LOGMSG, deviceInfo.getNodeId(), "value not supported"); // TODO: is this protection useful ? it is not present in Portmapping 221 } - if (deviceInfo.getClli() != null && !deviceInfo.getClli().isEmpty()) { - nodeInfoBldr.setNodeClli(deviceInfo.getClli()); - } else { - nodeInfoBldr.setNodeClli("defaultCLLI"); - } if (deviceInfo.getModel() != null) { nodeInfoBldr.setNodeModel(deviceInfo.getModel()); } @@ -975,8 +992,15 @@ public class PortMappingVersion121 { if (deviceInfo.getIpAddress() != null) { nodeInfoBldr.setNodeIpAddress(deviceInfo.getIpAddress()); } - return nodeInfoBldr.build(); } + private Optional getInterfaceFromDevice(String nodeId, String interfaceName) { + InstanceIdentifier interfacesIID = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(Interface.class, new InterfaceKey(interfaceName)) + .build(); + return deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.CONFIGURATION, + interfacesIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); + } }