Upgrade openroadm service models to 10.1

[transportpce.git] / renderer / src / main / java / org / opendaylight / transportpce / renderer / provisiondevice / RendererServiceOperationsImpl.java

diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java
index 8cbbc13e106d91da1c15a1bf426767f0cd395270..54b45f2f9693b0e96ee8c0d15e1a2380e765f297 100644 (file)
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java
+++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java
@@ -62,8 +62,8 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.NodeTypes;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev161014.PmGranularity;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev161014.ResourceTypeEnum;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev190531.ServiceFormat;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.list.Services;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev191129.ServiceFormat;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.list.Services;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.PathDescription;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.RpcStatusEx;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.ServicePathNotificationTypes;
@@ -208,12 +208,15 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations
                         service.getServiceAEnd().getServiceFormat().getName(),
                         service.getServiceAEnd().getServiceRate(),
                         service.getServiceAEnd().getTxDirection() == null
-                                || service.getServiceAEnd().getTxDirection().getPort() == null
-                                || service.getServiceAEnd().getTxDirection().getPort().getPortName() == null
+                                || service.getServiceAEnd().getTxDirection().values().stream().findFirst().get()
+                                    .getPort() == null
+                                || service.getServiceAEnd().getTxDirection().values().stream().findFirst().get()
+                                    .getPort().getPortName() == null
                             ? null
                             : portMapping.getMapping(
                                     service.getServiceAEnd().getNodeId().getValue(),
-                                    service.getServiceAEnd().getTxDirection().getPort().getPortName()));
+                                    service.getServiceAEnd().getTxDirection().values().stream().findFirst().get()
+                                        .getPort().getPortName()));
                 switch (serviceType) {
                     case StringConstants.SERVICE_TYPE_100GE_T:
                     case StringConstants.SERVICE_TYPE_400GE:
@@ -280,7 +283,7 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations
             return Uint32.ZERO;
         }
         String serviceName =
-            ServiceFormat.OTU.equals(input.getServiceAEnd().getServiceFormat())
+            ServiceFormat.OTU.getName().equals(input.getServiceAEnd().getServiceFormat().getName())
                 ? input.getServiceAEnd().getOtuServiceRate().getSimpleName()
                 : input.getServiceAEnd().getOduServiceRate().getSimpleName();
         if (!formatRateMap.get(input.getServiceAEnd().getServiceFormat()).containsKey(serviceName)) {