X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=renderer%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Frenderer%2Fprovisiondevice%2Fotn%2FOtnDeviceOperationsImpl.java;h=752b397ac70769782ea820b02fecbca87a47b74d;hb=e3438cad213946cd76a73219876487c30024dfae;hp=1ff6acb728ca5770e0a0badc77e38637576f33d0;hpb=7ea354677f9b8ee0b160a7b636c51bb0bedfcd7b;p=transportpce.git

diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/otn/OtnDeviceOperationsImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/otn/OtnDeviceOperationsImpl.java
index 1ff6acb72..752b397ac 100644
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/otn/OtnDeviceOperationsImpl.java
+++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/otn/OtnDeviceOperationsImpl.java
@@ -8,8 +8,8 @@
 package org.opendaylight.transportpce.renderer.provisiondevice.otn;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
-
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.CircuitPacks;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.circuit.pack.Ports;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.OduSwitchingPools;
@@ -27,11 +27,11 @@ public class OtnDeviceOperationsImpl implements OtnDeviceOperations {
     public String validateClientPort(String circuitPackName, String portName, String capacity,
             PortGroupRestriction portGroupRestriction) {
 
-        List<PortBandwidthSharing> portBandwidthSharingList = portGroupRestriction
-                .getPortBandwidthSharing();
+        Collection<PortBandwidthSharing> portBandwidthSharingList = portGroupRestriction
+                .nonnullPortBandwidthSharing().values();
         if (portGroupRestriction.getPortBandwidthSharing() != null) {
             for (PortBandwidthSharing portBandwidthSharing : portBandwidthSharingList) {
-                List<PortList> portLists = portBandwidthSharing.getPortList();
+                Collection<PortList> portLists = portBandwidthSharing.nonnullPortList().values();
                 for (PortList portList : portLists) {
                     if (portList.getCircuitPackName().equals(circuitPackName)
                             && portList.getPortName().equals(portName)) {
@@ -51,10 +51,11 @@ public class OtnDeviceOperationsImpl implements OtnDeviceOperations {
     }
 
     private Integer getConfigID(PortBandwidthSharing portBandwidthSharing, String circuitPackName, String portName) {
-        List<PossiblePortConfig> possiblePortConfigList = portBandwidthSharing.getPossiblePortConfig();
+        Collection<PossiblePortConfig> possiblePortConfigList = portBandwidthSharing
+                .nonnullPossiblePortConfig().values();
         for (PossiblePortConfig possiblePortConfig: possiblePortConfigList
              ) {
-            List<PortIfTypeConfig> portIfTypeConfigList = possiblePortConfig.getPortIfTypeConfig();
+            Collection<PortIfTypeConfig> portIfTypeConfigList = possiblePortConfig.nonnullPortIfTypeConfig().values();
             for (PortIfTypeConfig portIfTypeConfig : portIfTypeConfigList) {
                 if (portIfTypeConfig.getCircuitPackName().equals(circuitPackName)
                         && portIfTypeConfig.getPortName().equals(portName)) {
@@ -79,19 +80,20 @@ public class OtnDeviceOperationsImpl implements OtnDeviceOperations {
         List<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org
                 .openroadm.device.container.org.openroadm.device.odu.switching
                 .pools.non.blocking.list.PortList> networkPortList = new ArrayList<>();
-        List<NonBlockingList> nonBlockingLists = oduSwitchingPools.getNonBlockingList();
+        Collection<NonBlockingList> nonBlockingLists = oduSwitchingPools.nonnullNonBlockingList().values();
 
 
         for (NonBlockingList nonBlockingList: nonBlockingLists) {
 
             for (org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device
                     .container.org.openroadm.device.odu.switching.pools.non.blocking.list.PortList port:
-                 nonBlockingList.getPortList()) {
+                 nonBlockingList.nonnullPortList().values()) {
 
                 if (port.getCircuitPackName().equals(circuitPackName) && port.getPortName().equals(portName)) {
                     org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device
                             .container.org.openroadm.device.odu.switching.pools.non.blocking.list
-                            .PortList networkPort = checkNetworkPorts(nonBlockingList.getPortList(), circuitPacks);
+                            .PortList networkPort = checkNetworkPorts(nonBlockingList
+                                    .nonnullPortList().values(), circuitPacks);
                     if (networkPort != null) {
                         networkPortList.add(networkPort);
                     }
@@ -104,11 +106,11 @@ public class OtnDeviceOperationsImpl implements OtnDeviceOperations {
 
     private org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device
             .container.org.openroadm.device.odu.switching.pools.non.blocking.list.PortList
-        checkNetworkPorts(List<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org
+        checkNetworkPorts(Collection<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org
             .openroadm.device.container.org.openroadm.device.odu.switching.pools.non.blocking.list.PortList> portList,
                 CircuitPacks circuitPacks) {
-        List<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.circuit.packs
-            .CircuitPacks> circuitPackList = circuitPacks.getCircuitPacks();
+        Collection<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.circuit.packs
+            .CircuitPacks> circuitPackList = circuitPacks.nonnullCircuitPacks().values();
 
         for (org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container
             .org.openroadm.device.odu.switching.pools.non.blocking.list.PortList port: portList) {
@@ -127,7 +129,7 @@ public class OtnDeviceOperationsImpl implements OtnDeviceOperations {
             .container.org.openroadm.device.odu.switching.pools.non.blocking.list.PortList port,
             org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.circuit.packs.CircuitPacks circuitPack) {
         if (port.getCircuitPackName().equals(circuitPack.getCircuitPackName())) {
-            for (Ports prt : circuitPack.getPorts()) {
+            for (Ports prt : circuitPack.nonnullPorts().values()) {
                 if (prt.getPortQual() != null
                         && port.getPortName().equals(prt.getPortName())
                         && "xpdr-network".equals(prt.getPortQual().getName())) {