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=e3809e81cefeeb3ad7bff46f80aac514afa6c981;hb=e6bff36d0f17d336ae7fef5164b63a764fcc8b2e;hp=ebaffd1696fcdb11c7e19d6c738fd4b59cd3be8a;hpb=9d8ca4c07245ca21921b6c5f1330394cb08a48eb;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 ebaffd169..e3809e81c 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 @@ -10,6 +10,7 @@ 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; @@ -18,6 +19,7 @@ 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; @@ -29,32 +31,30 @@ 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.mc.capabilities.McCapabilities; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.mc.capabilities.McCapabilitiesBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.mc.capabilities.McCapabilitiesKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.mpdr.restrictions.grp.MpdrRestrictionsBuilder; -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.rev210426.switching.pool.lcp.SwitchingPoolLcp; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.switching.pool.lcp.SwitchingPoolLcpBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.switching.pool.lcp.SwitchingPoolLcpKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.switching.pool.lcp.switching.pool.lcp.NonBlockingList; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.switching.pool.lcp.switching.pool.lcp.NonBlockingListBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.switching.pool.lcp.switching.pool.lcp.NonBlockingListKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.NetworkBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.OpenroadmNodeVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.cp.to.degree.CpToDegree; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.cp.to.degree.CpToDegreeBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.cp.to.degree.CpToDegreeKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mapping.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mapping.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mc.capabilities.McCapabilities; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mc.capabilities.McCapabilitiesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mc.capabilities.McCapabilitiesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mpdr.restrictions.grp.MpdrRestrictionsBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.NodesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.nodes.NodeInfo; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.nodes.NodeInfoBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.switching.pool.lcp.SwitchingPoolLcp; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.switching.pool.lcp.SwitchingPoolLcpBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.switching.pool.lcp.SwitchingPoolLcpKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.switching.pool.lcp.switching.pool.lcp.NonBlockingList; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.switching.pool.lcp.switching.pool.lcp.NonBlockingListBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.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; @@ -90,14 +90,13 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev191129.Inte 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.yang.gen.v1.http.org.openroadm.port.capability.rev200529.port.capability.grp.port.capabilities.supported._interface.capability.otn.capability.MpdrClientRestriction; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; import org.opendaylight.yangtools.yang.common.Uint16; @@ -113,10 +112,10 @@ 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( @@ -125,11 +124,9 @@ 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) { @@ -157,14 +154,14 @@ public class PortMappingVersion710 { // 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; } // Get MC capabilities @@ -176,7 +173,7 @@ public class PortMappingVersion710 { 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; } // In the case of 7.1 models, even XPDR advertizes mc-capabilities, @@ -190,7 +187,7 @@ public class PortMappingVersion710 { break; default: LOG.error(PortMappingUtils.UNABLE_MAPPING_LOGMSG, - nodeId, "create", deviceInfo.getNodeType() + " - unknown nodetype"); + nodeId, PortMappingUtils.CREATE, deviceInfo.getNodeType() + " - unknown nodetype"); break; } @@ -199,11 +196,11 @@ public class PortMappingVersion710 { 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) @@ -225,7 +222,7 @@ public class PortMappingVersion710 { 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; } } @@ -233,8 +230,8 @@ public class PortMappingVersion710 { public boolean updatePortMappingWithOduSwitchingPools(String nodeId, InstanceIdentifier ospIID, Map>> nbliidMap) { - KeyedInstanceIdentifier portMappingNodeIID = InstanceIdentifier.create(Network.class) - .child(Nodes.class, new NodesKey(nodeId)); + 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(); @@ -244,7 +241,6 @@ public class PortMappingVersion710 { if (portmappingNode == null) { return false; } - Map mappings = portmappingNode.nonnullMapping(); OduSwitchingPools osp = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, ospIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT).get(); @@ -257,72 +253,101 @@ public class PortMappingVersion710 { .setSwitchingPoolType(osp.getSwitchingPoolType()); Map nblMap = new HashMap<>(); for (Entry>> entry : nbliidMap.entrySet()) { - Uint32 interconnectBw = 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(); - NonBlockingList nbl = createNonBlockingList(splBldr, interconnectBw, entry, mappings, nodeId); + 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(); + SwitchingPoolLcp switchingPoolLcp = splBldr.setNonBlockingList(nblMap).build(); splMap.put(switchingPoolLcp.key(), switchingPoolLcp); - List switchingPoolList = new ArrayList<>(splMap.values()); - postPortMapping(nodeId, null, null, null, switchingPoolList, null); + 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; - if (splBldr.getNonBlockingList() != null - && splBldr.getNonBlockingList().containsKey(new NonBlockingListKey(entry.getKey()))) { - nblBldr = new NonBlockingListBuilder(splBldr.getNonBlockingList() - .get(new NonBlockingListKey(entry.getKey()))); - } else { - nblBldr = new NonBlockingListBuilder() - .setNblNumber(entry.getKey()) - .setInterconnectBandwidth(interconnectBw); - } + 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 circuitPackName = portList.getCircuitPackName(); - String portName = portList.getPortName(); - String lcp = getLcpFromCpAndPort(mappings, circuitPackName, portName); - if (lcp != null && !lcpList.contains(lcp)) { - lcpList.add(lcp); - } else { + String lcp = getLcpFromCpAndPort(mappings, portList.getCircuitPackName(), portList.getPortName()); + if (lcp == null || lcpList.contains(lcp)) { return null; } + lcpList.add(lcp); } - nblBldr.setLcpList(lcpList); - return nblBldr.build(); + 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.isEmpty()) { LOG.error(PortMappingUtils.CANNOT_GET_DEV_CONF_LOGMSG, nodeId); - return false; + return null; } OrgOpenroadmDevice device = deviceObject.get(); if (device.getCircuitPacks() == null) { - LOG.warn(PortMappingUtils.MISSING_CP_LOGMSG, nodeId, "found"); - 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) { @@ -335,22 +360,22 @@ public class PortMappingVersion710 { 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()); 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(PortMappingUtils.XPDR_LIST_IN_CONF_LOGMSG, nodeId, "found"); - 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; @@ -358,103 +383,79 @@ 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(); - // 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(PortMappingUtils.MISSING_CP_LOGMSG + PortMappingUtils.PORTMAPPING_IGNORE_LOGMSG, - nodeId, circuitPackName); - 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(PortMappingUtils.NO_ASSOC_FOUND_LOGMSG + PortMappingUtils.PORTMAPPING_IGNORE_LOGMSG, - nodeId, portName, circuitPackName, "in the device"); + Ports port = getXpdrPorts(device, xpdrPort, nodeId); + if (port == null) { 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(PortMappingUtils.NO_CONMAP_LOGMSG, nodeId); - } else { - for (ConnectionMap cm : deviceObject.get().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)); - } + 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) { - 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) { + 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(PortMappingUtils.NO_ASSOC_FOUND_LOGMSG, - nodeId, item.getPortName(), item.getCircuitPackName(), "to a logical connection point"); - 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); + .build()); } - - if (!mappingMap.isEmpty()) { - mappingMap.forEach((k,v) -> portMapList.add(v)); - } - return true; + return switchingPoolList; } private boolean checkPartnerPortNotNull(Ports port) { @@ -470,12 +471,9 @@ public class PortMappingVersion710 { } 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); } @@ -506,54 +504,26 @@ public class PortMappingVersion710 { 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) { + 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.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; - } - - 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(PortMappingUtils.PORT_NOT_RDMEXT_LOGMSG + PortMappingUtils.CANNOT_AS_LCP_LOGMSG, - nodeId, port.getPortName(), circuitPackName); - continue; - } - + String currentKey = circuitPackName + "-" + port.getPortName(); if (keys.contains(currentKey)) { 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, @@ -562,46 +532,15 @@ public class PortMappingVersion710 { portIndex++; keys.add(currentKey); 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() - != 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; - } String lcp2 = createLogicalConnectionPort(port2, srgCpEntry.getKey(),portIndex); LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG, nodeId, port2.getPortName(), circuitPackName, lcp2); @@ -612,11 +551,9 @@ public class PortMappingVersion710 { 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()); - } } } @@ -624,6 +561,55 @@ 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())); @@ -934,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 @@ -957,41 +941,47 @@ public class PortMappingVersion710 { } 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()); - } - String interfaceName = interfaces.getInterfaceName(); - if (interfaceType.equals(OtnOdu.class) - && (interfaceName.substring(interfaceName.lastIndexOf("-") + 1) - .equals("ODU"))) { - mpBldr.setSupportingOdu4(interfaces.getInterfaceName()); - } - if ((interfaceType.equals(OtnOdu.class)) - && (interfaceName.substring(interfaceName.lastIndexOf("-") + 1) - .equals("ODUC4"))) { - mpBldr.setSupportingOduc4(interfaces.getInterfaceName()); - } - - } catch (OpenRoadmInterfaceException ex) { + Optional openRoadmInterface = getInterfaceFromDevice(nodeId, + interfaces.getInterfaceName()); + if (openRoadmInterface.isEmpty()) { LOG.warn(PortMappingUtils.INTF_ISSUE_LOGMSG, - nodeId, interfaces.getInterfaceName(), ex); + 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; @@ -1006,16 +996,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(PortMappingUtils.fnv1size64(nodeIdLcp)); + .setLcpHashVal(PortMappingUtils.fnv1size64(nodeId + "-" + logicalConnectionPoint)); if (port.getPortQual() != null) { mpBldr.setPortQual(port.getPortQual().getName()); } @@ -1025,22 +1017,22 @@ public class PortMappingVersion710 { if (partnerLcp != null) { mpBldr.setPartnerLcp(partnerLcp); } - if (port.augmentation(Ports1.class) != null && port.augmentation(Ports1.class).getPortCapabilities() != null) { + Collection supIntfCapaList = getSupIntfCapaList(port); + if (supIntfCapaList != null) { List> supportedIntf = new ArrayList<>(); - Map supIfCapMap = port - .augmentation(Ports1.class).getPortCapabilities().nonnullSupportedInterfaceCapability(); SupportedInterfaceCapability sic1 = null; - for (SupportedInterfaceCapability sic : supIfCapMap.values()) { + for (SupportedInterfaceCapability sic : supIntfCapaList) { supportedIntf.add(sic.getIfCapType()); sic1 = sic; } + mpBldr.setSupportedInterfaceCapability(supportedIntf); if (port.getPortQual() == PortQual.SwitchClient && !sic1.getOtnCapability().getMpdrClientRestriction().isEmpty()) { - List mpdrClientRestriction = sic1.getOtnCapability().getMpdrClientRestriction(); // 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 = mpdrClientRestriction.get(0).getMuxpProfileName().get(0); + 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 @@ -1051,7 +1043,6 @@ public class PortMappingVersion710 { .setMaxTribSlot(minMaxOpucnTribSlots.get(1)) .build()); } - mpBldr.setSupportedInterfaceCapability(supportedIntf); } if (port.getAdministrativeState() != null) { mpBldr.setPortAdminState(port.getAdministrativeState().name()); @@ -1062,6 +1053,13 @@ 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); @@ -1165,7 +1163,7 @@ public class PortMappingVersion710 { 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; @@ -1272,32 +1270,13 @@ public class PortMappingVersion710 { 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 (port.getPortQual() == null) { - continue; - } - if (PortQual.RoadmExternal.getIntValue() != port.getPortQual().getIntValue()) { - LOG.error(PortMappingUtils.CANNOT_CREATE_LCP_LOGMSG + PortMappingUtils.PORTQUAL_ERROR_LOGMSG, - nodeId, port.getPortName(), cp1Name); + 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(), cp1Name); - continue; - } - String logicalConnectionPoint = PortMappingUtils.degreeTtpNodeName(cpMapEntry.getKey().toString(), "TXRX"); LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG, @@ -1306,59 +1285,19 @@ public class PortMappingVersion710 { 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(); - Ports port2 = port2Object.get(); - if (port1.getPortQual() == null || port2.getPortQual() == null) { - continue; - } - if (PortQual.RoadmExternal.getIntValue() != port1.getPortQual().getIntValue()) { - LOG.error(PortMappingUtils.CANNOT_CREATE_LCP_LOGMSG + PortMappingUtils.PORTQUAL_ERROR_LOGMSG, - nodeId, port1.getPortName(), cp1Name); - continue; - } - if (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, @@ -1373,19 +1312,80 @@ public class PortMappingVersion710 { default: 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(PortMappingUtils.NODE_TYPE_LOGMSG, deviceInfo.getNodeId(), "field missing"); return null; } - NodeInfoBuilder nodeInfoBldr = new NodeInfoBuilder() .setOpenroadmVersion(OpenroadmNodeVersion._71) .setNodeClli( @@ -1403,7 +1403,6 @@ public class PortMappingVersion710 { if (deviceInfo.getIpAddress() != null) { nodeInfoBldr.setNodeIpAddress(deviceInfo.getIpAddress()); } - return nodeInfoBldr.build(); } @@ -1417,4 +1416,10 @@ public class PortMappingVersion710 { 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); + } }