X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Futils%2FPceTestData.java;fp=pce%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Futils%2FPceTestData.java;h=6ace2982a7f2cca7d9f4b67b30f9b7c83b773e6c;hb=5e3f7dd89cb088ef4957f5559a82b8c6436afa17;hp=7f467e6fd0cf4b5b4308fd9bee7852915dabe4d5;hpb=1e2f9a502de80450411761fd2f636e2b7ee32301;p=transportpce.git 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 7f467e6fd..6ace2982a 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestData.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestData.java @@ -7,7 +7,9 @@ */ package org.opendaylight.transportpce.pce.utils; +import java.math.BigDecimal; import java.util.Arrays; +import java.util.Map; import org.opendaylight.transportpce.common.ResponseCodes; 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; @@ -17,30 +19,28 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev22 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.rev210705.path.description.AToZDirection; +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.configuration.response.common.ConfigurationResponseCommon; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.configuration.response.common.ConfigurationResponseCommonBuilder; +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.RxDirectionKey; +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.port.PortBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.CoRoutingBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.DiversityBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.ExcludeBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.IncludeBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.LatencyBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.co.routing.ServiceIdentifierListBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.diversity.existing.service.constraints.ServiceIdentifierListKey; +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.routing.constraints.rev211210.service.applicability.g.ServiceApplicabilityBuilder; +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.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; @@ -52,6 +52,7 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service 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; +import org.opendaylight.yangtools.yang.common.Uint8; public final class PceTestData { @@ -155,25 +156,23 @@ public final class PceTestData { .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()) + .setCustomerCode(Arrays.asList("Some customer-code")) + .setCoRouting(new CoRoutingBuilder() + .setServiceIdentifierList(Map.of( + new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints + .co.routing.ServiceIdentifierListKey("Some existing-service"), + new ServiceIdentifierListBuilder().setServiceIdentifier("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()) + .setCustomerCode(Arrays.asList("Some customer-code")) + .setCoRouting(new CoRoutingBuilder() + .setServiceIdentifierList(Map.of( + new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints + .co.routing.ServiceIdentifierListKey("Some existing-service"), + new ServiceIdentifierListBuilder().setServiceIdentifier("Some existing-service").build())) .build()) + .build()) .build(); } @@ -245,26 +244,24 @@ public final class PceTestData { .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()) + .setCustomerCode(Arrays.asList("Some customer-code")) + .setCoRouting(new CoRoutingBuilder() + .setServiceIdentifierList(Map.of( + new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.co + .routing.ServiceIdentifierListKey("Some existing-service"), + new ServiceIdentifierListBuilder().setServiceIdentifier("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()) + .setCustomerCode(Arrays.asList("Some customer-code")) + .setCoRouting(new CoRoutingBuilder() + .setServiceIdentifierList(Map.of( + new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.co + .routing.ServiceIdentifierListKey("Some existing-service"), + new ServiceIdentifierListBuilder().setServiceIdentifier("Some existing-service").build())) .build()) - .build(); + .build()) + .build(); } public static PathComputationRequestInput getPCERequest() { @@ -335,25 +332,23 @@ public final class PceTestData { .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()) + .setCustomerCode(Arrays.asList("Some customer-code")) + .setCoRouting(new CoRoutingBuilder() + .setServiceIdentifierList(Map.of( + new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.co + .routing.ServiceIdentifierListKey("Some existing-service"), + new ServiceIdentifierListBuilder().setServiceIdentifier("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()) + .setCustomerCode(Arrays.asList("Some customer-code")) + .setCoRouting(new CoRoutingBuilder() + .setServiceIdentifierList(Map.of( + new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.co + .routing.ServiceIdentifierListKey("Some existing-service"), + new ServiceIdentifierListBuilder().setServiceIdentifier("Some existing-service").build())) .build()) + .build()) .build(); } @@ -488,16 +483,16 @@ public final class PceTestData { .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()) + .setExclude(new ExcludeBuilder() + .setNodeId(Arrays.asList(new NodeIdType("OpenROADM-2-2"))) + .build()) + .setInclude(new IncludeBuilder() + .setNodeId(Arrays.asList(new NodeIdType("XPONDER-1-2"))) .build()) + .setLatency(new LatencyBuilder() + .setMaxLatency(BigDecimal.valueOf(3223)) + .build()) + .build()) .build(); } @@ -507,13 +502,12 @@ public final class PceTestData { * @return output PathComputationRequestOutput data */ public static PathComputationRequestOutput getPCE_test2_result_54() { - PathComputationRequestOutputBuilder outputBuilder = new PathComputationRequestOutputBuilder(); - ResponseParameters responseParameters = new ResponseParametersBuilder() + return new PathComputationRequestOutputBuilder() + .setConfigurationResponseCommon(createCommonSuccessResponse()) + .setResponseParameters(new ResponseParametersBuilder() .setPathDescription(createPathDescription(0L, 9L, 0L, 9L)) - .build(); - outputBuilder.setConfigurationResponseCommon(createCommonSuccessResponse()) - .setResponseParameters(responseParameters); - return outputBuilder.build(); + .build()) + .build(); } /** @@ -567,13 +561,10 @@ public final class PceTestData { .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()) + .setExclude(new ExcludeBuilder() + .setNodeId(Arrays.asList(new NodeIdType("OpenROADM-2-1"), new NodeIdType("OpenROADM-2-2"))) .build()) + .build()) .build(); } @@ -593,50 +584,42 @@ public final class PceTestData { } public static PathComputationRequestInput getPCE_simpletopology_test1_requestSetHardAndSoftConstrains() { - ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder() - .setRequestId("request 1") - .build(); - ServiceAEnd serviceAEnd = new ServiceAEndBuilder() - .setServiceRate(Uint32.valueOf(0)) - .setNodeId("XPONDER-1-2") - .build(); - ServiceZEnd serviceZEnd = new ServiceZEndBuilder() - .setServiceRate(Uint32.valueOf(0)) - .setNodeId("XPONDER-3-2") - .build(); - HardConstraints hardConstrains = new HardConstraintsBuilder().build(); - SoftConstraints softConstraints = new SoftConstraintsBuilder().build(); return new PathComputationRequestInputBuilder() - .setServiceHandlerHeader(serviceHandlerHeader) - .setServiceName("service 1") - .setResourceReserve(true) - .setPceRoutingMetric(PceMetric.HopCount) - .setServiceAEnd(serviceAEnd) - .setServiceZEnd(serviceZEnd) - .setHardConstraints(hardConstrains) - .setSoftConstraints(softConstraints) - .build(); + .setServiceHandlerHeader(new ServiceHandlerHeaderBuilder() + .setRequestId("request 1") + .build()) + .setServiceName("service 1") + .setResourceReserve(true) + .setPceRoutingMetric(PceMetric.HopCount) + .setServiceAEnd(new ServiceAEndBuilder() + .setServiceRate(Uint32.valueOf(0)) + .setNodeId("XPONDER-1-2") + .build()) + .setServiceZEnd(new ServiceZEndBuilder() + .setServiceRate(Uint32.valueOf(0)) + .setNodeId("XPONDER-3-2") + .build()) + .setHardConstraints(new HardConstraintsBuilder().build()) + .setSoftConstraints(new SoftConstraintsBuilder().build()) + .build(); } public static PathComputationRequestInput getPCE_simpletopology_test1_request() { - ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder() + return new PathComputationRequestInputBuilder() + .setServiceHandlerHeader(new ServiceHandlerHeaderBuilder() .setRequestId("request 1") - .build(); - ServiceAEnd serviceAEnd = new ServiceAEndBuilder() + .build()) + .setServiceName("service 1") + .setResourceReserve(true) + .setPceRoutingMetric(PceMetric.HopCount) + .setServiceAEnd(new ServiceAEndBuilder() .setServiceRate(Uint32.valueOf(0)) .setNodeId("XPONDER-1-2") - .build(); - ServiceZEnd serviceZEnd = new ServiceZEndBuilder() + .build()) + .setServiceZEnd(new ServiceZEndBuilder() .setServiceRate(Uint32.valueOf(0)) .setNodeId("XPONDER-3-2") - .build(); - return new PathComputationRequestInputBuilder() - .setServiceHandlerHeader(serviceHandlerHeader) - .setServiceName("service 1") - .setResourceReserve(true) - .setPceRoutingMetric(PceMetric.HopCount) - .setServiceAEnd(serviceAEnd) - .setServiceZEnd(serviceZEnd) + .build()) .build(); } @@ -661,18 +644,16 @@ public final class PceTestData { private static PathDescription createPathDescription(long azRate, long azWaveLength, long zaRate, long zaWaveLength) { - AToZDirection atozDirection = new AToZDirectionBuilder() - .setRate(Uint32.valueOf(azRate)) - .setAToZWavelengthNumber(Uint32.valueOf(azWaveLength)) - .build(); - ZToADirection ztoaDirection = new ZToADirectionBuilder() - .setRate(Uint32.valueOf(zaRate)) - .setZToAWavelengthNumber(Uint32.valueOf(zaWaveLength)) - .build(); return new PathDescriptionBuilder() - .setAToZDirection(atozDirection) - .setZToADirection(ztoaDirection) - .build(); + .setAToZDirection(new AToZDirectionBuilder() + .setRate(Uint32.valueOf(azRate)) + .setAToZWavelengthNumber(Uint32.valueOf(azWaveLength)) + .build()) + .setZToADirection(new ZToADirectionBuilder() + .setRate(Uint32.valueOf(zaRate)) + .setZToAWavelengthNumber(Uint32.valueOf(zaWaveLength)) + .build()) + .build(); } /** @@ -708,68 +689,77 @@ public final class PceTestData { * @return input PathComputationRequestInput data */ public static PathComputationRequestInput build_diversity_from_request(PathComputationRequestInput base) { - - ExistingServiceApplicability nodeTrue = new ExistingServiceApplicabilityBuilder() - .setNode(true).build(); - - ServiceAEnd serviceAEnd = new ServiceAEndBuilder() + return new PathComputationRequestInputBuilder(base) + .setServiceName("service 2") + .setServiceAEnd(new ServiceAEndBuilder() .setServiceRate(Uint32.valueOf(0)) .setNodeId("XPONDER-1-1") - .build(); - ServiceZEnd serviceZEnd = new ServiceZEndBuilder() + .build()) + .setServiceZEnd(new ServiceZEndBuilder() .setServiceRate(Uint32.valueOf(0)) .setNodeId("XPONDER-3-1") - .build(); - return new PathComputationRequestInputBuilder(base) - .setServiceName("service 2") - .setServiceAEnd(serviceAEnd) - .setServiceZEnd(serviceZEnd) + .build()) .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()) + .setLatency(new LatencyBuilder() + .setMaxLatency(BigDecimal.valueOf(3223)) + .build()) + .setDiversity(new DiversityBuilder() + .setServiceIdentifierList(Map.of( + new ServiceIdentifierListKey(base.getServiceName()), + new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.diversity + .existing.service.constraints.ServiceIdentifierListBuilder() + .setServiceIndentifier(base.getServiceName()) + .setServiceApplicability(new ServiceApplicabilityBuilder() + .setNode(true) + .build()) + .build())) .build()) + .build()) .build(); } public static ServiceCreateInput buildServiceCreateInput() { - org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.create.input.ServiceAEnd serviceAEnd = - new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531 - .service.create.input.ServiceAEndBuilder() - .setClli("clli") - .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() - .setPort(new PortBuilder().build()) - .build()) - .setRxDirection(new org.opendaylight.yang.gen.v1.http.org - .openroadm.common.service.types.rev190531.service.endpoint.RxDirectionBuilder() - .setPort(new PortBuilder().build()) - .build()) - .build(); + org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.create.input.ServiceAEnd serviceAEnd = + new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.create.input + .ServiceAEndBuilder() + .setClli("clli") + .setServiceRate(Uint32.valueOf(0)) + .setNodeId(new NodeIdType("XPONDER-1-2")) + .setTxDirection(Map.of( + new TxDirectionKey(Uint8.ZERO), + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.service.endpoint + .TxDirectionBuilder() + .setPort(new PortBuilder().build()) + .build())) + .setRxDirection(Map.of( + new RxDirectionKey(Uint8.ZERO), + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.service.endpoint + .RxDirectionBuilder() + .setPort(new PortBuilder().build()) + .build())) + .build(); + + 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() + .setClli("clli") + .setServiceRate(Uint32.valueOf(0)) + .setNodeId(new NodeIdType("XPONDER-3-2")) + .setTxDirection(Map.of( + new TxDirectionKey(Uint8.ZERO), + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.service.endpoint + .TxDirectionBuilder() + .setPort(new PortBuilder().build()) + .build())) + .setRxDirection(Map.of( + new RxDirectionKey(Uint8.ZERO), + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.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() - .setClli("clli") - .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() - .setPort(new PortBuilder().build()) - .build()) - .setRxDirection(new org.opendaylight.yang.gen.v1.http.org - .openroadm.common.service.types.rev190531.service.endpoint.RxDirectionBuilder() - .setPort(new PortBuilder().build()) - .build()) - .build(); return new ServiceCreateInputBuilder() .setCommonId("commonId") .setConnectionType(ConnectionType.Service) @@ -778,8 +768,8 @@ public final class PceTestData { .setServiceAEnd(serviceAEnd) .setServiceZEnd(serviceZEnd) .setSdncRequestHeader(new SdncRequestHeaderBuilder() - .setRequestId("request 1") - .build()) + .setRequestId("request 1") + .build()) .build(); } @@ -851,25 +841,23 @@ public final class PceTestData { .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()) + .setCustomerCode(Arrays.asList("Some customer-code")) + .setCoRouting(new CoRoutingBuilder() + .setServiceIdentifierList(Map.of( + new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.co + .routing.ServiceIdentifierListKey("Some existing-service"), + new ServiceIdentifierListBuilder().setServiceIdentifier("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()) + .setCustomerCode(Arrays.asList("Some customer-code")) + .setCoRouting(new CoRoutingBuilder() + .setServiceIdentifierList(Map.of( + new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.co + .routing.ServiceIdentifierListKey("Some existing-service"), + new ServiceIdentifierListBuilder().setServiceIdentifier("Some existing-service").build())) .build()) + .build()) .build(); } }