Upgrade openroadm service models to 10.1

[transportpce.git] / tapi / src / main / java / org / opendaylight / transportpce / tapi / utils / MappingUtils.java

diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/MappingUtils.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/MappingUtils.java
index a41c34ab66104ebd71422fe54bbfcde5d2ccb1e0..48468d57e104fd185c7db09b8e7557c7f63a14eb 100644 (file)
--- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/MappingUtils.java
+++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/MappingUtils.java
@@ -12,8 +12,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import org.opendaylight.transportpce.tapi.connectivity.ConnectivityUtils;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.create.input.ServiceAEnd;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.create.input.ServiceZEnd;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.create.input.ServiceAEnd;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.create.input.ServiceZEnd;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.tapi.rev180928.EndPointType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.tapi.rev180928.service._interface.points.ServiceEndPoint;
@@ -32,17 +32,23 @@ public final class MappingUtils {
     private static GenericServiceEndpoint createMapEntry(ServiceEndPoint sep) {
         if (sep.getEndPoint().getServiceEndPointType().equals(EndPointType.Aend)) {
             ServiceAEnd sepG = ConnectivityUtils.buildServiceAEnd(sep.getEndPoint().getNodeId().getValue(),
-                    sep.getEndPoint().getClli(), sep.getEndPoint().getTxDirection().getPort().getPortDeviceName(),
-                    sep.getEndPoint().getTxDirection().getPort().getPortName(),
-                sep.getEndPoint().getRxDirection().getPort().getPortDeviceName(), sep.getEndPoint().getRxDirection()
-                    .getPort().getPortName());
+                    sep.getEndPoint().getClli(),
+                    sep.getEndPoint().getTxDirection().values().stream().findFirst().get().getPort()
+                        .getPortDeviceName(),
+                    sep.getEndPoint().getTxDirection().values().stream().findFirst().get().getPort().getPortName(),
+                    sep.getEndPoint().getRxDirection().values().stream().findFirst().get().getPort()
+                        .getPortDeviceName(),
+                    sep.getEndPoint().getRxDirection().values().stream().findFirst().get().getPort().getPortName());
             return new GenericServiceEndpoint(sepG, ServiceEndpointType.SERVICEAEND);
         } else {
             ServiceZEnd sepG = ConnectivityUtils.buildServiceZEnd(sep.getEndPoint().getNodeId().getValue(),
-                    sep.getEndPoint().getClli(), sep.getEndPoint().getTxDirection().getPort().getPortDeviceName(),
-                    sep.getEndPoint().getTxDirection().getPort().getPortName(),
-                sep.getEndPoint().getRxDirection().getPort().getPortDeviceName(), sep.getEndPoint().getRxDirection()
-                    .getPort().getPortName());
+                    sep.getEndPoint().getClli(),
+                    sep.getEndPoint().getTxDirection().values().stream().findFirst().get().getPort()
+                        .getPortDeviceName(),
+                    sep.getEndPoint().getTxDirection().values().stream().findFirst().get().getPort().getPortName(),
+                    sep.getEndPoint().getRxDirection().values().stream().findFirst().get().getPort()
+                        .getPortDeviceName(),
+                    sep.getEndPoint().getRxDirection().values().stream().findFirst().get().getPort().getPortName());
             return new GenericServiceEndpoint(sepG, ServiceEndpointType.SERVICEZEND);
         }
     }