X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=inventory%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Finventory%2FINode221.java;h=24c6d45a9283207f0e4d4d902b2c1b96ef97055c;hb=f7d49a4792d6151b374dfe31ba50791289b5f740;hp=27a959af661139b5f32da3592e5524b25a4a814c;hpb=c65fe35c6a9810b85e12eb6a4ec7e897c14a9baf;p=transportpce.git diff --git a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java index 27a959af6..24c6d45a9 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java @@ -16,46 +16,71 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import java.util.Map; import java.util.Optional; import java.util.concurrent.ExecutionException; import javax.sql.DataSource; +import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.inventory.query.Queries; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.circuit.pack.CpSlots; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.circuit.pack.CpSlotsKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.circuit.packs.CircuitPacks; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.circuit.packs.CircuitPacksKey; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.degree.ConnectionPorts; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.degree.ConnectionPortsKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.external.links.ExternalLink; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.external.links.ExternalLinkKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.Interface; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.InterfaceKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.internal.links.InternalLink; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.internal.links.InternalLinkKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.OrgOpenroadmDevice; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.ConnectionMap; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.ConnectionMapKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.Degree; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.DegreeKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.Info; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.Protocols; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.RoadmConnections; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.RoadmConnectionsKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.SharedRiskGroup; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.SharedRiskGroupKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.physical.links.PhysicalLink; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.physical.links.PhysicalLinkKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.shelf.Slots; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.shelf.SlotsKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.shelves.Shelves; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.shelves.ShelvesKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.ethernet.interfaces.rev161014.Interface1; import org.opendaylight.yang.gen.v1.http.org.openroadm.ethernet.interfaces.rev161014.ethernet.container.EthernetBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.Protocols1; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.lldp.container.lldp.PortConfig; +import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.lldp.container.lldp.PortConfigKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.lldp.container.lldp.nbr.list.IfName; +import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.lldp.container.lldp.nbr.list.IfNameKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.och.container.OchBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.ots.container.OtsBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev161014.odu.attributes.Tcm; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev161014.odu.attributes.TcmKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev161014.odu.container.OduBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev161014.opu.opu.msi.ExpMsi; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev161014.opu.opu.msi.ExpMsiKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev161014.opu.opu.msi.RxMsi; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev161014.opu.opu.msi.RxMsiKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev161014.opu.opu.msi.TxMsi; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev161014.opu.opu.msi.TxMsiKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.otu.container.OtuBuilder; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - +@edu.umd.cs.findbugs.annotations.SuppressFBWarnings( + value = "SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING", + justification = "TODO review the SQL statement generation process") public class INode221 { private static final Logger LOG = LoggerFactory.getLogger(INode221.class); @@ -175,11 +200,16 @@ public class INode221 { Optional deviceObject = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - - LOG.info("Shelves size {}", deviceObject.get().getShelves().size()); + if (!deviceObject.isPresent()) { + LOG.error("No device found in operational datastore for nodeId {}", nodeId); + return; + } + @NonNull + Map shelvesMap = deviceObject.get().nonnullShelves(); + LOG.info("Shelves size {}", shelvesMap.size()); try (Connection connection = requireNonNull(dataSource.getConnection())) { - for (int i = 0; i < deviceObject.get().getShelves().size(); i++) { - Shelves shelve = deviceObject.get().getShelves().get(i); + for (Map.Entry entry : shelvesMap.entrySet()) { + Shelves shelve = entry.getValue(); String shelfName = shelve.getShelfName(); LOG.info("Getting Shelve Details of {}", shelfName); @@ -207,11 +237,14 @@ public class INode221 { LOG.warn("Device object {} was not found", nodeId); return; } - LOG.info("Circuit pack size {}", deviceObject.get().getCircuitPacks().size()); + @NonNull + Map circuitPacksMap = deviceObject.get().nonnullCircuitPacks(); + LOG.info("Circuit pack size {}", circuitPacksMap.size()); try (Connection connection = requireNonNull(dataSource.getConnection())) { - for (int i = 0; i < deviceObject.get().getCircuitPacks().size(); i++) { - CircuitPacks cp = deviceObject.get().getCircuitPacks().get(i); + + for (Map.Entry entry : circuitPacksMap.entrySet()) { + CircuitPacks cp = entry.getValue(); if (cp.getCpSlots() != null) { persistCircuitPacksSlots(nodeId, cp, connection); @@ -260,8 +293,10 @@ public class INode221 { private void persistShelveSlots(String nodeId, Shelves shelves, Connection connection) { String startTimetampStr = getCurrentTimestamp(); - for (int i = 0; i < shelves.getSlots().size(); i++) { - Slots slot = shelves.getSlots().get(i); + @NonNull + Map slotsMap = shelves.nonnullSlots(); + for (Map.Entry entry : slotsMap.entrySet()) { + Slots slot = entry.getValue(); LOG.info("Getting Slot Details of {}", slot.getSlotName()); Object[] parameters = new Object[]{nodeId, shelves.getShelfName(), @@ -288,8 +323,10 @@ public class INode221 { private void persistCircuitPacksSlots(String nodeId, CircuitPacks circuitPacks, Connection connection) { String startTimetampStr = getCurrentTimestamp(); - for (int i = 0; i < circuitPacks.getCpSlots().size(); i++) { - CpSlots cpSlot = circuitPacks.getCpSlots().get(i); + @NonNull + Map cpSlotsMap = circuitPacks.nonnullCpSlots(); + for (Map.Entry entry : cpSlotsMap.entrySet()) { + CpSlots cpSlot = entry.getValue(); Object[] parameters = new Object[]{nodeId, circuitPacks.getCircuitPackName(), @@ -601,7 +638,7 @@ public class INode221 { org.opendaylight.yang.gen.v1 .http.org.openroadm.optical.transport.interfaces.rev161014.Interface1.class) .getOts()); - int otsFiberTypeEnu = otsIfBuilder.getFiberType().getIntValue(); + //otsFiberTypeEnu = otsIfBuilder.getFiberType().getIntValue(); otsSpanLossReceive = otsIfBuilder.getSpanLossReceive().toString(); otsSpanLossTransmit = otsIfBuilder.getSpanLossTransmit().toString(); break; @@ -612,7 +649,7 @@ public class INode221 { .getOdu()); oduRate = String.valueOf(oduIfBuilder.getRate()); oduMonitoringMode = oduIfBuilder.getMonitoringMode().getName(); - oduProactiveDelayMeasurementEnabled = oduIfBuilder.isProactiveDelayMeasurementEnabled().toString(); + oduProactiveDelayMeasurementEnabled = oduIfBuilder.getProactiveDelayMeasurementEnabled().toString(); persistDevInterfaceTcm(nodeId, name, oduIfBuilder, connection); persistDevInterfaceOtnOduTxMsi(nodeId, name, oduIfBuilder, connection); @@ -626,7 +663,7 @@ public class INode221 { /*persistDevInterfaceOtnOduTxMsi(nodeId,name,oduIfBuilder,connection); persistDevInterfaceOtnOduRxMsi(nodeId,name,oduIfBuilder,connection); persistDevInterfaceOtnOduExpMsi(nodeId,name,oduIfBuilder,connection); */ - maintTestsignalEnabled = oduIfBuilder.getMaintTestsignal().isEnabled().toString(); + maintTestsignalEnabled = oduIfBuilder.getMaintTestsignal().getEnabled().toString(); maintTestsignalTestpatternEnu = oduIfBuilder.getMaintTestsignal().getTestPattern().getIntValue(); maintTestsignalTypeEnu = oduIfBuilder.getMaintTestsignal().getType().getIntValue(); maintTestsignalBiterrors = oduIfBuilder.getMaintTestsignal().getBitErrors().toString(); @@ -641,7 +678,7 @@ public class INode221 { .getOtu()); otuRate = otuIfBuilder.getRate().getName(); otuFecEnu = otuIfBuilder.getFec().getIntValue(); - otuMaintLoopbackEnabled = otuIfBuilder.getMaintLoopback().isEnabled().toString(); + otuMaintLoopbackEnabled = otuIfBuilder.getMaintLoopback().getEnabled().toString(); otuMaintTypeEnu = otuIfBuilder.getMaintLoopback().getType().getIntValue(); break; @@ -755,8 +792,8 @@ public class INode221 { String layer = tcm.getLayer().toString(); int monitoringModeEnu = tcm.getMonitoringMode().getIntValue(); - String ltcActEnabled = tcm.isLtcActEnabled().toString(); - String proactiveDelayMeasurementEnabled = tcm.isProactiveDelayMeasurementEnabled().toString(); + String ltcActEnabled = tcm.getLtcActEnabled().toString(); + String proactiveDelayMeasurementEnabled = tcm.getProactiveDelayMeasurementEnabled().toString(); //int tcmDirectionEnu = -1; //int timDetectModeEnu = -1; //String txSapi = ""; @@ -879,10 +916,12 @@ public class INode221 { deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, interfaceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); */ - for (int i = 0; i < deviceObject.get().getInterface().size(); i++) { + @NonNull + Map interfaceMap = deviceObject.get().nonnullInterface(); + for (Map.Entry entry : interfaceMap.entrySet()) { Interface deviceInterface; - deviceInterface = deviceObject.get().getInterface().get(i); + deviceInterface = entry.getValue(); /*if (interfaceOpt.isPresent()) { deviceInterface = interfaceOpt.get(); } else { @@ -914,7 +953,7 @@ public class INode221 { Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); if (!protocolObject.isPresent() || protocolObject.get().augmentation(Protocols1.class) == null) { LOG.error("LLDP subtree is missing"); - + return; } int adminstatusEnu = protocolObject.get().augmentation(Protocols1.class).getLldp().getGlobalConfig().getAdminStatus() @@ -961,13 +1000,15 @@ public class INode221 { Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); if (!protocolObject.isPresent() || protocolObject.get().augmentation(Protocols1.class) == null) { LOG.error("LLDP subtree is missing"); - + return; } String startTimestamp = getCurrentTimestamp(); - for (int i = 0; i < protocolObject.get().augmentation(Protocols1.class).getLldp().getPortConfig().size(); i++) { + @NonNull + Map portConfigMap = protocolObject.get() + .augmentation(Protocols1.class).getLldp().nonnullPortConfig(); + for (Map.Entry entry : portConfigMap.entrySet()) { - PortConfig portConfig = - protocolObject.get().augmentation(Protocols1.class).getLldp().getPortConfig().get(i); + PortConfig portConfig = entry.getValue(); String ifName = portConfig.getIfName(); int adminStatusEnu = portConfig.getAdminStatus().getIntValue(); @@ -1003,14 +1044,15 @@ public class INode221 { Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); if (!protocolObject.isPresent() || protocolObject.get().augmentation(Protocols1.class) == null) { LOG.error("LLDP subtree is missing"); - + return; } String startTimestamp = getCurrentTimestamp(); - for (int i = 0; i < protocolObject.get().augmentation(Protocols1.class).getLldp().getNbrList().getIfName() - .size(); i++) { + @NonNull + Map ifNameMap = protocolObject.get() + .augmentation(Protocols1.class).getLldp().getNbrList().nonnullIfName(); + for (Map.Entry entry : ifNameMap.entrySet()) { - IfName ifNameObj = - protocolObject.get().augmentation(Protocols1.class).getLldp().getNbrList().getIfName().get(i); + IfName ifNameObj = entry.getValue(); String ifName = ifNameObj.getIfName(); String remotesysname = ifNameObj.getRemoteSysName(); String remotemgmtaddresssubtype = ifNameObj.getRemoteMgmtAddressSubType().getName(); @@ -1054,10 +1096,15 @@ public class INode221 { Optional deviceObject = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - + if (!deviceObject.isPresent()) { + LOG.error("Device with node id {} not found", nodeId); + return; + } String startTimestamp = getCurrentTimestamp(); - for (int i = 0; i < deviceObject.get().getInternalLink().size(); i++) { - InternalLink internalLink = deviceObject.get().getInternalLink().get(i); + @NonNull + Map internalLinkMap = deviceObject.get().nonnullInternalLink(); + for (Map.Entry entry : internalLinkMap.entrySet()) { + InternalLink internalLink = entry.getValue(); String internalLinkName = internalLink.getInternalLinkName(); String sourceCircuitPackName = internalLink.getSource().getCircuitPackName(); String sourcePortName = internalLink.getSource().getPortName().toString(); @@ -1096,10 +1143,15 @@ public class INode221 { Optional deviceObject = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - + if (!deviceObject.isPresent()) { + LOG.error("Device with node id {} not found", nodeId); + return; + } String startTimestamp = getCurrentTimestamp(); - for (int i = 0; i < deviceObject.get().getExternalLink().size(); i++) { - ExternalLink externalLink = deviceObject.get().getExternalLink().get(i); + @NonNull + Map externalLinkMap = deviceObject.get().nonnullExternalLink(); + for (Map.Entry entry : externalLinkMap.entrySet()) { + ExternalLink externalLink = entry.getValue(); String externalLinkName = externalLink.getExternalLinkName(); String sourceNodeId = externalLink.getSource().getNodeId(); String sourceCircuitPackName = externalLink.getSource().getCircuitPackName(); @@ -1141,10 +1193,16 @@ public class INode221 { Optional deviceObject = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); + if (!deviceObject.isPresent()) { + LOG.error("Device with node id {} not found", nodeId); + return; + } String startTimestamp = getCurrentTimestamp(); - for (int i = 0; i < deviceObject.get().getPhysicalLink().size(); i++) { - PhysicalLink physicalLink = deviceObject.get().getPhysicalLink().get(i); + @NonNull + Map physicalLinkMap = deviceObject.get().nonnullPhysicalLink(); + for (Map.Entry entry : physicalLinkMap.entrySet()) { + PhysicalLink physicalLink = entry.getValue(); String physicalLinkName = physicalLink.getPhysicalLinkName(); String sourceCircuitPackName = physicalLink.getSource().getCircuitPackName(); String sourcePortName = physicalLink.getSource().getPortName().toString(); @@ -1182,10 +1240,15 @@ public class INode221 { Optional deviceObject = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - + if (!deviceObject.isPresent()) { + LOG.error("Device with node id {} not found", nodeId); + return; + } String startTimestamp = getCurrentTimestamp(); - for (int i = 0; i < deviceObject.get().getDegree().size(); i++) { - Degree degree = deviceObject.get().getDegree().get(i); + @NonNull + Map degreeMap = deviceObject.get().nonnullDegree(); + for (Map.Entry entry : degreeMap.entrySet()) { + Degree degree = entry.getValue(); String degreeNumber = degree.getDegreeNumber().toString(); String maxWavelengths = degree.getMaxWavelengths().toString(); String otdrPortCircuitPackName = degree.getOtdrPort().getCircuitPackName(); @@ -1230,10 +1293,17 @@ public class INode221 { private void persistDevDegreeCircuitPack(String nodeId, Degree degree, String degreeNumber, Connection connection) { String startTimestamp = getCurrentTimestamp(); - for (int i = 0; i < degree.getCircuitPacks().size(); i++) { + @NonNull + Map + circuitPacksMap = degree.nonnullCircuitPacks(); + for (Map.Entry entry : + circuitPacksMap.entrySet()) { - String circuitPackIndex = degree.getCircuitPacks().get(i).getIndex().toString(); - String circuitPackName = degree.getCircuitPacks().get(i).getCircuitPackName(); + + String circuitPackIndex = entry.getValue().getIndex().toString(); + String circuitPackName = entry.getValue().getCircuitPackName(); Object[] parameters = {nodeId, degreeNumber, @@ -1262,11 +1332,14 @@ public class INode221 { Connection connection) { String startTimestamp = getCurrentTimestamp(); - for (int i = 0; i < degree.getConnectionPorts().size(); i++) { + @NonNull + Map connectionPortsMap = degree.nonnullConnectionPorts(); + for (Map.Entry entry : connectionPortsMap.entrySet()) { - String connectionPortIndex = degree.getConnectionPorts().get(i).getIndex().toString(); - String circuitPackName = degree.getConnectionPorts().get(i).getCircuitPackName(); - String portName = degree.getConnectionPorts().get(i).getPortName().toString(); + ConnectionPorts connectionPorts = entry.getValue(); + String connectionPortIndex = connectionPorts.getIndex().toString(); + String circuitPackName = connectionPorts.getCircuitPackName(); + String portName = connectionPorts.getPortName().toString(); Object[] parameters = {nodeId, degreeNumber, @@ -1299,13 +1372,19 @@ public class INode221 { Optional deviceObject = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); + if (!deviceObject.isPresent()) { + LOG.error("Device with node id {} not found", nodeId); + return; + } String startTimestamp = getCurrentTimestamp(); - for (int i = 0; i < deviceObject.get().getSharedRiskGroup().size(); i++) { - SharedRiskGroup sharedRiskGroup = deviceObject.get().getSharedRiskGroup().get(i); + @NonNull + Map sharedRiskGroupMap = deviceObject.get().nonnullSharedRiskGroup(); + for (Map.Entry entry : sharedRiskGroupMap.entrySet()) { + SharedRiskGroup sharedRiskGroup = entry.getValue(); String maxAddDropPorts = sharedRiskGroup.getMaxAddDropPorts().toString(); String srgNumber = sharedRiskGroup.getSrgNumber().toString(); - int wavelengthDuplicationEnu = sharedRiskGroup.getWavelengthDuplication().getIntValue(); + //int wavelengthDuplicationEnu = sharedRiskGroup.getWavelengthDuplication().getIntValue(); persistDevSrgCircuitPacks(nodeId, sharedRiskGroup, srgNumber, connection); //String currentProvisionedAddDropPorts = ""; //String mcCapSlotWidthGranularity = ""; @@ -1346,10 +1425,18 @@ public class INode221 { Connection connection) { String startTimestamp = getCurrentTimestamp(); - for (int i = 0; i < sharedRiskGroup.getCircuitPacks().size(); i++) { - - String circuitPackindex = sharedRiskGroup.getCircuitPacks().get(i).getIndex().toString(); - String circuitPackName = sharedRiskGroup.getCircuitPacks().get(i).getCircuitPackName(); + @NonNull + Map + circuitPacksMap = sharedRiskGroup.nonnullCircuitPacks(); + for (Map.Entry entry : + circuitPacksMap.entrySet()) { + + org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.srg.CircuitPacks circuitPack = + entry.getValue(); + String circuitPackindex = circuitPack.getIndex().toString(); + String circuitPackName = circuitPack.getCircuitPackName(); Object[] parameters = {nodeId, srgNumber, @@ -1380,10 +1467,15 @@ public class INode221 { Optional deviceObject = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - + if (!deviceObject.isPresent()) { + LOG.error("Device with node id {} not found", nodeId); + return; + } String startTimestamp = getCurrentTimestamp(); - for (int i = 0; i < deviceObject.get().getRoadmConnections().size(); i++) { - RoadmConnections roadmConnections = deviceObject.get().getRoadmConnections().get(i); + @NonNull + Map roadmConnectionsMap = deviceObject.get().nonnullRoadmConnections(); + for (Map.Entry entry : roadmConnectionsMap.entrySet()) { + RoadmConnections roadmConnections = entry.getValue(); int opticalcontrolmodeEnu = roadmConnections.getOpticalControlMode().getIntValue(); //String connectionName = ""; //String connectionNumber = ""; @@ -1428,10 +1520,15 @@ public class INode221 { Optional deviceObject = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - + if (!deviceObject.isPresent()) { + LOG.error("Device with node id {} not found", nodeId); + return; + } String startTimestamp = getCurrentTimestamp(); - for (int i = 0; i < deviceObject.get().getConnectionMap().size(); i++) { - ConnectionMap connectionMap = deviceObject.get().getConnectionMap().get(i); + @NonNull + Map connectionMapMap = deviceObject.get().nonnullConnectionMap(); + for (Map.Entry entry : connectionMapMap.entrySet()) { + ConnectionMap connectionMap = entry.getValue(); String connectionMapNumber = connectionMap.getConnectionMapNumber().toString(); String sourceCircuitPackName = connectionMap.getSource().getCircuitPackName(); String sourcePortName = connectionMap.getSource().getCircuitPackName(); @@ -1507,10 +1604,9 @@ public class INode221 { private void persistDevInterfaceTcm(String nodeId, String interfaceName, OduBuilder oduBuilder, Connection connection) { - for (int i = 0; i < oduBuilder.getTcm().size(); i++) { - Tcm tcm; - - tcm = oduBuilder.getTcm().get(i); + Map tcmMap = oduBuilder.getTcm(); + for (Map.Entry entry : tcmMap.entrySet()) { + Tcm tcm = entry.getValue(); Object[] parameters = prepareDevInterfaceTcmParameters(nodeId, interfaceName, tcm); @@ -1530,12 +1626,14 @@ public class INode221 { private void persistDevInterfaceOtnOduTxMsi(String nodeId, String interfaceName, OduBuilder oduBuilder, Connection connection) { - - for (int i = 0; i < oduBuilder.getTcm().size(); i++) { - TxMsi txMsi; - - txMsi = oduBuilder.getOpu().getMsi().getTxMsi().get(i); - + @Nullable + Map txMsi2Map = oduBuilder.getOpu().getMsi().getTxMsi(); + if (txMsi2Map == null) { + LOG.error("Null txMsi2Map for node {}", nodeId); + return; + } + for (Map.Entry entry : txMsi2Map.entrySet()) { + TxMsi txMsi = entry.getValue(); Object[] parameters = prepareDevInterfaceOtnOduTxMsiParameters(nodeId, interfaceName, txMsi); String query = Queries.getQuery().deviceInterfaceOtnOduTxMsiInsert().get(); @@ -1555,11 +1653,14 @@ public class INode221 { private void persistDevInterfaceOtnOduRxMsi(String nodeId, String interfaceName, OduBuilder oduBuilder, Connection connection) { - - for (int i = 0; i < oduBuilder.getTcm().size(); i++) { - RxMsi rxMsi; - - rxMsi = oduBuilder.getOpu().getMsi().getRxMsi().get(i); + @Nullable + Map rxMsi2Map = oduBuilder.getOpu().getMsi().getRxMsi(); + if (rxMsi2Map == null) { + LOG.error("Null rxMsi2Map for node {}", nodeId); + return; + } + for (Map.Entry entry : rxMsi2Map.entrySet()) { + RxMsi rxMsi = entry.getValue(); Object[] parameters = prepareDevInterfaceOtnOduRxMsiParameters(nodeId, interfaceName, rxMsi); @@ -1580,11 +1681,14 @@ public class INode221 { private void persistDevInterfaceOtnOduExpMsi(String nodeId, String interfaceName, OduBuilder oduBuilder, Connection connection) { - - for (int i = 0; i < oduBuilder.getTcm().size(); i++) { - ExpMsi expMsi; - - expMsi = oduBuilder.getOpu().getMsi().getExpMsi().get(i); + @Nullable + Map expMsi2Map = oduBuilder.getOpu().getMsi().getExpMsi(); + if (expMsi2Map == null) { + LOG.error("Null expMsi2Map for node {}", nodeId); + return; + } + for (Map.Entry entry : expMsi2Map.entrySet()) { + ExpMsi expMsi = entry.getValue(); Object[] parameters = prepareDevInterfaceOtnOduExpMsiParameters(nodeId, interfaceName, expMsi);