Initial OR-TAPI mapping: Services

[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 6aca970f4b1acc62ecdfa8e4050fb62e01c3edf5..a41c34ab66104ebd71422fe54bbfcde5d2ccb1e0 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
@@ -11,6 +11,7 @@ import java.util.HashMap;
 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.urn.onf.otcc.yang.tapi.common.rev181210.Uuid;
@@ -30,16 +31,16 @@ public final class MappingUtils {
 
     private static GenericServiceEndpoint createMapEntry(ServiceEndPoint sep) {
         if (sep.getEndPoint().getServiceEndPointType().equals(EndPointType.Aend)) {
-            ServiceAEnd sepG = TapiUtils.buildServiceAEnd(sep.getEndPoint().getNodeId().getValue(), sep.getEndPoint()
-                .getClli(), sep.getEndPoint().getTxDirection().getPort().getPortDeviceName(), sep.getEndPoint()
-                    .getTxDirection().getPort().getPortName(),
+            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());
             return new GenericServiceEndpoint(sepG, ServiceEndpointType.SERVICEAEND);
         } else {
-            ServiceZEnd sepG = TapiUtils.buildServiceZEnd(sep.getEndPoint().getNodeId().getValue(), sep.getEndPoint()
-                .getClli(), sep.getEndPoint().getTxDirection().getPort().getPortDeviceName(), sep.getEndPoint()
-                    .getTxDirection().getPort().getPortName(),
+            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());
             return new GenericServiceEndpoint(sepG, ServiceEndpointType.SERVICEZEND);