Code Review / transportpce.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
update pce yang model
[transportpce.git] / servicehandler / src / test / java / org / opendaylight / transportpce / servicehandler / utils / ServiceDataUtils.java
diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ServiceDataUtils.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ServiceDataUtils.java
index 32a32767eef3983a22f41dae4bab70c11e410c11..18b86a159a85d7ceee5940d1daee748ce30e15ed 100644 (file)
--- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ServiceDataUtils.java
+++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ServiceDataUtils.java
@@ -10,85 +10,87 @@ package org.opendaylight.transportpce.servicehandler.utils;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
-
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
+import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executors;
-
-import org.opendaylight.transportpce.servicehandler.MappingConstraints;
 import org.opendaylight.transportpce.servicehandler.ModelMappingUtils;
 import org.opendaylight.transportpce.servicehandler.ModelMappingUtils;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev190624.PathComputationRequestInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev190624.PathComputationRequestInputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev190624.ServicePathRpcResult;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev190624.ServicePathRpcResultBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev190624.service.path.rpc.result.PathDescription;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev190624.service.path.rpc.result.PathDescriptionBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017.ServiceRpcResultSp;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017.ServiceRpcResultSpBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.servicehandler.rev171017.ServiceRpcResultSh;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.servicehandler.rev171017.ServiceRpcResultShBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.node.types.rev181130.NodeIdType;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.ConnectionType;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.RpcActions;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.ServiceNotificationTypes;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.sdnc.request.header.SdncRequestHeader;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.sdnc.request.header.SdncRequestHeaderBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.service.endpoint.RxDirection;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.service.endpoint.TxDirection;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.service.lgx.LgxBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.service.port.PortBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.routing.constraints.HardConstraintsBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.routing.constraints.SoftConstraintsBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev190531.ServiceFormat;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateInput;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateInputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteInput;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteInputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceFeasibilityCheckInput;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceFeasibilityCheckInputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceReconfigureInput;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceReconfigureInputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceRerouteInput;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceRerouteInputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceRestorationInput;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceRestorationInput.Option;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceRestorationInputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.TempServiceCreateInput;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.TempServiceCreateInputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.TempServiceDeleteInput;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.TempServiceDeleteInputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.delete.input.ServiceDeleteReqInfo;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.delete.input.ServiceDeleteReqInfoBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.feasibility.check.inputs.ServiceAEnd;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.feasibility.check.inputs.ServiceAEndBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.feasibility.check.inputs.ServiceZEnd;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.feasibility.check.inputs.ServiceZEndBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.AToZDirection;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.AToZDirectionBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.ZToADirection;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.ZToADirectionBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.RoutingConstraintsSp.PceMetric;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev191009.RpcStatusEx;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev191009.ServicePathNotificationTypes;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev191009.service.handler.header.ServiceHandlerHeaderBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220615.PathComputationRequestInput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220615.PathComputationRequestInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220615.ServicePathRpcResult;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220615.ServicePathRpcResultBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220615.service.path.rpc.result.PathDescription;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220615.service.path.rpc.result.PathDescriptionBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.RendererRpcResultSp;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.RendererRpcResultSpBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.servicehandler.rev201125.ServiceRpcResultSh;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.servicehandler.rev201125.ServiceRpcResultShBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.node.types.rev210528.NodeIdType;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.ConnectionType;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.RpcActions;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.ServiceNotificationTypes;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.sdnc.request.header.SdncRequestHeader;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.sdnc.request.header.SdncRequestHeaderBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.service.endpoint.RxDirection;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.service.endpoint.RxDirectionKey;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.service.endpoint.TxDirection;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.service.endpoint.TxDirectionKey;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.service.lgx.LgxBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.service.port.PortBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.routing.constraints.HardConstraintsBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.routing.constraints.SoftConstraintsBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev191129.ServiceFormat;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceCreateInput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceCreateInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceDeleteInput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceDeleteInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceFeasibilityCheckInput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceFeasibilityCheckInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceReconfigureInput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceReconfigureInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRerouteInput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRerouteInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRestorationInput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRestorationInput.Option;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRestorationInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.TempServiceCreateInput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.TempServiceCreateInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.TempServiceDeleteInput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.TempServiceDeleteInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.delete.input.ServiceDeleteReqInfo;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.delete.input.ServiceDeleteReqInfoBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.feasibility.check.inputs.ServiceAEnd;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.feasibility.check.inputs.ServiceAEndBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.feasibility.check.inputs.ServiceZEnd;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.feasibility.check.inputs.ServiceZEndBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.AToZDirection;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.AToZDirectionBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.ZToADirection;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.ZToADirectionBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.PceMetric;
