Remove transportpce-routing-constraint model

[transportpce.git] / pce / src / test / java / org / opendaylight / transportpce / pce / utils / PceTestData.java

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestData.java b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestData.java
index cbb7afa44859a64d66ab27f40d567a0e7fbdd21d..7f467e6fd0cf4b5b4308fd9bee7852915dabe4d5 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestData.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestData.java
@@ -9,50 +9,49 @@ package org.opendaylight.transportpce.pce.utils;
 
 import java.util.Arrays;
 import org.opendaylight.transportpce.common.ResponseCodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestInputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestOutput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestOutputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.path.computation.request.input.ServiceAEnd;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.path.computation.request.input.ServiceAEndBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.path.computation.request.input.ServiceZEnd;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.path.computation.request.input.ServiceZEndBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220118.PathComputationRequestInput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220118.PathComputationRequestInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220118.PathComputationRequestOutput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220118.PathComputationRequestOutputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220118.path.computation.request.input.ServiceAEnd;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220118.path.computation.request.input.ServiceAEndBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220118.path.computation.request.input.ServiceZEnd;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220118.path.computation.request.input.ServiceZEndBuilder;
 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.configuration.response.common.ConfigurationResponseCommon;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.configuration.response.common.ConfigurationResponseCommonBuilder;
 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.port.PortBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.constraints.co.routing.or.general.CoRoutingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.constraints.co.routing.or.general.GeneralBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.constraints.co.routing.or.general.general.DiversityBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.constraints.co.routing.or.general.general.ExcludeBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.constraints.co.routing.or.general.general.IncludeBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.constraints.co.routing.or.general.general.LatencyBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.diversity.existing.service.constraints.ExistingServiceApplicability;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.diversity.existing.service.constraints.ExistingServiceApplicabilityBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.routing.constraints.HardConstraints;
