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=aea5d098ff51fa945797e6573d63c5b9284530a4;hb=268165cb2822b6ce4c55f00cac63eed2bb222ec7;hp=7be7778a2199610bd0b527384e394f263fd2f2ec;hpb=bcc1d7a50ece13c4eb254da6366d70f9acb6a345;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 7be7778a2..aea5d098f 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 @@ -29,22 +29,20 @@ 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.Port; @@ -66,12 +64,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; @@ -89,7 +92,6 @@ public class PortMappingVersion121 { private final DataBroker dataBroker; private final DeviceTransactionManager deviceTransactionManager; - private final OpenRoadmInterfaces openRoadmInterfaces; static { SUFFIX = Map.of( @@ -98,11 +100,9 @@ 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) { @@ -128,26 +128,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,11 +156,11 @@ 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) @@ -182,7 +182,7 @@ 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; } } @@ -199,7 +199,7 @@ public class PortMappingVersion121 { } 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,7 +214,7 @@ 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; } List portList = new ArrayList<>(cp.nonnullPorts().values()); @@ -296,12 +296,12 @@ public class PortMappingVersion121 { for (Entry> srgCpEntry : getSrgCps(nodeId, deviceInfo).entrySet()) { List keys = new ArrayList<>(); + int portIndex = 1; for (org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.srg.CircuitPacks cp : srgCpEntry.getValue()) { String circuitPackName = cp.getCircuitPackName(); List portList = getPortList(circuitPackName, nodeId); Collections.sort(portList, new SortPort121ByName()); - int portIndex = 1; for (Ports port : portList) { if (!checkPortQual(port, circuitPackName, nodeId)) { continue; @@ -323,41 +323,13 @@ public class PortMappingVersion121 { break; case Rx: case Tx: - if (!checkPartnerPortNotNull(port)) { - LOG.info(PortMappingUtils.NO_VALID_PARTNERPORT_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); @@ -378,6 +350,37 @@ 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.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); + 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)); @@ -390,7 +393,7 @@ public class PortMappingVersion121 { return new ArrayList<>(); } if (circuitPackObject.get().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); return new ArrayList<>(); } return new ArrayList<>(circuitPackObject.get().nonnullPorts().values()); @@ -564,9 +567,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 @@ -587,28 +588,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.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()); - } - } catch (OpenRoadmInterfaceException ex) { - LOG.warn(PortMappingUtils.INTF_ISSUE_LOGMSG, 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; @@ -626,13 +633,22 @@ public class PortMappingVersion121 { private Mapping createNewXpdrMapping(String nodeId, Ports port, String circuitPackName, String logicalConnectionPoint, String partnerLcp) { + List> supportedIntf = new ArrayList<>(); + 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(nodeId + "-" + logicalConnectionPoint)); + .setXponderType(XpdrNodeTypes.Tpdr) + .setLcpHashVal(PortMappingUtils.fnv1size64(nodeId + "-" + logicalConnectionPoint)) + .setSupportedInterfaceCapability(supportedIntf); if (port.getPortQual() != null) { mpBldr.setPortQual(port.getPortQual().getName()); } @@ -648,6 +664,16 @@ public class PortMappingVersion121 { return mpBldr.build(); } + private List getSupIfCapList(Ports port) { + List> 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) { @@ -801,22 +827,13 @@ public class PortMappingVersion121 { switch (cpMapValue.size()) { case 1: // port is bidirectional - InstanceIdentifier portID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(CircuitPacks.class, new CircuitPacksKey(cp1Name)) - .child(Ports.class, new PortsKey(cp1.getPortName())); - LOG.debug(PortMappingUtils.FETCH_CONNECTIONPORT_LOGMSG, nodeId, cp1.getPortName(), cp1Name); - 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, cp1.getPortName(), cp1Name); + Ports port = getTtpPort(cp1, cp1Name, nodeId); + if (port == null) { return false; } - Ports port = portObject.get(); if (!checkTtpPort(port, cp1Name, nodeId, true)) { continue; } - String logicalConnectionPoint = PortMappingUtils.degreeTtpNodeName(cpMapEntry.getKey().toString(), "TXRX"); LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG, @@ -825,52 +842,19 @@ public class PortMappingVersion121 { break; case 2: // ports are unidirectionals - ConnectionPorts cp2 = cpMapValue.get(1); - String cp2Name = cp2.getCircuitPackName(); - InstanceIdentifier port1ID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(CircuitPacks.class, new CircuitPacksKey(cp1Name)) - .child(Ports.class, new PortsKey(cp1.getPortName())); - LOG.debug(PortMappingUtils.FETCH_CONNECTIONPORT_LOGMSG, nodeId, cp1.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(cp2.getPortName())); - LOG.debug(PortMappingUtils.FETCH_CONNECTIONPORT_LOGMSG, nodeId, cp2.getPortName(), cp2Name); - Optional port2Object = this.deviceTransactionManager.getDataFromDevice(nodeId, - LogicalDatastoreType.OPERATIONAL, port2ID, Timeouts.DEVICE_READ_TIMEOUT, - Timeouts.DEVICE_READ_TIMEOUT_UNIT); - if (port1Object.isEmpty()) { - LOG.error(PortMappingUtils.NO_PORT_ON_CP_LOGMSG, nodeId, cp1.getPortName(), cp1Name); + Ports port1 = getTtpPort(cp1, cp1Name, nodeId); + if (port1 == null) { return false; } - if (port2Object.isEmpty()) { - LOG.error(PortMappingUtils.NO_PORT_ON_CP_LOGMSG, nodeId, cp2.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(); - if (!checkTtpPort(port1, cp1Name, nodeId, false)) { - continue; - } - Ports port2 = port2Object.get(); - if (!checkTtpPort(port2, cp2Name, nodeId, false)) { + if (!checkTtpPortsUnidir(port1, port2, cp1Name, cp2Name, nodeId)) { 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); - continue; - } - String logicalConnectionPoint1 = PortMappingUtils.degreeTtpNodeName(cpMapEntry.getKey().toString(), port1.getPortDirection().getName().toUpperCase(Locale.getDefault())); LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG, @@ -885,11 +869,27 @@ public class PortMappingVersion121 { default: LOG.error(PortMappingUtils.NOT_CORRECT_CONPORT_LOGMSG, nodeId, cpMapEntry.getKey()); continue; + //TODO should it be continue or return false ? } } return true; } + 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; @@ -916,14 +916,33 @@ public class PortMappingVersion121 { return true; } - private NodeInfo createNodeInfo(Info deviceInfo) { + 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(PortMappingUtils.NODE_TYPE_LOGMSG, deviceInfo.getNodeId(), "field missing"); return null; } - NodeInfoBuilder nodeInfoBldr = new NodeInfoBuilder() .setOpenroadmVersion(OpenroadmNodeVersion._121) .setNodeClli( @@ -949,8 +968,13 @@ public class PortMappingVersion121 { if (deviceInfo.getIpAddress() != null) { nodeInfoBldr.setNodeIpAddress(deviceInfo.getIpAddress()); } - return nodeInfoBldr.build(); } + 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); + } }