+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;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.service.handler.header.ServiceHandlerHeaderBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
 public final class ServiceDataUtils {
 
     public static ServiceCreateInput buildServiceCreateInput() {
 
 
 public final class ServiceDataUtils {
 
     public static ServiceCreateInput buildServiceCreateInput() {
 
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.create.input
+        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.create.input
             .ServiceAEnd serviceAEnd = getServiceAEndBuild()
             .build();
             .ServiceAEnd serviceAEnd = getServiceAEndBuild()
             .build();
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.create.input
-            .ServiceZEnd serviceZEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service
+        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.create.input
+            .ServiceZEnd serviceZEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service
             .create.input.ServiceZEndBuilder()
             .create.input.ServiceZEndBuilder()
-            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1)
+            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
             .setNodeId(new NodeIdType("XPONDER-3-2"))
             .setNodeId(new NodeIdType("XPONDER-3-2"))
-            .setTxDirection(getTxDirection())
-            .setRxDirection(getRxDirection())
+            .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
+            .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
             .build();
 
         ServiceCreateInputBuilder builtInput = new ServiceCreateInputBuilder()
             .build();
 
         ServiceCreateInputBuilder builtInput = new ServiceCreateInputBuilder()
@@ -106,16 +108,16 @@ public final class ServiceDataUtils {
 
     public static ServiceCreateInput buildServiceCreateInputWithHardConstraints() {
 
 
     public static ServiceCreateInput buildServiceCreateInputWithHardConstraints() {
 
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.create.input
+        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.create.input
                 .ServiceAEnd serviceAEnd = getServiceAEndBuild()
                 .build();
                 .ServiceAEnd serviceAEnd = getServiceAEndBuild()
                 .build();
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.create.input
-                .ServiceZEnd serviceZEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service
+        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.create.input
+                .ServiceZEnd serviceZEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service
                 .create.input.ServiceZEndBuilder()
                 .create.input.ServiceZEndBuilder()
-                .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1)
+                .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
                 .setNodeId(new NodeIdType("XPONDER-3-2"))
                 .setNodeId(new NodeIdType("XPONDER-3-2"))
-                .setTxDirection(getTxDirection())
-                .setRxDirection(getRxDirection())
+                .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
+                .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
                 .build();
 
         ServiceCreateInputBuilder builtInput = new ServiceCreateInputBuilder()
                 .build();
 
         ServiceCreateInputBuilder builtInput = new ServiceCreateInputBuilder()
@@ -134,16 +136,16 @@ public final class ServiceDataUtils {
 
     public static ServiceCreateInput buildServiceCreateInputWithSoftConstraints() {
 
 
     public static ServiceCreateInput buildServiceCreateInputWithSoftConstraints() {
 
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.create.input
+        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.create.input
                 .ServiceAEnd serviceAEnd = getServiceAEndBuild()
                 .build();
                 .ServiceAEnd serviceAEnd = getServiceAEndBuild()
                 .build();
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.create.input
-                .ServiceZEnd serviceZEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service
+        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.create.input
+                .ServiceZEnd serviceZEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service
                 .create.input.ServiceZEndBuilder()
                 .create.input.ServiceZEndBuilder()
-                .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1)
+                .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
                 .setNodeId(new NodeIdType("XPONDER-3-2"))
                 .setNodeId(new NodeIdType("XPONDER-3-2"))
-                .setTxDirection(getTxDirection())
-                .setRxDirection(getRxDirection())
+                .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
+                .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
                 .build();
 
         ServiceCreateInputBuilder builtInput = new ServiceCreateInputBuilder()
                 .build();
 
         ServiceCreateInputBuilder builtInput = new ServiceCreateInputBuilder()
@@ -161,9 +163,6 @@ public final class ServiceDataUtils {
     }
 
     public static PathComputationRequestInput createPceRequestInput(ServiceCreateInput input) {
     }
 
     public static PathComputationRequestInput createPceRequestInput(ServiceCreateInput input) {
-        MappingConstraints mappingConstraints =
-                new MappingConstraints(input.getHardConstraints(), input.getSoftConstraints());
-        mappingConstraints.serviceToServicePathConstarints();
         ServiceHandlerHeaderBuilder serviceHandlerHeader = new ServiceHandlerHeaderBuilder();
         SdncRequestHeader serviceHandler = input.getSdncRequestHeader();
         if (serviceHandler != null) {
         ServiceHandlerHeaderBuilder serviceHandlerHeader = new ServiceHandlerHeaderBuilder();
         SdncRequestHeader serviceHandler = input.getSdncRequestHeader();
         if (serviceHandler != null) {
@@ -173,9 +172,9 @@ public final class ServiceDataUtils {
             .setServiceName(input.getServiceName())
             .setResourceReserve(true)
             .setServiceHandlerHeader(serviceHandlerHeader.build())
             .setServiceName(input.getServiceName())
             .setResourceReserve(true)
             .setServiceHandlerHeader(serviceHandlerHeader.build())
-            .setHardConstraints(mappingConstraints.getServicePathHardConstraints())
-            .setSoftConstraints(mappingConstraints.getServicePathSoftConstraints())
-            .setPceMetric(PceMetric.TEMetric)
+            .setHardConstraints(input.getHardConstraints())
+            .setSoftConstraints(input.getSoftConstraints())
+            .setPceRoutingMetric(PceMetric.TEMetric)
             .setServiceAEnd(ModelMappingUtils.createServiceAEnd(input.getServiceAEnd()))
             .setServiceZEnd(ModelMappingUtils.createServiceZEnd(input.getServiceZEnd()))
             .build();
             .setServiceAEnd(ModelMappingUtils.createServiceAEnd(input.getServiceAEnd()))
             .setServiceZEnd(ModelMappingUtils.createServiceZEnd(input.getServiceZEnd()))
             .build();
@@ -183,21 +182,21 @@ public final class ServiceDataUtils {
 
     public static TempServiceCreateInput buildTempServiceCreateInput() {
 
 
     public static TempServiceCreateInput buildTempServiceCreateInput() {
 
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.temp.service.create.input
-            .ServiceAEnd serviceAEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531
-            .temp.service.create.input.ServiceAEndBuilder()
-            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1)
+        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.temp.service.create.input
+            .ServiceAEnd serviceAEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.temp
+                .service.create.input.ServiceAEndBuilder()
+            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
             .setNodeId(new NodeIdType("XPONDER-1-2"))
             .setNodeId(new NodeIdType("XPONDER-1-2"))
-            .setTxDirection(getTxDirection())
-            .setRxDirection(getRxDirection())
+            .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
+            .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
             .build();
             .build();
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.temp.service.create.input
-            .ServiceZEnd serviceZEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.temp
+        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.temp.service.create.input
+            .ServiceZEnd serviceZEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.temp
             .service.create.input.ServiceZEndBuilder()
             .service.create.input.ServiceZEndBuilder()
-            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1)
+            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
             .setNodeId(new NodeIdType("XPONDER-3-2"))
             .setNodeId(new NodeIdType("XPONDER-3-2"))
-            .setTxDirection(getTxDirection())
-            .setRxDirection(getRxDirection())
+            .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
+            .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
             .build();
 
         TempServiceCreateInputBuilder builtInput = new TempServiceCreateInputBuilder()
             .build();
 
         TempServiceCreateInputBuilder builtInput = new TempServiceCreateInputBuilder()
@@ -215,14 +214,15 @@ public final class ServiceDataUtils {
     public static ServiceFeasibilityCheckInput buildServiceFeasibilityCheckInput() {
 
         ServiceAEnd serviceAEnd = new ServiceAEndBuilder()
     public static ServiceFeasibilityCheckInput buildServiceFeasibilityCheckInput() {
 
         ServiceAEnd serviceAEnd = new ServiceAEndBuilder()
-                    .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1)
+                    .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
                     .setNodeId(new NodeIdType("XPONDER-1-2"))
                     .setNodeId(new NodeIdType("XPONDER-1-2"))
-                    .setTxDirection(getTxDirection()).setRxDirection(getRxDirection()).build();
+                    .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
+                    .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection())).build();
         ServiceZEnd serviceZEnd = new ServiceZEndBuilder()
         ServiceZEnd serviceZEnd = new ServiceZEndBuilder()
-                    .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1)
+                    .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
                     .setNodeId(new NodeIdType("XPONDER-3-2"))
                     .setNodeId(new NodeIdType("XPONDER-3-2"))
-                    .setTxDirection(getTxDirection()).setRxDirection(getRxDirection()).build();
-        ServiceAEnd serviceAEndvalue = new ServiceAEndBuilder().build();
+                    .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
+                    .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection())).build();
 
         ServiceFeasibilityCheckInputBuilder builtInput = new ServiceFeasibilityCheckInputBuilder()
             .setCommonId("commonId")
 
         ServiceFeasibilityCheckInputBuilder builtInput = new ServiceFeasibilityCheckInputBuilder()
             .setCommonId("commonId")
@@ -235,46 +235,48 @@ public final class ServiceDataUtils {
         return builtInput.build();
     }
 
         return builtInput.build();
     }
 
-    public static org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.create.input
+    public static org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.create.input
         .ServiceAEndBuilder getServiceAEndBuild() {
         .ServiceAEndBuilder getServiceAEndBuild() {
-        return new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.create.input
+        return new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.create.input
             .ServiceAEndBuilder()
             .ServiceAEndBuilder()
-            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1)
+            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
             .setNodeId(new NodeIdType("XPONDER-1-2"))
             .setNodeId(new NodeIdType("XPONDER-1-2"))
-            .setTxDirection(getTxDirection())
-            .setRxDirection(getRxDirection());
+            .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
+            .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()));
     }
 
     }
 
-    public static org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.create.input
+    public static org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.create.input
         .ServiceZEndBuilder getServiceZEndBuild() {
         .ServiceZEndBuilder getServiceZEndBuild() {
-        return new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.create.input
+        return new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.create.input
             .ServiceZEndBuilder()
             .ServiceZEndBuilder()
-            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1)
+            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
             .setNodeId(new NodeIdType("XPONDER-1-2"))
             .setNodeId(new NodeIdType("XPONDER-1-2"))
-            .setTxDirection(getTxDirection())
-            .setRxDirection(getRxDirection());
+            .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
+            .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()));
     }
 
     private static TxDirection getTxDirection() {
     }
 
     private static TxDirection getTxDirection() {
-        return new org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.service
+        return new org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.service
                 .endpoint.TxDirectionBuilder().setPort(new PortBuilder().setPortDeviceName("device name")
                         .setPortName("port name").setPortRack("port rack").setPortShelf("port shelf")
                         .setPortSlot("port slot").setPortSubSlot("port subslot").setPortType("port type").build())
                         .setLgx(new LgxBuilder().setLgxDeviceName("lgx device name").setLgxPortName("lgx port name")
                                 .setLgxPortRack("lgx port rack").setLgxPortShelf("lgx port shelf").build())
                 .endpoint.TxDirectionBuilder().setPort(new PortBuilder().setPortDeviceName("device name")
                         .setPortName("port name").setPortRack("port rack").setPortShelf("port shelf")
                         .setPortSlot("port slot").setPortSubSlot("port subslot").setPortType("port type").build())
                         .setLgx(new LgxBuilder().setLgxDeviceName("lgx device name").setLgxPortName("lgx port name")
                                 .setLgxPortRack("lgx port rack").setLgxPortShelf("lgx port shelf").build())
+                        .setIndex(Uint8.ZERO)
                         .build();
     }
 
     private static RxDirection getRxDirection() {
                         .build();
     }
 
     private static RxDirection getRxDirection() {
-        return new org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.service
+        return new org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.service
                 .endpoint.RxDirectionBuilder()
                 .endpoint.RxDirectionBuilder()
-                .setPort(new PortBuilder().setPortDeviceName("device name").setPortName("port name")
-                    .setPortRack("port rack").setPortShelf("port shelf").setPortSlot("port slot")
-                    .setPortSubSlot("port subslot").setPortType("port type").build())
-                .setLgx(new LgxBuilder().setLgxDeviceName("lgx device name")
-                    .setLgxPortName("lgx port name").setLgxPortRack("lgx port rack")
-                    .setLgxPortShelf("lgx port shelf").build())
-                        .build();
+                    .setPort(new PortBuilder().setPortDeviceName("device name").setPortName("port name")
+                        .setPortRack("port rack").setPortShelf("port shelf").setPortSlot("port slot")
+                        .setPortSubSlot("port subslot").setPortType("port type").build())
+                    .setLgx(new LgxBuilder().setLgxDeviceName("lgx device name")
+                        .setLgxPortName("lgx port name").setLgxPortRack("lgx port rack")
+                        .setLgxPortShelf("lgx port shelf").build())
+                    .setIndex(Uint8.ZERO)
+                    .build();
     }
 
     public static ServiceDeleteInput buildServiceDeleteInput() {
     }
 
     public static ServiceDeleteInput buildServiceDeleteInput() {
@@ -321,19 +323,21 @@ public final class ServiceDataUtils {
 
     public static ServiceReconfigureInput buildServiceReconfigureInput() {
 
 
     public static ServiceReconfigureInput buildServiceReconfigureInput() {
 
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.reconfigure.input
-            .ServiceAEnd serviceAEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service
+        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.reconfigure.input
+            .ServiceAEnd serviceAEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service
                 .reconfigure.input.ServiceAEndBuilder()
                 .reconfigure.input.ServiceAEndBuilder()
-                .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1)
-                .setNodeId(new NodeIdType("XPONDER-1-2")).setTxDirection(getTxDirection())
-                .setRxDirection(getRxDirection())
+                .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
+                .setNodeId(new NodeIdType("XPONDER-1-2"))
+                .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
+                .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
                 .build();
                 .build();
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.reconfigure.input
-            .ServiceZEnd serviceZEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service
+        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.reconfigure.input
+            .ServiceZEnd serviceZEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service
                 .reconfigure.input.ServiceZEndBuilder()
                 .reconfigure.input.ServiceZEndBuilder()
-                .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1)
-                .setNodeId(new NodeIdType("XPONDER-3-2")).setTxDirection(getTxDirection())
-                .setRxDirection(getRxDirection())
+                .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
+                .setNodeId(new NodeIdType("XPONDER-3-2"))
+                .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
+                .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
                 .build();
 
         ServiceReconfigureInputBuilder builtInput = new ServiceReconfigureInputBuilder()
                 .build();
 
         ServiceReconfigureInputBuilder builtInput = new ServiceReconfigureInputBuilder()
@@ -361,9 +365,6 @@ public final class ServiceDataUtils {
     public static ServicePathRpcResult buildServicePathRpcResult(
             ServicePathNotificationTypes servicePathNotificationTypes, String serviceName, RpcStatusEx rpcStatusEx,
             String message, Boolean pathDescription) {
     public static ServicePathRpcResult buildServicePathRpcResult(
             ServicePathNotificationTypes servicePathNotificationTypes, String serviceName, RpcStatusEx rpcStatusEx,
             String message, Boolean pathDescription) {
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx");
-        OffsetDateTime offsetDateTime = OffsetDateTime.now(ZoneOffset.UTC);
-        DateAndTime datetime = new DateAndTime(dtf.format(offsetDateTime));
         ServicePathRpcResultBuilder builder = new ServicePathRpcResultBuilder();
         builder.setNotificationType(servicePathNotificationTypes)
                 .setServiceName(serviceName)
         ServicePathRpcResultBuilder builder = new ServicePathRpcResultBuilder();
         builder.setNotificationType(servicePathNotificationTypes)
                 .setServiceName(serviceName)
@@ -397,44 +398,42 @@ public final class ServiceDataUtils {
         return builder.build();
     }
 
         return builder.build();
     }
 
-    public static ServiceRpcResultSp buildServiceRpcResultSp() {
+    public static RendererRpcResultSp buildRendererRpcResultSp() {
         DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx");
         OffsetDateTime offsetDateTime = OffsetDateTime.now(ZoneOffset.UTC);
         DateAndTime datetime = new DateAndTime(dtf.format(offsetDateTime));
         DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx");
         OffsetDateTime offsetDateTime = OffsetDateTime.now(ZoneOffset.UTC);
         DateAndTime datetime = new DateAndTime(dtf.format(offsetDateTime));
-        ServiceRpcResultSpBuilder builder = new ServiceRpcResultSpBuilder();
+        RendererRpcResultSpBuilder builder = new RendererRpcResultSpBuilder();
         builder.setActualDate(datetime).setNotificationType(ServicePathNotificationTypes.ServiceImplementationRequest)
                 .setServiceName("service 1").setStatus(RpcStatusEx.Successful).setStatusMessage("success");
         return builder.build();
     }
 
         builder.setActualDate(datetime).setNotificationType(ServicePathNotificationTypes.ServiceImplementationRequest)
                 .setServiceName("service 1").setStatus(RpcStatusEx.Successful).setStatusMessage("success");
         return builder.build();
     }
 
-    public static ServiceRpcResultSp buildServiceRpcResultSp(ServicePathNotificationTypes servicePathNotificationTypes,
+    public static RendererRpcResultSp buildRendererRpcResultSp(
+            ServicePathNotificationTypes servicePathNotificationTypes,
             String serviceName, RpcStatusEx rpcStatusEx, String message) {
             String serviceName, RpcStatusEx rpcStatusEx, String message) {
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx");
-        OffsetDateTime offsetDateTime = OffsetDateTime.now(ZoneOffset.UTC);
-        DateAndTime datetime = new DateAndTime(dtf.format(offsetDateTime));
-        ServiceRpcResultSpBuilder builder = new ServiceRpcResultSpBuilder();
+        RendererRpcResultSpBuilder builder = new RendererRpcResultSpBuilder();
         builder.setNotificationType(servicePathNotificationTypes).setServiceName(serviceName)
                 .setStatus(rpcStatusEx).setStatusMessage(message);
         return builder.build();
     }
 
         builder.setNotificationType(servicePathNotificationTypes).setServiceName(serviceName)
                 .setStatus(rpcStatusEx).setStatusMessage(message);
         return builder.build();
     }
 
-    public static ServiceRpcResultSh buildServiceRpcResultSh(ServiceNotificationTypes serviceNotificationTypes,
-            String serviceName, org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types
-            .rev191009.RpcStatusEx rpcStatusEx, String message) {
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx");
-        OffsetDateTime offsetDateTime = OffsetDateTime.now(ZoneOffset.UTC);
-        DateAndTime datetime = new DateAndTime(dtf.format(offsetDateTime));
+    public static ServiceRpcResultSh buildServiceRpcResultSh(
+            ServiceNotificationTypes serviceNotificationTypes,
+            String serviceName,
+            org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.RpcStatusEx
+                rpcStatusEx,
+            String message) {
         ServiceRpcResultShBuilder builder = new ServiceRpcResultShBuilder();
         builder.setNotificationType(serviceNotificationTypes).setServiceName(serviceName)
                 .setStatus(rpcStatusEx).setStatusMessage(message);
         return builder.build();
     }
 
         ServiceRpcResultShBuilder builder = new ServiceRpcResultShBuilder();
         builder.setNotificationType(serviceNotificationTypes).setServiceName(serviceName)
                 .setStatus(rpcStatusEx).setStatusMessage(message);
         return builder.build();
     }
 
-    public static ServiceRpcResultSp buildFailedServiceRpcResultSp() {
+    public static RendererRpcResultSp buildFailedRendererRpcResultSp() {
         DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx");
         OffsetDateTime offsetDateTime = OffsetDateTime.now(ZoneOffset.UTC);
         DateAndTime datetime = new DateAndTime(dtf.format(offsetDateTime));
         DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx");
         OffsetDateTime offsetDateTime = OffsetDateTime.now(ZoneOffset.UTC);
         DateAndTime datetime = new DateAndTime(dtf.format(offsetDateTime));
-        ServiceRpcResultSpBuilder builder = new ServiceRpcResultSpBuilder();
+        RendererRpcResultSpBuilder builder = new RendererRpcResultSpBuilder();
         builder.setActualDate(datetime).setNotificationType(ServicePathNotificationTypes.ServiceImplementationRequest)
                 .setServiceName("service 1").setStatus(RpcStatusEx.Failed).setStatusMessage("failed");
         return builder.build();
         builder.setActualDate(datetime).setNotificationType(ServicePathNotificationTypes.ServiceImplementationRequest)
                 .setServiceName("service 1").setStatus(RpcStatusEx.Failed).setStatusMessage("failed");
         return builder.build();
@@ -443,14 +442,12 @@ public final class ServiceDataUtils {
     public static PathDescription createPathDescription(long azRate, long azWaveLength, long zaRate,
         long zaWaveLength) {
         AToZDirection atozDirection = new AToZDirectionBuilder()
     public static PathDescription createPathDescription(long azRate, long azWaveLength, long zaRate,
         long zaWaveLength) {
         AToZDirection atozDirection = new AToZDirectionBuilder()
-            .setRate(azRate)
-            .setAToZWavelengthNumber(azWaveLength)
-            .setAToZ(null)
+            .setRate(Uint32.valueOf(azRate))
+            .setAToZWavelengthNumber(Uint32.valueOf(azWaveLength))
             .build();
         ZToADirection ztoaDirection = new ZToADirectionBuilder()
             .build();
         ZToADirection ztoaDirection = new ZToADirectionBuilder()
-            .setRate(zaRate)
-            .setZToAWavelengthNumber(zaWaveLength)
-            .setZToA(null)
+            .setRate(Uint32.valueOf(zaRate))
+            .setZToAWavelengthNumber(Uint32.valueOf(zaWaveLength))
             .build();
         PathDescription pathDescription = new PathDescriptionBuilder()
             .setAToZDirection(atozDirection)
             .build();
         PathDescription pathDescription = new PathDescriptionBuilder()
             .setAToZDirection(atozDirection)
@@ -459,24 +456,24 @@ public final class ServiceDataUtils {
         return pathDescription;
     }
 
         return pathDescription;
     }
 
-    public static org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.reconfigure.input
+    public static org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.reconfigure.input
         .ServiceAEndBuilder getServiceAEndBuildReconfigure() {
         .ServiceAEndBuilder getServiceAEndBuildReconfigure() {
-        return new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.reconfigure.input
+        return new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.reconfigure.input
             .ServiceAEndBuilder()
             .ServiceAEndBuilder()
-            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1)
+            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
             .setNodeId(new NodeIdType("XPONDER-1-2"))
             .setNodeId(new NodeIdType("XPONDER-1-2"))
-            .setTxDirection(getTxDirection())
-            .setRxDirection(getRxDirection());
+            .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
+            .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()));
     }
 
     }
 
-    public static org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.reconfigure.input
+    public static org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.reconfigure.input
         .ServiceZEndBuilder getServiceZEndBuildReconfigure() {
         .ServiceZEndBuilder getServiceZEndBuildReconfigure() {
-        return new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.reconfigure.input
+        return new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.reconfigure.input
             .ServiceZEndBuilder()
             .ServiceZEndBuilder()
-            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1)
+            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
             .setNodeId(new NodeIdType("XPONDER-1-2"))
             .setNodeId(new NodeIdType("XPONDER-1-2"))
-            .setTxDirection(getTxDirection())
-            .setRxDirection(getRxDirection());
+            .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
+            .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()));
     }
 
     public static <T> ListenableFuture<T> returnFuture(T output) {
     }
 
     public static <T> ListenableFuture<T> returnFuture(T output) {
Repository for Transport PCE project.