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=22eff15d1aa38997c871ea478c4427e752b7e243;hb=f4e178b85f154d6ca8bad12280d70ce5aa043dd9;hp=121c7514010f367e547b0d8a6b69454615237bf3;hpb=9e620f8a99f2efc391b580fec98202a812f43ed6;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 121c75140..22eff15d1 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 @@ -9,11 +9,13 @@ package org.opendaylight.transportpce.common.mapping; import com.google.common.util.concurrent.FluentFuture; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 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; @@ -31,35 +33,35 @@ 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.rev220922.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.NetworkBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.OpenroadmNodeVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.cp.to.degree.CpToDegree; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.cp.to.degree.CpToDegreeBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.cp.to.degree.CpToDegreeKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mapping.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mapping.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mc.capabilities.McCapabilities; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mc.capabilities.McCapabilitiesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mc.capabilities.McCapabilitiesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mpdr.restrictions.grp.MpdrRestrictionsBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.network.NodesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.network.nodes.NodeInfo; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.network.nodes.NodeInfoBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.regen.profiles.grp.RegenProfilesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.switching.pool.lcp.SwitchingPoolLcp; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.switching.pool.lcp.SwitchingPoolLcpBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.switching.pool.lcp.SwitchingPoolLcpKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.switching.pool.lcp.switching.pool.lcp.NonBlockingList; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.switching.pool.lcp.switching.pool.lcp.NonBlockingListBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.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; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.OrgOpenroadmDeviceData; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.circuit.pack.Ports; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.circuit.pack.PortsKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.circuit.packs.CircuitPacks; @@ -92,6 +94,7 @@ 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; @@ -117,7 +120,6 @@ public class PortMappingVersion710 { private final DataBroker dataBroker; private final DeviceTransactionManager deviceTransactionManager; - private final OpenRoadmInterfaces openRoadmInterfaces; static { SUFFIX = Map.of( @@ -126,18 +128,19 @@ public class PortMappingVersion710 { Direction.Bidirectional, "TXRX"); } - public PortMappingVersion710(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager, - OpenRoadmInterfaces openRoadmInterfaces) { + public PortMappingVersion710(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager) { this.dataBroker = dataBroker; this.deviceTransactionManager = deviceTransactionManager; - this.openRoadmInterfaces = openRoadmInterfaces; } public boolean createMappingData(String nodeId) { LOG.info(PortMappingUtils.CREATE_MAPPING_DATA_LOGMSG, nodeId, "7.1"); List portMapList = new ArrayList<>(); Map mcCapabilities = new HashMap<>(); - InstanceIdentifier infoIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child(Info.class); + 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); @@ -145,7 +148,7 @@ public class PortMappingVersion710 { LOG.warn(PortMappingUtils.DEVICE_HAS_LOGMSG, nodeId, "no info", "subtree"); return false; } - Info deviceInfo = deviceInfoOptional.get(); + Info deviceInfo = deviceInfoOptional.orElseThrow(); NodeInfo nodeInfo = createNodeInfo(deviceInfo); if (nodeInfo == null) { return false; @@ -207,12 +210,14 @@ public class PortMappingVersion710 { 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(); + portId, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT).orElseThrow(); Mapping newMapping = updateMappingObject(nodeId, port, oldMapping); LOG.debug(PortMappingUtils.UPDATE_MAPPING_LOGMSG, nodeId, oldMapping, oldMapping.getLogicalConnectionPoint(), newMapping); @@ -238,7 +243,7 @@ public class PortMappingVersion710 { 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(); + portmappingNode = readTx.read(LogicalDatastoreType.CONFIGURATION, portMappingNodeIID).get().orElseThrow(); } catch (InterruptedException | ExecutionException ex) { LOG.error("Unable to read the port-mapping for nodeId {}", nodeId, ex); } @@ -247,7 +252,7 @@ public class PortMappingVersion710 { } OduSwitchingPools osp = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, - ospIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT).get(); + ospIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT).orElseThrow(); Uint16 ospNumber = osp.getSwitchingPoolNumber(); Map splMap = new HashMap(portmappingNode.nonnullSwitchingPoolLcp()); @@ -284,10 +289,10 @@ public class PortMappingVersion710 { || !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<>(); + Set lcpList = nblBldr.getLcpList() != null ? nblBldr.getLcpList() : new HashSet<>(); for (InstanceIdentifier id : entry.getValue()) { PortList portList = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, - id, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT).get(); + id, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT).orElseThrow(); String lcp = getLcpFromCpAndPort(mappings, portList.getCircuitPackName(), portList.getPortName()); if (lcp == null || lcpList.contains(lcp)) { return null; @@ -327,48 +332,16 @@ public class PortMappingVersion710 { } } 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) { - 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); - } - switchingPoolList.add( - new SwitchingPoolLcpBuilder() - .setSwitchingPoolNumber(odp.getSwitchingPoolNumber()) - .setSwitchingPoolType(odp.getSwitchingPoolType()) - //TODO differs from 2.2.1 SwitchingPoolTypes.forValue(odp.getSwitchingPoolType().getIntValue()) - .setNonBlockingList(nbMap) - .build()); - } - postPortMapping(nodeId, null, null, null, switchingPoolList, 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); + 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); @@ -376,7 +349,7 @@ public class PortMappingVersion710 { LOG.error(PortMappingUtils.CANNOT_GET_DEV_CONF_LOGMSG, nodeId); return null; } - OrgOpenroadmDevice device = deviceObject.get(); + OrgOpenroadmDevice device = deviceObject.orElseThrow(); if (device.getCircuitPacks() == null) { LOG.warn(PortMappingUtils.MISSING_CP_LOGMSG, nodeId, PortMappingUtils.FOUND); return null; @@ -405,7 +378,7 @@ public class PortMappingVersion710 { 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]; @@ -447,14 +420,53 @@ public class PortMappingVersion710 { nodeId, circuitPackName); return null; } - Optional portsList = cpList.get().nonnullPorts().values().stream() + Optional portsList = cpList.orElseThrow().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(); + return portsList.orElseThrow(); + } + + 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; + } + Set lcpList = new HashSet<>(); + 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); + } + switchingPoolList.add( + new SwitchingPoolLcpBuilder() + .setSwitchingPoolNumber(odp.getSwitchingPoolNumber()) + .setSwitchingPoolType(odp.getSwitchingPoolType()) + //TODO differs from 2.2.1 SwitchingPoolTypes.forValue(odp.getSwitchingPoolType().getIntValue()) + .setNonBlockingList(nbMap) + .build()); + } + return switchingPoolList; } private boolean checkPartnerPortNotNull(Ports port) { @@ -487,14 +499,16 @@ public class PortMappingVersion710 { List srgCps = new ArrayList<>(); LOG.debug(PortMappingUtils.GETTING_CP_LOGMSG, deviceId, srgCounter); - InstanceIdentifier srgIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(SharedRiskGroup.class, new SharedRiskGroupKey(Uint16.valueOf(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); if (ordmSrgObject.isPresent()) { - srgCps.addAll(ordmSrgObject.get().nonnullCircuitPacks().values()); - cpPerSrg.put(ordmSrgObject.get().getSrgNumber().toJava(), srgCps); + srgCps.addAll(ordmSrgObject.orElseThrow().nonnullCircuitPacks().values()); + cpPerSrg.put(ordmSrgObject.orElseThrow().getSrgNumber().toJava(), srgCps); } } LOG.info(PortMappingUtils.DEVICE_HAS_LOGMSG, deviceId, cpPerSrg.size(), "SRG"); @@ -506,12 +520,12 @@ public class PortMappingVersion710 { for (Entry> srgCpEntry : getSrgCps(nodeId, deviceInfo).entrySet()) { List keys = new ArrayList<>(); + int portIndex = 1; for (org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.srg.CircuitPacks cp : srgCpEntry.getValue()) { String circuitPackName = cp.getCircuitPackName(); List portList = getPortList(circuitPackName, nodeId); Collections.sort(portList, new SortPort710ByName()); - int portIndex = 1; for (Ports port : portList) { if (!checkPortQual(port, circuitPackName, nodeId)) { continue; @@ -566,35 +580,38 @@ public class PortMappingVersion710 { nodeId, port.getPortName(), circuitPackName); return null; } - InstanceIdentifier port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + InstanceIdentifier port2ID = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(port.getPartnerPort().getCircuitPackName())) - .child(Ports.class, new PortsKey(port.getPartnerPort().getPortName())); + .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() != PortQual.RoadmExternal.getIntValue()) { + || port2Object.orElseThrow().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(); + Ports port2 = port2Object.orElseThrow(); 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++; - //TODO check if we really needed to increase portIndex - // if yes this block should not be in getPartnerPort + //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)); + 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); @@ -603,11 +620,11 @@ public class PortMappingVersion710 { nodeId, circuitPackName); return new ArrayList<>(); } - if (circuitPackObject.get().getPorts() == null) { + if (circuitPackObject.orElseThrow().getPorts() == null) { LOG.warn(PortMappingUtils.NO_PORT_ON_CP_LOGMSG, nodeId, PortMappingUtils.FOUND, circuitPackName); return new ArrayList<>(); } - return new ArrayList<>(circuitPackObject.get().nonnullPorts().values()); + return new ArrayList<>(circuitPackObject.orElseThrow().nonnullPorts().values()); } private String createLogicalConnectionPort(Ports port, int index, int portIndex) { @@ -621,7 +638,9 @@ public class PortMappingVersion710 { private Map getMcCapabilityProfiles(String deviceId, Info ordmInfo) { Map mcCapabilityProfiles = new HashMap<>(); - InstanceIdentifier deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class); + InstanceIdentifier deviceIID = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .build(); Optional deviceObject = deviceTransactionManager.getDataFromDevice(deviceId, LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); @@ -631,11 +650,14 @@ public class PortMappingVersion710 { LOG.warn("MC-capabilities profile will be empty for node {}", deviceId); return mcCapabilityProfiles; } - device = deviceObject.get(); + device = deviceObject.orElseThrow(); mcCapabilityProfiles = device.getMcCapabilityProfile(); return mcCapabilityProfiles; } + @SuppressFBWarnings( + value = "SLF4J_UNKNOWN_ARRAY", + justification = "False positive") private Map getDegreesMap(String deviceId, Info ordmInfo) { Map degrees = new HashMap<>(); @@ -645,13 +667,15 @@ public class PortMappingVersion710 { for (int degreeCounter = 1; degreeCounter <= maxDegree; degreeCounter++) { LOG.debug(PortMappingUtils.GETTING_CONPORT_LOGMSG, deviceId, degreeCounter); - InstanceIdentifier deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(Degree.class, new DegreeKey(Uint16.valueOf(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); if (ordmDegreeObject.isPresent()) { - degrees.put(degreeCounter, ordmDegreeObject.get()); + degrees.put(degreeCounter, ordmDegreeObject.orElseThrow()); } } LOG.info(PortMappingUtils.DEVICE_HAS_LOGMSG, @@ -673,13 +697,15 @@ public class PortMappingVersion710 { // if not present assume to be 20 (temporary) Integer maxSrg = ordmInfo.getMaxSrgs() == null ? 20 : ordmInfo.getMaxSrgs().toJava(); for (int srgCounter = 1; srgCounter <= maxSrg; srgCounter++) { - InstanceIdentifier srgIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(SharedRiskGroup.class, new SharedRiskGroupKey(Uint16.valueOf(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); if (ordmSrgObject.isPresent()) { - srgs.add(ordmSrgObject.get()); + srgs.add(ordmSrgObject.orElseThrow()); } } @@ -688,40 +714,46 @@ public class PortMappingVersion710 { 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.isEmpty() || protocolObject.get().augmentation(Protocols1.class).getLldp() == null) { + if (protocolObject.isEmpty() || protocolObject.orElseThrow().augmentation(Protocols1.class).getLldp() == null) { LOG.warn(PortMappingUtils.PROCESSING_DONE_LOGMSG, nodeId, PortMappingUtils.CANNOT_GET_LLDP_CONF_LOGMSG); return new HashMap<>(); } Map cpToInterfaceMap = new HashMap<>(); - Lldp lldp = protocolObject.get().augmentation(Protocols1.class).getLldp(); + Lldp lldp = protocolObject.orElseThrow().augmentation(Protocols1.class).getLldp(); for (PortConfig portConfig : lldp.nonnullPortConfig().values()) { 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.isEmpty() || interfaceObject.get().getSupportingCircuitPackName() == null) { + if (interfaceObject.isEmpty() || interfaceObject.orElseThrow().getSupportingCircuitPackName() == null) { continue; } - String supportingCircuitPackName = interfaceObject.get().getSupportingCircuitPackName(); + String supportingCircuitPackName = interfaceObject.orElseThrow().getSupportingCircuitPackName(); cpToInterfaceMap.put(supportingCircuitPackName, portConfig.getIfName()); - InstanceIdentifier circuitPacksIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(CircuitPacks.class, new CircuitPacksKey(supportingCircuitPackName)); + InstanceIdentifier circuitPacksIID = InstanceIdentifier + .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.isEmpty() || circuitPackObject.get().getParentCircuitPack() == null) { + if (circuitPackObject.isEmpty() || circuitPackObject.orElseThrow().getParentCircuitPack() == null) { continue; } - cpToInterfaceMap.put(circuitPackObject.get().getParentCircuitPack().getCircuitPackName(), + cpToInterfaceMap.put(circuitPackObject.orElseThrow().getParentCircuitPack().getCircuitPackName(), portConfig.getIfName()); } LOG.info(PortMappingUtils.PROCESSING_DONE_LOGMSG, nodeId, " - success"); @@ -920,9 +952,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 @@ -943,41 +973,46 @@ public class PortMappingVersion710 { } private MappingBuilder updateMappingInterfaces(String nodeId, MappingBuilder mpBldr, Ports port) { + mpBldr.setSupportingOtu4(null) + .setSupportingOdu4(null) + .setSupportingOducn(null) + .setSupportingOtucn(null); for (Interfaces interfaces : port.getInterfaces()) { - try { - Optional openRoadmInterface = this.openRoadmInterfaces.getInterface(nodeId, - interfaces.getInterfaceName()); - if (openRoadmInterface.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()); + Optional openRoadmInterface = getInterfaceFromDevice(nodeId, + interfaces.getInterfaceName()); + if (openRoadmInterface.isEmpty()) { + LOG.warn(PortMappingUtils.INTF_ISSUE_LOGMSG, + nodeId, interfaces.getInterfaceName() + "- empty interface"); + continue; + } + InterfaceType interfaceType = openRoadmInterface.orElseThrow().getType(); + LOG.debug(PortMappingUtils.GOT_INTF_LOGMSG, nodeId, openRoadmInterface.orElseThrow().getName(), + interfaceType); + // Check if interface type is OMS or OTS + // Switch/Case might be more indicated here but is not possible in jdk17 w/o enable-preview + if (interfaceType.equals(OpenROADMOpticalMultiplex.VALUE)) { + mpBldr.setSupportingOms(interfaces.getInterfaceName()); + } else if (interfaceType.equals(OpticalTransport.VALUE)) { + mpBldr.setSupportingOts(interfaces.getInterfaceName()); + //TODO check if the following lines for Eth CSMACD present in 1.2.1 and 2.2.1 were not forgotten in 7.1 + //} else if(interfaceType.equals(EthernetCsmacd.VALUE)) { + // mpBldr.setSupportingEthernet(interfaces.getInterfaceName()); + } else if (interfaceType.equals(OtnOtu.VALUE)) { + String interfaceName = interfaces.getInterfaceName(); + String suffix = interfaceName.substring(interfaceName.lastIndexOf("-") + 1); + if (suffix.equals("OTU4")) { + mpBldr.setSupportingOtu4(interfaces.getInterfaceName()); + } else if (suffix.contains("OTUC")) { + mpBldr.setSupportingOtucn(interfaces.getInterfaceName()); } + } else if (interfaceType.equals(OtnOdu.VALUE)) { String interfaceName = interfaces.getInterfaceName(); - if (interfaceType.equals(OtnOdu.class) - && (interfaceName.substring(interfaceName.lastIndexOf("-") + 1) - .equals("ODU"))) { + String suffix = interfaceName.substring(interfaceName.lastIndexOf("-") + 1); + if (suffix.equals("ODU4")) { mpBldr.setSupportingOdu4(interfaces.getInterfaceName()); + } else if (suffix.contains("ODUC")) { + mpBldr.setSupportingOducn(interfaces.getInterfaceName()); } - if ((interfaceType.equals(OtnOdu.class)) - && (interfaceName.substring(interfaceName.lastIndexOf("-") + 1) - .equals("ODUC4"))) { - mpBldr.setSupportingOduc4(interfaces.getInterfaceName()); - } - - } catch (OpenRoadmInterfaceException ex) { - LOG.warn(PortMappingUtils.INTF_ISSUE_LOGMSG, - nodeId, interfaces.getInterfaceName(), ex); } } return mpBldr; @@ -1008,37 +1043,51 @@ public class PortMappingVersion710 { mpBldr.setPortQual(port.getPortQual().getName()); } if (xpdrNodeType != null) { - mpBldr.setXponderType(xpdrNodeType); + mpBldr.setXpdrType(xpdrNodeType); } if (partnerLcp != null) { mpBldr.setPartnerLcp(partnerLcp); } Collection supIntfCapaList = getSupIntfCapaList(port); if (supIntfCapaList != null) { - List> supportedIntf = new ArrayList<>(); - SupportedInterfaceCapability sic1 = null; + Set + supportedIntf = new HashSet<>(); + Set regenProfiles = new HashSet<>(); for (SupportedInterfaceCapability sic : supIntfCapaList) { - supportedIntf.add(sic.getIfCapType()); - sic1 = sic; - } - mpBldr.setSupportedInterfaceCapability(supportedIntf); - if (port.getPortQual() == PortQual.SwitchClient - && !sic1.getOtnCapability().getMpdrClientRestriction().isEmpty()) { - // Here we assume all the supported-interfaces has the support same rates, and the - // trib-slot numbers are assumed to be the same - String mxpProfileName = - sic1.getOtnCapability().getMpdrClientRestriction().get(0).getMuxpProfileName().get(0); - // From this muxponder-profile get the min-trib-slot and the max-trib-slot - LOG.info("{}: Muxp-profile used for trib information {}", nodeId, mxpProfileName); - // This provides the tribSlot information from muxProfile - List minMaxOpucnTribSlots = getOpucnTribSlots(nodeId, mxpProfileName); - mpBldr.setMpdrRestrictions( - new MpdrRestrictionsBuilder() - .setMinTribSlot(minMaxOpucnTribSlots.get(0)) - .setMaxTribSlot(minMaxOpucnTribSlots.get(1)) - .build()); + // Here it could add null values and cause a null pointer exception + // Especially when the MappingUtilsImpl does not contain required supported-if-cap + if (MappingUtilsImpl.convertSupIfCapa(sic.getIfCapType().toString()) != null) { + supportedIntf.add(MappingUtilsImpl.convertSupIfCapa(sic.getIfCapType().toString())); + } + LOG.debug("This the xpdr-type {}", xpdrNodeType.getName()); + // Here we use both types of Regen (bi/uni). Though initial support is only for bi-directional regen + if (xpdrNodeType == XpdrNodeTypes.Regen || xpdrNodeType == XpdrNodeTypes.RegenUni) { + if (sic.getOtsigroupCapabilityProfileName().isEmpty()) { + LOG.error("Otsigroup-capability-profile-name is not found for regen port {}", + port.getPortName()); + } + LOG.info("Regen-profiles {}", sic.getOtsigroupCapabilityProfileName()); + regenProfiles.addAll(sic.getOtsigroupCapabilityProfileName()); + } + if (port.getPortQual() == PortQual.SwitchClient + && sic.getOtnCapability() != null) { + // 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 = sic.getOtnCapability().getMpdrClientRestriction().get(0) + .getMuxpProfileName().stream().findFirst().orElseThrow(); + // From this muxponder-profile get the min-trib-slot and the max-trib-slot + LOG.info("{}: Muxp-profile used for trib information {}", nodeId, mxpProfileName); + // This provides the tribSlot information from muxProfile + List minMaxOpucnTribSlots = getOpucnTribSlots(nodeId, mxpProfileName); + mpBldr.setMpdrRestrictions( + new MpdrRestrictionsBuilder() + .setMinTribSlot(minMaxOpucnTribSlots.get(0)) + .setMaxTribSlot(minMaxOpucnTribSlots.get(1)) + .build()); + } } + mpBldr.setRegenProfiles(new RegenProfilesBuilder().setRegenProfile(regenProfiles).build()) + .setSupportedInterfaceCapability(supportedIntf); } if (port.getAdministrativeState() != null) { mpBldr.setPortAdminState(port.getAdministrativeState().name()); @@ -1060,14 +1109,16 @@ public class PortMappingVersion710 { ArrayList minMaxOpucnTribSlots = new ArrayList<>(2); LOG.info("{} : Getting Min/Max Trib-slots from {}", deviceId, mxpProfileName); - InstanceIdentifier deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(MuxpProfile.class, new MuxpProfileKey(mxpProfileName)); + InstanceIdentifier deviceIID = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(MuxpProfile.class, new MuxpProfileKey(mxpProfileName)) + .build(); Optional muxpProfileObject = this.deviceTransactionManager.getDataFromDevice(deviceId, LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - List ntwHoOduOpucnTribSlots = muxpProfileObject.get().getNetworkHoOduOpucnTribSlots(); + Set ntwHoOduOpucnTribSlots = muxpProfileObject.orElseThrow().getNetworkHoOduOpucnTribSlots(); // Sort the tib-slots in ascending order and pick min and max List sortedNtwHoOduOpucnTribSlots = ntwHoOduOpucnTribSlots.stream().sorted( Comparator.comparingDouble(x -> Double.parseDouble( @@ -1097,7 +1148,7 @@ public class PortMappingVersion710 { LOG.error(PortMappingUtils.MISSING_CP_LOGMSG, nodeId, port.getPartnerPort().getCircuitPackName()); return null; } - Optional poOpt = cpOpt.get().nonnullPorts().values().stream() + Optional poOpt = cpOpt.orElseThrow().nonnullPorts().values().stream() .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName())) .findFirst(); if (poOpt.isEmpty()) { @@ -1105,8 +1156,8 @@ public class PortMappingVersion710 { nodeId, port.getPartnerPort().getPortName(), port.getPartnerPort().getCircuitPackName()); return null; } - Ports port2 = poOpt.get(); - circuitPackName2.append(cpOpt.get().getCircuitPackName()); + Ports port2 = poOpt.orElseThrow(); + circuitPackName2.append(cpOpt.orElseThrow().getCircuitPackName()); if (!checkPartnerPort(circuitPackName, port, port2)) { LOG.error(PortMappingUtils.NOT_CORRECT_PARTNERPORT_LOGMSG, nodeId, port2.getPortName(), circuitPackName2, port.getPortName(), circuitPackName); @@ -1159,7 +1210,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; @@ -1315,9 +1366,11 @@ public class PortMappingVersion710 { } private Ports getTtpPort(ConnectionPorts cp, String cpName, String nodeId) { - InstanceIdentifier portID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + InstanceIdentifier portID = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(cpName)) - .child(Ports.class, new PortsKey(cp.getPortName())); + .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, @@ -1326,7 +1379,7 @@ public class PortMappingVersion710 { LOG.error(PortMappingUtils.NO_PORT_ON_CP_LOGMSG, nodeId, cp.getPortName(), cpName); return null; } - return portObject.get(); + return portObject.orElseThrow(); } private boolean checkPortQual(Ports port, String cpName, String nodeId) { @@ -1412,4 +1465,12 @@ public class PortMappingVersion710 { return null; } + 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); + } }