+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.SoftConstraints;
+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.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.routing.constraints.rev171017.constraints.sp.co.routing.or.general.CoRoutingBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.constraints.sp.co.routing.or.general.GeneralBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.constraints.sp.co.routing.or.general.general.DiversityBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.constraints.sp.co.routing.or.general.general.ExcludeBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.constraints.sp.co.routing.or.general.general.IncludeBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.constraints.sp.co.routing.or.general.general.LatencyBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.constraints.sp.co.routing.or.general.general.include_.OrderedHopsBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.diversity.existing.service.contraints.sp.ExistingServiceApplicability;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.diversity.existing.service.contraints.sp.ExistingServiceApplicabilityBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.ordered.constraints.sp.HopTypeBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.routing.constraints.sp.HardConstraints;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.routing.constraints.sp.HardConstraintsBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.routing.constraints.sp.SoftConstraints;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.routing.constraints.sp.SoftConstraintsBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.response.parameters.sp.ResponseParameters;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.response.parameters.sp.ResponseParametersBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.response.parameters.sp.response.parameters.PathDescription;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.response.parameters.sp.response.parameters.PathDescriptionBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.service.endpoint.sp.RxDirectionBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.service.endpoint.sp.TxDirectionBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.service.handler.header.ServiceHandlerHeader;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.service.handler.header.ServiceHandlerHeaderBuilder;
+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.response.parameters.sp.ResponseParameters;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.response.parameters.sp.ResponseParametersBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.response.parameters.sp.response.parameters.PathDescription;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.response.parameters.sp.response.parameters.PathDescriptionBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.service.endpoint.sp.RxDirectionBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.service.endpoint.sp.TxDirectionBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.service.handler.header.ServiceHandlerHeader;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.service.handler.header.ServiceHandlerHeaderBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 
 public final class PceTestData {
@@ -64,31 +63,28 @@ public final class PceTestData {
         ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder()
                 .setRequestId("request1")
                 .build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .build();
-        return input;
+        return new PathComputationRequestInputBuilder()
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .build();
     }
 
     public static PathComputationRequestInput getEmptyPCERequestServiceNameWithRequestId() {
         ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder()
                 .setRequestId("request1")
                 .build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceName("serviceName")
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .build();
-        return input;
+        return new PathComputationRequestInputBuilder()
+            .setServiceName("serviceName")
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .build();
     }
 
     public static PathComputationRequestInput getEmptyPCERequestServiceNameWithOutRequestId() {
         ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder()
                 .build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceName("serviceName")
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .build();
-        return input;
+        return new PathComputationRequestInputBuilder()
+            .setServiceName("serviceName")
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .build();
     }
 
     public static PathComputationRequestInput getPathComputationRequestInputWithCoRoutingOrGeneral2() {
@@ -97,7 +93,7 @@ public final class PceTestData {
                 .build();
         ServiceAEnd serviceAEnd = new ServiceAEndBuilder()
                 .setServiceFormat(ServiceFormat.ODU)
-                .setServiceRate(100L)
+                .setServiceRate(Uint32.valueOf(100))
                 .setClli("clli11")
                 .setNodeId("XPONDER-2-2")
                 .setTxDirection(new TxDirectionBuilder().setPort(
@@ -125,7 +121,7 @@ public final class PceTestData {
                 .build();
         ServiceZEnd serviceZEnd = new ServiceZEndBuilder()
                 .setServiceFormat(ServiceFormat.ODU)
-                .setServiceRate(0L)
+                .setServiceRate(Uint32.valueOf(0))
                 .setClli("Some clli11")
                 .setNodeId("XPONDER-1-2")
                 .setTxDirection(new TxDirectionBuilder().setPort(
@@ -151,37 +147,34 @@ public final class PceTestData {
                                 .build()
                 ).build())
                 .build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceName("service1")
-                .setResourceReserve(true)
-                .setPceMetric(PceMetric.HopCount)
-                .setLocallyProtectedLinks(true)
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .setServiceAEnd(serviceAEnd)
-                .setServiceZEnd(serviceZEnd)
-                .setHardConstraints(new HardConstraintsBuilder()
-                        .setCustomerCode(Arrays.asList("Some customer-code"))
-                        .setCoRoutingOrGeneral(new CoRoutingBuilder()
-                                .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
-                                        .transportpce.b.c._interface.routing.constraints.rev171017
-                                        .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder()
-                                        .setExistingService(Arrays.asList("Some existing-service"))
-
-                                        .build())
-                                .build())
-                        .build())
-                .setSoftConstraints(new SoftConstraintsBuilder()
-                        .setCustomerCode(Arrays.asList("Some customer-code"))
-                        .setCoRoutingOrGeneral(new CoRoutingBuilder()
-                                .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
-                                        .transportpce.b.c._interface.routing.constraints.rev171017
-                                        .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder()
-                                        .setExistingService(Arrays.asList("Some existing-service"))
-                                        .build())
-                                .build())
-                        .build())
-                .build();
-        return input;
+        return new PathComputationRequestInputBuilder()
+            .setServiceName("service1")
+            .setResourceReserve(true)
+            .setPceRoutingMetric(PceMetric.HopCount)
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .setServiceAEnd(serviceAEnd)
+            .setServiceZEnd(serviceZEnd)
+            .setHardConstraints(new HardConstraintsBuilder()
+                    .setCustomerCode(Arrays.asList("Some customer-code"))
+                    .setCoRoutingOrGeneral(new CoRoutingBuilder()
+                            .setCoRouting(
+                                new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329
+                                        .constraints.co.routing.or.general.co.routing.CoRoutingBuilder()
+                                    .setExistingService(Arrays.asList("Some existing-service"))
+                                    .build())
+                            .build())
+                    .build())
+            .setSoftConstraints(new SoftConstraintsBuilder()
+                    .setCustomerCode(Arrays.asList("Some customer-code"))
+                    .setCoRoutingOrGeneral(new CoRoutingBuilder()
+                            .setCoRouting(
+                                new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329
+                                        .constraints.co.routing.or.general.co.routing.CoRoutingBuilder()
+                                    .setExistingService(Arrays.asList("Some existing-service"))
+                                    .build())
+                            .build())
+                    .build())
+            .build();
     }
 
     public static PathComputationRequestInput getPathComputationRequestInputWithCoRoutingOrGeneral() {
@@ -190,7 +183,7 @@ public final class PceTestData {
                 .build();
         ServiceAEnd serviceAEnd = new ServiceAEndBuilder()
                 .setServiceFormat(ServiceFormat.Ethernet)
-                .setServiceRate(100L)
+                .setServiceRate(Uint32.valueOf(100))
                 .setClli("clli11")
                 .setNodeId("XPONDER-2-2")
                 .setTxDirection(new TxDirectionBuilder().setPort(
@@ -218,7 +211,7 @@ public final class PceTestData {
                 .build();
         ServiceZEnd serviceZEnd = new ServiceZEndBuilder()
                 .setServiceFormat(ServiceFormat.Ethernet)
-                .setServiceRate(0L)
+                .setServiceRate(Uint32.valueOf(0))
                 .setClli("Some clli11")
                 .setNodeId("XPONDER-1-2")
                 .setTxDirection(new TxDirectionBuilder().setPort(
@@ -244,37 +237,34 @@ public final class PceTestData {
                                 .build()
                 ).build())
                 .build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceName("service1")
-                .setResourceReserve(true)
-                .setPceMetric(PceMetric.HopCount)
-                .setLocallyProtectedLinks(true)
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .setServiceAEnd(serviceAEnd)
-                .setServiceZEnd(serviceZEnd)
-                .setHardConstraints(new HardConstraintsBuilder()
-                        .setCustomerCode(Arrays.asList("Some customer-code"))
-                        .setCoRoutingOrGeneral(new CoRoutingBuilder()
-                                .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
-                                        .transportpce.b.c._interface.routing.constraints.rev171017
-                                        .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder()
-                                        .setExistingService(Arrays.asList("Some existing-service"))
-
-                                        .build())
-                                .build())
-                        .build())
-                .setSoftConstraints(new SoftConstraintsBuilder()
-                        .setCustomerCode(Arrays.asList("Some customer-code"))
-                        .setCoRoutingOrGeneral(new CoRoutingBuilder()
-                                .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
-                                        .transportpce.b.c._interface.routing.constraints.rev171017
-                                        .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder()
-                                        .setExistingService(Arrays.asList("Some existing-service"))
-                                        .build())
-                                .build())
-                        .build())
-                .build();
-        return input;
+        return new PathComputationRequestInputBuilder()
+            .setServiceName("service1")
+            .setResourceReserve(true)
+            .setPceRoutingMetric(PceMetric.HopCount)
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .setServiceAEnd(serviceAEnd)
+            .setServiceZEnd(serviceZEnd)
+            .setHardConstraints(new HardConstraintsBuilder()
+                    .setCustomerCode(Arrays.asList("Some customer-code"))
+                    .setCoRoutingOrGeneral(new CoRoutingBuilder()
+                            .setCoRouting(
+                                new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329
+                                        .constraints.co.routing.or.general.co.routing.CoRoutingBuilder()
+                                    .setExistingService(Arrays.asList("Some existing-service"))
+                                    .build())
+                            .build())
+                    .build())
+            .setSoftConstraints(new SoftConstraintsBuilder()
+                    .setCustomerCode(Arrays.asList("Some customer-code"))
+                    .setCoRoutingOrGeneral(new CoRoutingBuilder()
+                            .setCoRouting(
+                                new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329
+                                        .constraints.co.routing.or.general.co.routing.CoRoutingBuilder()
+                                    .setExistingService(Arrays.asList("Some existing-service"))
+                                    .build())
+                            .build())
+                    .build())
+            .build();
     }
 
     public static PathComputationRequestInput getPCERequest() {
@@ -283,7 +273,7 @@ public final class PceTestData {
                 .build();
         ServiceAEnd serviceAEnd = new ServiceAEndBuilder()
                 .setServiceFormat(ServiceFormat.Ethernet)
-                .setServiceRate(100L)
+                .setServiceRate(Uint32.valueOf(100))
                 .setClli("clli11")
                 .setNodeId("XPONDER-2-2")
                 .setTxDirection(new TxDirectionBuilder().setPort(
@@ -311,7 +301,7 @@ public final class PceTestData {
                 .build();
         ServiceZEnd serviceZEnd = new ServiceZEndBuilder()
                 .setServiceFormat(ServiceFormat.Ethernet)
-                .setServiceRate(0L)
+                .setServiceRate(Uint32.valueOf(0))
                 .setClli("Some clli11")
                 .setNodeId("XPONDER-1-2")
                 .setTxDirection(new TxDirectionBuilder().setPort(
@@ -337,36 +327,34 @@ public final class PceTestData {
                                 .build()
                 ).build())
                 .build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceName("service1")
-                .setResourceReserve(true)
-                .setPceMetric(PceMetric.HopCount)
-                .setLocallyProtectedLinks(true)
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .setServiceAEnd(serviceAEnd)
-                .setServiceZEnd(serviceZEnd)
-                .setHardConstraints(new HardConstraintsBuilder()
-                        .setCustomerCode(Arrays.asList("Some customer-code"))
-                        .setCoRoutingOrGeneral(new CoRoutingBuilder()
-                                .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
-                                        .transportpce.b.c._interface.routing.constraints.rev171017
-                                        .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder()
-                                        .setExistingService(Arrays.asList("Some existing-service"))
-                                        .build())
-                                .build())
-                        .build())
-                .setSoftConstraints(new SoftConstraintsBuilder()
-                        .setCustomerCode(Arrays.asList("Some customer-code"))
-                        .setCoRoutingOrGeneral(new CoRoutingBuilder()
-                                .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
-                                        .transportpce.b.c._interface.routing.constraints.rev171017
-                                        .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder()
-                                        .setExistingService(Arrays.asList("Some existing-service"))
-                                        .build())
-                                .build())
-                        .build())
-                .build();
-        return input;
+        return new PathComputationRequestInputBuilder()
+            .setServiceName("service1")
+            .setResourceReserve(true)
+            .setPceRoutingMetric(PceMetric.HopCount)
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .setServiceAEnd(serviceAEnd)
+            .setServiceZEnd(serviceZEnd)
+            .setHardConstraints(new HardConstraintsBuilder()
+                    .setCustomerCode(Arrays.asList("Some customer-code"))
+                    .setCoRoutingOrGeneral(new CoRoutingBuilder()
+                            .setCoRouting(
+                                new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329
+                                        .constraints.co.routing.or.general.co.routing.CoRoutingBuilder()
+                                    .setExistingService(Arrays.asList("Some existing-service"))
+                                    .build())
+                            .build())
+                    .build())
+            .setSoftConstraints(new SoftConstraintsBuilder()
+                    .setCustomerCode(Arrays.asList("Some customer-code"))
+                    .setCoRoutingOrGeneral(new CoRoutingBuilder()
+                            .setCoRouting(
+                                new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329
+                                        .constraints.co.routing.or.general.co.routing.CoRoutingBuilder()
+                                    .setExistingService(Arrays.asList("Some existing-service"))
+                                    .build())
+                            .build())
+                    .build())
+            .build();
     }
 
     public static PathComputationRequestOutput getFailedPCEResultYes() {
@@ -419,22 +407,21 @@ public final class PceTestData {
                 .setRequestId("request 1")
                 .build();
         ServiceAEnd serviceAEnd = new ServiceAEndBuilder()
-                .setServiceRate(0L)
+                .setServiceRate(Uint32.valueOf(0))
                 .setNodeId("XPONDER-1-2")
                 .build();
         ServiceZEnd serviceZEnd = new ServiceZEndBuilder()
-                .setServiceRate(0L)
+                .setServiceRate(Uint32.valueOf(0))
                 .setNodeId("XPONDER-3-2")
                 .build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .setServiceName("service 1")
-                .setResourceReserve(true)
-                .setPceMetric(PceMetric.HopCount)
-                .setServiceAEnd(serviceAEnd)
-                .setServiceZEnd(serviceZEnd)
-                .build();
-        return input;
+        return new PathComputationRequestInputBuilder()
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .setServiceName("service 1")
+            .setResourceReserve(true)
+            .setPceRoutingMetric(PceMetric.HopCount)
+            .setServiceAEnd(serviceAEnd)
+            .setServiceZEnd(serviceZEnd)
+            .build();
     }
 
     /**
@@ -486,37 +473,32 @@ public final class PceTestData {
                 .setRequestId("request 1")
                 .build();
         ServiceAEnd serviceAEnd = new ServiceAEndBuilder()
-                .setServiceRate(0L)
+                .setServiceRate(Uint32.valueOf(0))
                 .setNodeId("XPONDER-1-2")
                 .build();
         ServiceZEnd serviceZEnd = new ServiceZEndBuilder()
-                .setServiceRate(0L)
+                .setServiceRate(Uint32.valueOf(0))
                 .setNodeId("XPONDER-3-2")
                 .build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .setServiceName("service 1")
-                .setResourceReserve(true)
-                .setPceMetric(PceMetric.HopCount)
-                .setServiceAEnd(serviceAEnd)
-                .setServiceZEnd(serviceZEnd)
-                .setHardConstraints(new HardConstraintsBuilder()
-                        .setCoRoutingOrGeneral(new GeneralBuilder()
-                                .setExclude(new ExcludeBuilder()
-                                        .setNodeId(Arrays.asList("OpenROADM-2-2"))
-                                        .build())
-                                .setLatency(new LatencyBuilder().setMaxLatency(3223L).build())
-                                .setInclude(new IncludeBuilder()
-                                        .setOrderedHops(Arrays.asList(new OrderedHopsBuilder()
-                                                .setHopNumber(22)
-                                                .setHopType(new HopTypeBuilder()
-                                                        .setHopType(new HopTypeBuilder().getHopType()).build())
-                                                .build()))
-                                        .build())
-                                .build())
-                        .build())
-                .build();
-        return input;
+        return new PathComputationRequestInputBuilder()
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .setServiceName("service 1")
+            .setResourceReserve(true)
+            .setPceRoutingMetric(PceMetric.HopCount)
+            .setServiceAEnd(serviceAEnd)
+            .setServiceZEnd(serviceZEnd)
+            .setHardConstraints(new HardConstraintsBuilder()
+                    .setCoRoutingOrGeneral(new GeneralBuilder()
+                            .setExclude(new ExcludeBuilder()
+                                    .setNodeId(Arrays.asList(new NodeIdType("OpenROADM-2-2")))
+                                    .build())
+                            .setLatency(new LatencyBuilder().setMaxLatency(Uint32.valueOf(3223)).build())
+                            .setInclude(new IncludeBuilder()
+                                    .setNodeId(Arrays.asList(new NodeIdType("XPONDER-1-2")))
+                                    .build())
+                            .build())
+                    .build())
+            .build();
     }
 
     /**
@@ -566,30 +548,33 @@ public final class PceTestData {
         ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder()
                 .setRequestId("request 1")
                 .build();
+
         ServiceAEnd serviceAEnd = new ServiceAEndBuilder()
-                .setServiceRate(0L)
+                .setServiceRate(Uint32.valueOf(100))
+                .setServiceFormat(ServiceFormat.Ethernet)
                 .setNodeId("XPONDER-1-2")
                 .build();
         ServiceZEnd serviceZEnd = new ServiceZEndBuilder()
-                .setServiceRate(0L)
+                .setServiceRate(Uint32.valueOf(0))
+                .setServiceFormat(ServiceFormat.Ethernet)
                 .setNodeId("XPONDER-3-2")
                 .build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .setServiceName("service 1")
-                .setResourceReserve(true)
-                .setPceMetric(PceMetric.HopCount)
-                .setServiceAEnd(serviceAEnd)
-                .setServiceZEnd(serviceZEnd)
-                .setHardConstraints(new HardConstraintsBuilder()
-                        .setCoRoutingOrGeneral(new GeneralBuilder()
-                                .setExclude(new ExcludeBuilder()
-                                        .setNodeId(Arrays.asList("OpenROADM-2-1", "OpenROADM-2-2"))
-                                        .build())
-                                .build())
-                        .build())
-                .build();
-        return input;
+        return new PathComputationRequestInputBuilder()
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .setServiceName("service 1")
+            .setResourceReserve(true)
+            .setPceRoutingMetric(PceMetric.HopCount)
+            .setServiceAEnd(serviceAEnd)
+            .setServiceZEnd(serviceZEnd)
+            .setHardConstraints(new HardConstraintsBuilder()
+                    .setCoRoutingOrGeneral(new GeneralBuilder()
+                            .setExclude(new ExcludeBuilder()
+                                    .setNodeId(Arrays.asList(
+                                        new NodeIdType("OpenROADM-2-1"), new NodeIdType("OpenROADM-2-2")))
+                                    .build())
+                            .build())
+                    .build())
+            .build();
     }
 
     /**
@@ -612,26 +597,25 @@ public final class PceTestData {
                 .setRequestId("request 1")
                 .build();
         ServiceAEnd serviceAEnd = new ServiceAEndBuilder()
-                .setServiceRate(0L)
+                .setServiceRate(Uint32.valueOf(0))
                 .setNodeId("XPONDER-1-2")
                 .build();
         ServiceZEnd serviceZEnd = new ServiceZEndBuilder()
-                .setServiceRate(0L)
+                .setServiceRate(Uint32.valueOf(0))
                 .setNodeId("XPONDER-3-2")
                 .build();
         HardConstraints hardConstrains = new HardConstraintsBuilder().build();
         SoftConstraints softConstraints = new SoftConstraintsBuilder().build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .setServiceName("service 1")
-                .setResourceReserve(true)
-                .setPceMetric(PceMetric.HopCount)
-                .setServiceAEnd(serviceAEnd)
-                .setServiceZEnd(serviceZEnd)
-                .setHardConstraints(hardConstrains)
-                .setSoftConstraints(softConstraints)
-                .build();
-        return input;
+        return new PathComputationRequestInputBuilder()
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .setServiceName("service 1")
+            .setResourceReserve(true)
+            .setPceRoutingMetric(PceMetric.HopCount)
+            .setServiceAEnd(serviceAEnd)
+            .setServiceZEnd(serviceZEnd)
+            .setHardConstraints(hardConstrains)
+            .setSoftConstraints(softConstraints)
+            .build();
     }
 
     public static PathComputationRequestInput getPCE_simpletopology_test1_request() {
@@ -639,22 +623,21 @@ public final class PceTestData {
                 .setRequestId("request 1")
                 .build();
         ServiceAEnd serviceAEnd = new ServiceAEndBuilder()
-                .setServiceRate(0L)
+                .setServiceRate(Uint32.valueOf(0))
                 .setNodeId("XPONDER-1-2")
                 .build();
         ServiceZEnd serviceZEnd = new ServiceZEndBuilder()
-                .setServiceRate(0L)
+                .setServiceRate(Uint32.valueOf(0))
                 .setNodeId("XPONDER-3-2")
                 .build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .setServiceName("service 1")
-                .setResourceReserve(true)
-                .setPceMetric(PceMetric.HopCount)
-                .setServiceAEnd(serviceAEnd)
-                .setServiceZEnd(serviceZEnd)
-                .build();
-        return input;
+        return new PathComputationRequestInputBuilder()
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .setServiceName("service 1")
+            .setResourceReserve(true)
+            .setPceRoutingMetric(PceMetric.HopCount)
+            .setServiceAEnd(serviceAEnd)
+            .setServiceZEnd(serviceZEnd)
+            .build();
     }
 
     public static PathComputationRequestOutput getPCE_simpletopology_test1_result(Long wl) {
@@ -679,20 +662,17 @@ public final class PceTestData {
     private 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()
-                .setRate(zaRate)
-                .setZToAWavelengthNumber(zaWaveLength)
-                .setZToA(null)
-                .build();
-        PathDescription pathDescription = new PathDescriptionBuilder()
-                .setAToZDirection(atozDirection)
-                .setZToADirection(ztoaDirection)
+                .setRate(Uint32.valueOf(zaRate))
+                .setZToAWavelengthNumber(Uint32.valueOf(zaWaveLength))
                 .build();
-        return pathDescription;
+        return new PathDescriptionBuilder()
+            .setAToZDirection(atozDirection)
+            .setZToADirection(ztoaDirection)
+            .build();
     }
 
     /**
@@ -733,30 +713,28 @@ public final class PceTestData {
                 .setNode(true).build();
 
         ServiceAEnd serviceAEnd = new ServiceAEndBuilder()
-                .setServiceRate(0L)
+                .setServiceRate(Uint32.valueOf(0))
                 .setNodeId("XPONDER-1-1")
                 .build();
         ServiceZEnd serviceZEnd = new ServiceZEndBuilder()
-                .setServiceRate(0L)
+                .setServiceRate(Uint32.valueOf(0))
                 .setNodeId("XPONDER-3-1")
                 .build();
-
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder(base)
-                .setServiceName("service 2")
-                .setServiceAEnd(serviceAEnd)
-                .setServiceZEnd(serviceZEnd)
-                .setHardConstraints(new HardConstraintsBuilder()
-                        .setCoRoutingOrGeneral(new GeneralBuilder()
-                                .setLatency(new LatencyBuilder()
-                                        .setMaxLatency(3223L).build())
-                                .setDiversity(new DiversityBuilder()
-                                        .setExistingService(Arrays.asList(base.getServiceName()))
-                                        .setExistingServiceApplicability(nodeTrue)
-                                        .build())
-                                .build())
-                        .build())
-                .build();
-        return input;
+        return new PathComputationRequestInputBuilder(base)
+            .setServiceName("service 2")
+            .setServiceAEnd(serviceAEnd)
+            .setServiceZEnd(serviceZEnd)
+            .setHardConstraints(new HardConstraintsBuilder()
+                    .setCoRoutingOrGeneral(new GeneralBuilder()
+                            .setLatency(new LatencyBuilder()
+                                    .setMaxLatency(Uint32.valueOf(3223)).build())
+                            .setDiversity(new DiversityBuilder()
+                                    .setExistingService(Arrays.asList(base.getServiceName()))
+                                    .setExistingServiceApplicability(nodeTrue)
+                                    .build())
+                            .build())
+                    .build())
+            .build();
     }
 
     public static ServiceCreateInput buildServiceCreateInput() {
@@ -765,46 +743,44 @@ public final class PceTestData {
                 new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531
                         .service.create.input.ServiceAEndBuilder()
                         .setClli("clli")
-                        .setServiceRate((long) 0)
+                        .setServiceRate(Uint32.valueOf(0))
                         .setNodeId(new NodeIdType("XPONDER-1-2"))
                         .setTxDirection(new org.opendaylight.yang.gen.v1.http.org
-                                .openroadm.common.service.types.rev190531.service.endpoint.TxDirectionBuilder()
+                                    .openroadm.common.service.types.rev190531.service.endpoint.TxDirectionBuilder()
                                 .setPort(new PortBuilder().build())
                                 .build())
                         .setRxDirection(new org.opendaylight.yang.gen.v1.http.org
-                                .openroadm.common.service.types.rev190531.service.endpoint.RxDirectionBuilder()
+                                    .openroadm.common.service.types.rev190531.service.endpoint.RxDirectionBuilder()
                                 .setPort(new PortBuilder().build())
                                 .build())
                         .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.create.input.ServiceZEndBuilder()
+                            .service.create.input.ServiceZEndBuilder()
                         .setClli("clli")
-                        .setServiceRate((long) 0)
+                        .setServiceRate(Uint32.valueOf(0))
                         .setNodeId(new NodeIdType("XPONDER-3-2"))
                         .setTxDirection(new org.opendaylight.yang.gen.v1.http.org
-                                .openroadm.common.service.types.rev190531.service.endpoint.TxDirectionBuilder()
+                                    .openroadm.common.service.types.rev190531.service.endpoint.TxDirectionBuilder()
                                 .setPort(new PortBuilder().build())
                                 .build())
                         .setRxDirection(new org.opendaylight.yang.gen.v1.http.org
-                                .openroadm.common.service.types.rev190531.service.endpoint.RxDirectionBuilder()
+                                    .openroadm.common.service.types.rev190531.service.endpoint.RxDirectionBuilder()
                                 .setPort(new PortBuilder().build())
                                 .build())
                         .build();
-
-        ServiceCreateInputBuilder builtInput = new ServiceCreateInputBuilder()
-                .setCommonId("commonId")
-                .setConnectionType(ConnectionType.Service)
-                .setCustomer("Customer")
-                .setServiceName("service 1")
-                .setServiceAEnd(serviceAEnd)
-                .setServiceZEnd(serviceZEnd)
-                .setSdncRequestHeader(new SdncRequestHeaderBuilder()
-                        .setRequestId("request 1")
-                        .build());
-
-        return builtInput.build();
+        return new ServiceCreateInputBuilder()
+            .setCommonId("commonId")
+            .setConnectionType(ConnectionType.Service)
+            .setCustomer("Customer")
+            .setServiceName("service 1")
+            .setServiceAEnd(serviceAEnd)
+            .setServiceZEnd(serviceZEnd)
+            .setSdncRequestHeader(new SdncRequestHeaderBuilder()
+                    .setRequestId("request 1")
+                    .build())
+            .build();
     }
 
     public static PathComputationRequestInput getGnpyPCERequest(String nodeA, String nodeZ) {
@@ -813,7 +789,7 @@ public final class PceTestData {
                 .build();
         ServiceAEnd serviceAEnd = new ServiceAEndBuilder()
                 .setServiceFormat(ServiceFormat.Ethernet)
-                .setServiceRate(100L)
+                .setServiceRate(Uint32.valueOf(100))
                 .setClli("clli11")
                 .setNodeId(nodeA)
                 .setTxDirection(new TxDirectionBuilder().setPort(
@@ -841,7 +817,7 @@ public final class PceTestData {
                 .build();
         ServiceZEnd serviceZEnd = new ServiceZEndBuilder()
                 .setServiceFormat(ServiceFormat.Ethernet)
-                .setServiceRate(0L)
+                .setServiceRate(Uint32.valueOf(0))
                 .setClli("Some clli11")
                 .setNodeId(nodeZ)
                 .setTxDirection(new TxDirectionBuilder().setPort(
@@ -867,35 +843,33 @@ public final class PceTestData {
                                 .build()
                 ).build())
                 .build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceName("service1")
-                .setResourceReserve(true)
-                .setPceMetric(PceMetric.HopCount)
-                .setLocallyProtectedLinks(true)
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .setServiceAEnd(serviceAEnd)
-                .setServiceZEnd(serviceZEnd)
-                .setHardConstraints(new HardConstraintsBuilder()
-                        .setCustomerCode(Arrays.asList("Some customer-code"))
-                        .setCoRoutingOrGeneral(new CoRoutingBuilder()
-                                .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
-                                        .transportpce.b.c._interface.routing.constraints.rev171017
-                                        .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder()
-                                        .setExistingService(Arrays.asList("Some existing-service"))
-                                        .build())
-                                .build())
-                        .build())
-                .setSoftConstraints(new SoftConstraintsBuilder()
-                        .setCustomerCode(Arrays.asList("Some customer-code"))
-                        .setCoRoutingOrGeneral(new CoRoutingBuilder()
-                                .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
-                                        .transportpce.b.c._interface.routing.constraints.rev171017
-                                        .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder()
-                                        .setExistingService(Arrays.asList("Some existing-service"))
-                                        .build())
-                                .build())
-                        .build())
-                .build();
-        return input;
+        return new PathComputationRequestInputBuilder()
+            .setServiceName("service1")
+            .setResourceReserve(true)
+            .setPceRoutingMetric(PceMetric.HopCount)
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .setServiceAEnd(serviceAEnd)
+            .setServiceZEnd(serviceZEnd)
+            .setHardConstraints(new HardConstraintsBuilder()
+                    .setCustomerCode(Arrays.asList("Some customer-code"))
+                    .setCoRoutingOrGeneral(new CoRoutingBuilder()
+                            .setCoRouting(
+                                new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329
+                                        .constraints.co.routing.or.general.co.routing.CoRoutingBuilder()
+                                    .setExistingService(Arrays.asList("Some existing-service"))
+                                    .build())
+                            .build())
+                    .build())
+            .setSoftConstraints(new SoftConstraintsBuilder()
+                    .setCustomerCode(Arrays.asList("Some customer-code"))
+                    .setCoRoutingOrGeneral(new CoRoutingBuilder()
+                            .setCoRouting(
+                                new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329
+                                        .constraints.co.routing.or.general.co.routing.CoRoutingBuilder()
+                                    .setExistingService(Arrays.asList("Some existing-service"))
+                                    .build())
+                            .build())
+                    .build())
+            .build();
     }
 }