X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Futils%2FPceTestData.java;h=ac37b0f3d963a47e4c36e7762abce931bd51c3b9;hb=refs%2Fchanges%2F46%2F100646%2F27;hp=6ace2982a7f2cca7d9f4b67b30f9b7c83b773e6c;hpb=5e3f7dd89cb088ef4957f5559a82b8c6436afa17;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 6ace2982a..ac37b0f3d 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,18 +7,15 @@ */ package org.opendaylight.transportpce.pce.utils; -import java.math.BigDecimal; -import java.util.Arrays; import java.util.Map; +import java.util.Set; 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; -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.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.PathComputationRequestOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220615.PathComputationRequestOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220615.path.computation.request.input.ServiceAEndBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220615.path.computation.request.input.ServiceZEndBuilder; 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; @@ -43,133 +40,126 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.Service 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.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.Decimal64; import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.common.Uint8; - public final class PceTestData { private PceTestData() { } public static PathComputationRequestInput getEmptyPCERequest() { - ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder() - .setRequestId("request1") - .build(); return new PathComputationRequestInputBuilder() - .setServiceHandlerHeader(serviceHandlerHeader) + .setServiceHandlerHeader( + new ServiceHandlerHeaderBuilder() + .setRequestId("request1") + .build()) .build(); } public static PathComputationRequestInput getEmptyPCERequestServiceNameWithRequestId() { - ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder() - .setRequestId("request1") - .build(); return new PathComputationRequestInputBuilder() .setServiceName("serviceName") - .setServiceHandlerHeader(serviceHandlerHeader) + .setServiceHandlerHeader( + new ServiceHandlerHeaderBuilder() + .setRequestId("request1") + .build()) .build(); } public static PathComputationRequestInput getEmptyPCERequestServiceNameWithOutRequestId() { - ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder() - .build(); return new PathComputationRequestInputBuilder() .setServiceName("serviceName") - .setServiceHandlerHeader(serviceHandlerHeader) + .setServiceHandlerHeader(new ServiceHandlerHeaderBuilder().build()) .build(); } public static PathComputationRequestInput getPathComputationRequestInputWithCoRoutingOrGeneral2() { - ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder() + return new PathComputationRequestInputBuilder() + .setServiceName("service1") + .setResourceReserve(true) + .setPceRoutingMetric(PceMetric.HopCount) + .setServiceHandlerHeader(new ServiceHandlerHeaderBuilder() .setRequestId("request1") - .build(); - ServiceAEnd serviceAEnd = new ServiceAEndBuilder() + .build()) + .setServiceAEnd(new ServiceAEndBuilder() .setServiceFormat(ServiceFormat.ODU) .setServiceRate(Uint32.valueOf(100)) .setClli("clli11") .setNodeId("XPONDER-2-2") - .setTxDirection(new TxDirectionBuilder().setPort( - new PortBuilder() - .setPortDeviceName("Some port-device-name") - .setPortType("Some port-type") - .setPortName("Some port-name") - .setPortRack("Some port-rack") - .setPortShelf("Some port-shelf") - .setPortSlot("Some port-slot") - .setPortSubSlot("Some port-sub-slot") - .build() - ).build()) - .setRxDirection(new RxDirectionBuilder().setPort( - new PortBuilder() - .setPortDeviceName("Some port-device-name") - .setPortType("Some port-type") - .setPortName("Some port-name") - .setPortRack("Some port-rack") - .setPortShelf("Some port-shelf") - .setPortSlot("Some port-slot") - .setPortSubSlot("Some port-sub-slot") - .build() - ).build()) - .build(); - ServiceZEnd serviceZEnd = new ServiceZEndBuilder() + .setTxDirection(new TxDirectionBuilder() + .setPort(new PortBuilder() + .setPortDeviceName("Some port-device-name") + .setPortType("Some port-type") + .setPortName("Some port-name") + .setPortRack("Some port-rack") + .setPortShelf("Some port-shelf") + .setPortSlot("Some port-slot") + .setPortSubSlot("Some port-sub-slot") + .build()) + .build()) + .setRxDirection(new RxDirectionBuilder() + .setPort(new PortBuilder() + .setPortDeviceName("Some port-device-name") + .setPortType("Some port-type") + .setPortName("Some port-name") + .setPortRack("Some port-rack") + .setPortShelf("Some port-shelf") + .setPortSlot("Some port-slot") + .setPortSubSlot("Some port-sub-slot") + .build()) + .build()) + .build()) + .setServiceZEnd(new ServiceZEndBuilder() .setServiceFormat(ServiceFormat.ODU) .setServiceRate(Uint32.valueOf(0)) .setClli("Some clli11") .setNodeId("XPONDER-1-2") - .setTxDirection(new TxDirectionBuilder().setPort( - new PortBuilder() - .setPortDeviceName("Some port-device-name") - .setPortType("Some port-type") - .setPortName("Some port-name") - .setPortRack("Some port-rack") - .setPortShelf("Some port-shelf") - .setPortSlot("Some port-slot") - .setPortSubSlot("Some port-sub-slot") - .build() - ).build()) - .setRxDirection(new RxDirectionBuilder().setPort( - new PortBuilder() - .setPortDeviceName("Some port-device-name") - .setPortType("Some port-type") - .setPortName("Some port-name") - .setPortRack("Some port-rack") - .setPortShelf("Some port-shelf") - .setPortSlot("Some port-slot") - .setPortSubSlot("Some port-sub-slot") - .build() - ).build()) - .build(); - return new PathComputationRequestInputBuilder() - .setServiceName("service1") - .setResourceReserve(true) - .setPceRoutingMetric(PceMetric.HopCount) - .setServiceHandlerHeader(serviceHandlerHeader) - .setServiceAEnd(serviceAEnd) - .setServiceZEnd(serviceZEnd) + .setTxDirection(new TxDirectionBuilder() + .setPort(new PortBuilder() + .setPortDeviceName("Some port-device-name") + .setPortType("Some port-type") + .setPortName("Some port-name") + .setPortRack("Some port-rack") + .setPortShelf("Some port-shelf") + .setPortSlot("Some port-slot") + .setPortSubSlot("Some port-sub-slot") + .build()) + .build()) + .setRxDirection(new RxDirectionBuilder() + .setPort(new PortBuilder() + .setPortDeviceName("Some port-device-name") + .setPortType("Some port-type") + .setPortName("Some port-name") + .setPortRack("Some port-rack") + .setPortShelf("Some port-shelf") + .setPortSlot("Some port-slot") + .setPortSubSlot("Some port-sub-slot") + .build()) + .build()) + .build()) .setHardConstraints(new HardConstraintsBuilder() - .setCustomerCode(Arrays.asList("Some customer-code")) + .setCustomerCode(Set.of("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 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")) + .setCustomerCode(Set.of("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 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()) @@ -177,74 +167,71 @@ public final class PceTestData { } public static PathComputationRequestInput getPathComputationRequestInputWithCoRoutingOrGeneral() { - ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder() + return new PathComputationRequestInputBuilder() + .setServiceName("service1") + .setResourceReserve(true) + .setPceRoutingMetric(PceMetric.HopCount) + .setServiceHandlerHeader(new ServiceHandlerHeaderBuilder() .setRequestId("request1") - .build(); - ServiceAEnd serviceAEnd = new ServiceAEndBuilder() + .build()) + .setServiceAEnd(new ServiceAEndBuilder() .setServiceFormat(ServiceFormat.Ethernet) .setServiceRate(Uint32.valueOf(100)) .setClli("clli11") .setNodeId("XPONDER-2-2") - .setTxDirection(new TxDirectionBuilder().setPort( - new PortBuilder() - .setPortDeviceName("Some port-device-name") - .setPortType("Some port-type") - .setPortName("Some port-name") - .setPortRack("Some port-rack") - .setPortShelf("Some port-shelf") - .setPortSlot("Some port-slot") - .setPortSubSlot("Some port-sub-slot") - .build() - ).build()) - .setRxDirection(new RxDirectionBuilder().setPort( - new PortBuilder() - .setPortDeviceName("Some port-device-name") - .setPortType("Some port-type") - .setPortName("Some port-name") - .setPortRack("Some port-rack") - .setPortShelf("Some port-shelf") - .setPortSlot("Some port-slot") - .setPortSubSlot("Some port-sub-slot") - .build() - ).build()) - .build(); - ServiceZEnd serviceZEnd = new ServiceZEndBuilder() + .setTxDirection(new TxDirectionBuilder() + .setPort(new PortBuilder() + .setPortDeviceName("Some port-device-name") + .setPortType("Some port-type") + .setPortName("Some port-name") + .setPortRack("Some port-rack") + .setPortShelf("Some port-shelf") + .setPortSlot("Some port-slot") + .setPortSubSlot("Some port-sub-slot") + .build()) + .build()) + .setRxDirection(new RxDirectionBuilder() + .setPort(new PortBuilder() + .setPortDeviceName("Some port-device-name") + .setPortType("Some port-type") + .setPortName("Some port-name") + .setPortRack("Some port-rack") + .setPortShelf("Some port-shelf") + .setPortSlot("Some port-slot") + .setPortSubSlot("Some port-sub-slot") + .build()) + .build()) + .build()) + .setServiceZEnd(new ServiceZEndBuilder() .setServiceFormat(ServiceFormat.Ethernet) .setServiceRate(Uint32.valueOf(0)) .setClli("Some clli11") .setNodeId("XPONDER-1-2") - .setTxDirection(new TxDirectionBuilder().setPort( - new PortBuilder() - .setPortDeviceName("Some port-device-name") - .setPortType("Some port-type") - .setPortName("Some port-name") - .setPortRack("Some port-rack") - .setPortShelf("Some port-shelf") - .setPortSlot("Some port-slot") - .setPortSubSlot("Some port-sub-slot") - .build() - ).build()) - .setRxDirection(new RxDirectionBuilder().setPort( - new PortBuilder() - .setPortDeviceName("Some port-device-name") - .setPortType("Some port-type") - .setPortName("Some port-name") - .setPortRack("Some port-rack") - .setPortShelf("Some port-shelf") - .setPortSlot("Some port-slot") - .setPortSubSlot("Some port-sub-slot") - .build() - ).build()) - .build(); - return new PathComputationRequestInputBuilder() - .setServiceName("service1") - .setResourceReserve(true) - .setPceRoutingMetric(PceMetric.HopCount) - .setServiceHandlerHeader(serviceHandlerHeader) - .setServiceAEnd(serviceAEnd) - .setServiceZEnd(serviceZEnd) + .setTxDirection(new TxDirectionBuilder() + .setPort(new PortBuilder() + .setPortDeviceName("Some port-device-name") + .setPortType("Some port-type") + .setPortName("Some port-name") + .setPortRack("Some port-rack") + .setPortShelf("Some port-shelf") + .setPortSlot("Some port-slot") + .setPortSubSlot("Some port-sub-slot") + .build()) + .build()) + .setRxDirection(new RxDirectionBuilder() + .setPort(new PortBuilder() + .setPortDeviceName("Some port-device-name") + .setPortType("Some port-type") + .setPortName("Some port-name") + .setPortRack("Some port-rack") + .setPortShelf("Some port-shelf") + .setPortSlot("Some port-slot") + .setPortSubSlot("Some port-sub-slot") + .build()) + .build()) + .build()) .setHardConstraints(new HardConstraintsBuilder() - .setCustomerCode(Arrays.asList("Some customer-code")) + .setCustomerCode(Set.of("Some customer-code")) .setCoRouting(new CoRoutingBuilder() .setServiceIdentifierList(Map.of( new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.co @@ -253,7 +240,7 @@ public final class PceTestData { .build()) .build()) .setSoftConstraints(new SoftConstraintsBuilder() - .setCustomerCode(Arrays.asList("Some customer-code")) + .setCustomerCode(Set.of("Some customer-code")) .setCoRouting(new CoRoutingBuilder() .setServiceIdentifierList(Map.of( new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.co @@ -261,78 +248,75 @@ public final class PceTestData { new ServiceIdentifierListBuilder().setServiceIdentifier("Some existing-service").build())) .build()) .build()) - .build(); + .build(); } public static PathComputationRequestInput getPCERequest() { - ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder() + return new PathComputationRequestInputBuilder() + .setServiceName("service1") + .setResourceReserve(true) + .setPceRoutingMetric(PceMetric.HopCount) + .setServiceHandlerHeader(new ServiceHandlerHeaderBuilder() .setRequestId("request1") - .build(); - ServiceAEnd serviceAEnd = new ServiceAEndBuilder() + .build()) + .setServiceAEnd(new ServiceAEndBuilder() .setServiceFormat(ServiceFormat.Ethernet) .setServiceRate(Uint32.valueOf(100)) .setClli("clli11") .setNodeId("XPONDER-2-2") - .setTxDirection(new TxDirectionBuilder().setPort( - new PortBuilder() - .setPortDeviceName("Some port-device-name") - .setPortType("Some port-type") - .setPortName("Some port-name") - .setPortRack("Some port-rack") - .setPortShelf("Some port-shelf") - .setPortSlot("Some port-slot") - .setPortSubSlot("Some port-sub-slot") - .build() - ).build()) - .setRxDirection(new RxDirectionBuilder().setPort( - new PortBuilder() - .setPortDeviceName("Some port-device-name") - .setPortType("Some port-type") - .setPortName("Some port-name") - .setPortRack("Some port-rack") - .setPortShelf("Some port-shelf") - .setPortSlot("Some port-slot") - .setPortSubSlot("Some port-sub-slot") - .build() - ).build()) - .build(); - ServiceZEnd serviceZEnd = new ServiceZEndBuilder() + .setTxDirection(new TxDirectionBuilder() + .setPort(new PortBuilder() + .setPortDeviceName("Some port-device-name") + .setPortType("Some port-type") + .setPortName("Some port-name") + .setPortRack("Some port-rack") + .setPortShelf("Some port-shelf") + .setPortSlot("Some port-slot") + .setPortSubSlot("Some port-sub-slot") + .build()) + .build()) + .setRxDirection(new RxDirectionBuilder() + .setPort(new PortBuilder() + .setPortDeviceName("Some port-device-name") + .setPortType("Some port-type") + .setPortName("Some port-name") + .setPortRack("Some port-rack") + .setPortShelf("Some port-shelf") + .setPortSlot("Some port-slot") + .setPortSubSlot("Some port-sub-slot") + .build()) + .build()) + .build()) + .setServiceZEnd(new ServiceZEndBuilder() .setServiceFormat(ServiceFormat.Ethernet) .setServiceRate(Uint32.valueOf(0)) .setClli("Some clli11") .setNodeId("XPONDER-1-2") - .setTxDirection(new TxDirectionBuilder().setPort( - new PortBuilder() - .setPortDeviceName("Some port-device-name") - .setPortType("Some port-type") - .setPortName("Some port-name") - .setPortRack("Some port-rack") - .setPortShelf("Some port-shelf") - .setPortSlot("Some port-slot") - .setPortSubSlot("Some port-sub-slot") - .build() - ).build()) - .setRxDirection(new RxDirectionBuilder().setPort( - new PortBuilder() - .setPortDeviceName("Some port-device-name") - .setPortType("Some port-type") - .setPortName("Some port-name") - .setPortRack("Some port-rack") - .setPortShelf("Some port-shelf") - .setPortSlot("Some port-slot") - .setPortSubSlot("Some port-sub-slot") - .build() - ).build()) - .build(); - return new PathComputationRequestInputBuilder() - .setServiceName("service1") - .setResourceReserve(true) - .setPceRoutingMetric(PceMetric.HopCount) - .setServiceHandlerHeader(serviceHandlerHeader) - .setServiceAEnd(serviceAEnd) - .setServiceZEnd(serviceZEnd) + .setTxDirection(new TxDirectionBuilder() + .setPort(new PortBuilder() + .setPortDeviceName("Some port-device-name") + .setPortType("Some port-type") + .setPortName("Some port-name") + .setPortRack("Some port-rack") + .setPortShelf("Some port-shelf") + .setPortSlot("Some port-slot") + .setPortSubSlot("Some port-sub-slot") + .build()) + .build()) + .setRxDirection(new RxDirectionBuilder() + .setPort(new PortBuilder() + .setPortDeviceName("Some port-device-name") + .setPortType("Some port-type") + .setPortName("Some port-name") + .setPortRack("Some port-rack") + .setPortShelf("Some port-shelf") + .setPortSlot("Some port-slot") + .setPortSubSlot("Some port-sub-slot") + .build()) + .build()) + .build()) .setHardConstraints(new HardConstraintsBuilder() - .setCustomerCode(Arrays.asList("Some customer-code")) + .setCustomerCode(Set.of("Some customer-code")) .setCoRouting(new CoRoutingBuilder() .setServiceIdentifierList(Map.of( new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.co @@ -341,7 +325,7 @@ public final class PceTestData { .build()) .build()) .setSoftConstraints(new SoftConstraintsBuilder() - .setCustomerCode(Arrays.asList("Some customer-code")) + .setCustomerCode(Set.of("Some customer-code")) .setCoRouting(new CoRoutingBuilder() .setServiceIdentifierList(Map.of( new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.co @@ -353,25 +337,26 @@ public final class PceTestData { } public static PathComputationRequestOutput getFailedPCEResultYes() { - PathComputationRequestOutputBuilder outputBuilder = new PathComputationRequestOutputBuilder(); - ConfigurationResponseCommonBuilder configurationResponseCommon = new ConfigurationResponseCommonBuilder() - .setAckFinalIndicator("Yes") - .setRequestId("request1") - .setResponseCode("Path not calculated") - .setResponseMessage("Service Name is not set"); - outputBuilder.setConfigurationResponseCommon(configurationResponseCommon.build()) - .setResponseParameters(null); - return outputBuilder.build(); + return new PathComputationRequestOutputBuilder() + .setConfigurationResponseCommon( + new ConfigurationResponseCommonBuilder() + .setAckFinalIndicator("Yes") + .setRequestId("request1") + .setResponseCode("Path not calculated") + .setResponseMessage("Service Name is not set") + .build()) + .setResponseParameters(null) + .build(); } public static PathComputationRequestOutput getPCEResultOk(Long wl) { - PathComputationRequestOutputBuilder outputBuilder = new PathComputationRequestOutputBuilder(); - ResponseParameters responseParameters = new ResponseParametersBuilder() - .setPathDescription(createPathDescription(0L, wl, 0L, wl)) - .build(); - outputBuilder.setConfigurationResponseCommon(createCommonSuccessResponse()) - .setResponseParameters(responseParameters); - return outputBuilder.build(); + return new PathComputationRequestOutputBuilder() + .setConfigurationResponseCommon(createCommonSuccessResponse()) + .setResponseParameters( + new ResponseParametersBuilder() + .setPathDescription(createPathDescription(0L, wl, 0L, wl)) + .build()) + .build(); } /** @@ -394,45 +379,40 @@ public final class PceTestData { * "pce:pce-metric": "hop-count" * } * } - * * @return input PathComputationRequestInput data */ public static PathComputationRequestInput getPCE_test1_request_54() { - 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(); } /** * Generate Data for Test 1 result 5-4. - * - * @param wl WaveLength - * @return output PathComputationRequestOutput data + * @param wl WaveLength + * @return output PathComputationRequestOutput data */ public static PathComputationRequestOutput getPCE_test_result_54(Long wl) { - PathComputationRequestOutputBuilder outputBuilder = new PathComputationRequestOutputBuilder(); - ResponseParameters responseParameters = new ResponseParametersBuilder() - .setPathDescription(createPathDescription(0L, wl, 0L, wl)) - .build(); - outputBuilder.setConfigurationResponseCommon(createCommonSuccessResponse()) - .setResponseParameters(responseParameters); - return outputBuilder.build(); + return new PathComputationRequestOutputBuilder() + .setConfigurationResponseCommon(createCommonSuccessResponse()) + .setResponseParameters( + new ResponseParametersBuilder() + .setPathDescription(createPathDescription(0L, wl, 0L, wl)) + .build()) + .build(); } /** @@ -460,37 +440,33 @@ public final class PceTestData { * "pce:pce-metric": "hop-count" * } * } - * * @return input PathComputationRequestInput data */ public static PathComputationRequestInput getPCE_test2_request_54() { - 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()) .setHardConstraints(new HardConstraintsBuilder() .setExclude(new ExcludeBuilder() - .setNodeId(Arrays.asList(new NodeIdType("OpenROADM-2-2"))) + .setNodeId(Set.of(new NodeIdType("OpenROADM-2-2"))) .build()) .setInclude(new IncludeBuilder() - .setNodeId(Arrays.asList(new NodeIdType("XPONDER-1-2"))) + .setNodeId(Set.of(new NodeIdType("XPONDER-1-2"))) .build()) .setLatency(new LatencyBuilder() - .setMaxLatency(BigDecimal.valueOf(3223)) + .setMaxLatency(Decimal64.valueOf("3223")) .build()) .build()) .build(); @@ -498,15 +474,15 @@ public final class PceTestData { /** * Generate Data for Test 2 result 5-4. - * * @return output PathComputationRequestOutput data */ public static PathComputationRequestOutput getPCE_test2_result_54() { return new PathComputationRequestOutputBuilder() .setConfigurationResponseCommon(createCommonSuccessResponse()) - .setResponseParameters(new ResponseParametersBuilder() - .setPathDescription(createPathDescription(0L, 9L, 0L, 9L)) - .build()) + .setResponseParameters( + new ResponseParametersBuilder() + .setPathDescription(createPathDescription(0L, 9L, 0L, 9L)) + .build()) .build(); } @@ -535,34 +511,31 @@ public final class PceTestData { * "pce:pce-metric": "hop-count" * } * } - * * @return input PathComputationRequestInput data */ public static PathComputationRequestInput getPCE_test3_request_54() { - 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(100)) .setServiceFormat(ServiceFormat.Ethernet) .setNodeId("XPONDER-1-2") - .build(); - ServiceZEnd serviceZEnd = new ServiceZEndBuilder() + .build()) + .setServiceZEnd(new ServiceZEndBuilder() .setServiceRate(Uint32.valueOf(0)) .setServiceFormat(ServiceFormat.Ethernet) .setNodeId("XPONDER-3-2") - .build(); - return new PathComputationRequestInputBuilder() - .setServiceHandlerHeader(serviceHandlerHeader) - .setServiceName("service 1") - .setResourceReserve(true) - .setPceRoutingMetric(PceMetric.HopCount) - .setServiceAEnd(serviceAEnd) - .setServiceZEnd(serviceZEnd) + .build()) .setHardConstraints(new HardConstraintsBuilder() .setExclude(new ExcludeBuilder() - .setNodeId(Arrays.asList(new NodeIdType("OpenROADM-2-1"), new NodeIdType("OpenROADM-2-2"))) + .setNodeId(Set.of( + new NodeIdType("OpenROADM-2-1"), + new NodeIdType("OpenROADM-2-2"))) .build()) .build()) .build(); @@ -570,38 +543,36 @@ public final class PceTestData { /** * Generate Data for Test 3 result 5-4. - * * @return output PathComputationRequestOutput data */ public static PathComputationRequestOutput getPCE_test3_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(); } public static PathComputationRequestInput getPCE_simpletopology_test1_requestSetHardAndSoftConstrains() { return new PathComputationRequestInputBuilder() - .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(); + .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() { @@ -624,36 +595,35 @@ public final class PceTestData { } public static PathComputationRequestOutput getPCE_simpletopology_test1_result(Long wl) { - PathComputationRequestOutputBuilder outputBuilder = new PathComputationRequestOutputBuilder(); - ResponseParameters responseParameters = new ResponseParametersBuilder() + return new PathComputationRequestOutputBuilder() + .setConfigurationResponseCommon(createCommonSuccessResponse()) + .setResponseParameters(new ResponseParametersBuilder() .setPathDescription(createPathDescription(0L, wl, 0L, wl)) - .build(); - outputBuilder.setConfigurationResponseCommon(createCommonSuccessResponse()) - .setResponseParameters(responseParameters); - return outputBuilder.build(); + .build()) + .build(); } private static ConfigurationResponseCommon createCommonSuccessResponse() { - ConfigurationResponseCommonBuilder configurationResponseCommon = new ConfigurationResponseCommonBuilder() - .setAckFinalIndicator(ResponseCodes.FINAL_ACK_YES) - .setRequestId("request 1") - .setResponseCode(ResponseCodes.RESPONSE_OK) - .setResponseMessage("Path is calculated"); - return configurationResponseCommon.build(); + return new ConfigurationResponseCommonBuilder() + .setAckFinalIndicator(ResponseCodes.FINAL_ACK_YES) + .setRequestId("request 1") + .setResponseCode(ResponseCodes.RESPONSE_OK) + .setResponseMessage("Path is calculated") + .build(); } private static PathDescription createPathDescription(long azRate, long azWaveLength, long zaRate, long zaWaveLength) { return new PathDescriptionBuilder() - .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(); + .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(); } /** @@ -684,9 +654,8 @@ public final class PceTestData { * "pce:pce-metric": "hop-count" * } * } - * - * @param base Path Computation Request Input base - * @return input PathComputationRequestInput data + * @param base Path Computation Request Input base + * @return input PathComputationRequestInput data */ public static PathComputationRequestInput build_diversity_from_request(PathComputationRequestInput base) { return new PathComputationRequestInputBuilder(base) @@ -701,7 +670,7 @@ public final class PceTestData { .build()) .setHardConstraints(new HardConstraintsBuilder() .setLatency(new LatencyBuilder() - .setMaxLatency(BigDecimal.valueOf(3223)) + .setMaxLatency(Decimal64.valueOf("3223")) .build()) .setDiversity(new DiversityBuilder() .setServiceIdentifierList(Map.of( @@ -719,129 +688,120 @@ public final class PceTestData { } public static ServiceCreateInput buildServiceCreateInput() { - - 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(); - return new ServiceCreateInputBuilder() .setCommonId("commonId") .setConnectionType(ConnectionType.Service) .setCustomer("Customer") .setServiceName("service 1") - .setServiceAEnd(serviceAEnd) - .setServiceZEnd(serviceZEnd) - .setSdncRequestHeader(new SdncRequestHeaderBuilder() - .setRequestId("request 1") - .build()) + .setServiceAEnd( + 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()) + .setServiceZEnd( + 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()) + .setSdncRequestHeader( + new SdncRequestHeaderBuilder() + .setRequestId("request 1") + .build()) .build(); } public static PathComputationRequestInput getGnpyPCERequest(String nodeA, String nodeZ) { - ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder() - .setRequestId("request1") - .build(); - ServiceAEnd serviceAEnd = new ServiceAEndBuilder() + return new PathComputationRequestInputBuilder() + .setServiceName("service1") + .setResourceReserve(true) + .setPceRoutingMetric(PceMetric.HopCount) + .setServiceHandlerHeader(new ServiceHandlerHeaderBuilder().setRequestId("request1").build()) + .setServiceAEnd(new ServiceAEndBuilder() .setServiceFormat(ServiceFormat.Ethernet) .setServiceRate(Uint32.valueOf(100)) .setClli("clli11") .setNodeId(nodeA) - .setTxDirection(new TxDirectionBuilder().setPort( - new PortBuilder() - .setPortDeviceName("Some port-device-name") - .setPortType("Some port-type") - .setPortName("Some port-name") - .setPortRack("Some port-rack") - .setPortShelf("Some port-shelf") - .setPortSlot("Some port-slot") - .setPortSubSlot("Some port-sub-slot") - .build() - ).build()) - .setRxDirection(new RxDirectionBuilder().setPort( - new PortBuilder() - .setPortDeviceName("Some port-device-name") - .setPortType("Some port-type") - .setPortName("Some port-name") - .setPortRack("Some port-rack") - .setPortShelf("Some port-shelf") - .setPortSlot("Some port-slot") - .setPortSubSlot("Some port-sub-slot") - .build() - ).build()) - .build(); - ServiceZEnd serviceZEnd = new ServiceZEndBuilder() + .setTxDirection(new TxDirectionBuilder() + .setPort(new PortBuilder() + .setPortDeviceName("Some port-device-name") + .setPortType("Some port-type") + .setPortName("Some port-name") + .setPortRack("Some port-rack") + .setPortShelf("Some port-shelf") + .setPortSlot("Some port-slot") + .setPortSubSlot("Some port-sub-slot") + .build()) + .build()) + .setRxDirection(new RxDirectionBuilder() + .setPort(new PortBuilder() + .setPortDeviceName("Some port-device-name") + .setPortType("Some port-type") + .setPortName("Some port-name") + .setPortRack("Some port-rack") + .setPortShelf("Some port-shelf") + .setPortSlot("Some port-slot") + .setPortSubSlot("Some port-sub-slot") + .build()) + .build()) + .build()) + .setServiceZEnd(new ServiceZEndBuilder() .setServiceFormat(ServiceFormat.Ethernet) .setServiceRate(Uint32.valueOf(0)) .setClli("Some clli11") .setNodeId(nodeZ) - .setTxDirection(new TxDirectionBuilder().setPort( - new PortBuilder() - .setPortDeviceName("Some port-device-name") - .setPortType("Some port-type") - .setPortName("Some port-name") - .setPortRack("Some port-rack") - .setPortShelf("Some port-shelf") - .setPortSlot("Some port-slot") - .setPortSubSlot("Some port-sub-slot") - .build() - ).build()) - .setRxDirection(new RxDirectionBuilder().setPort( - new PortBuilder() - .setPortDeviceName("Some port-device-name") - .setPortType("Some port-type") - .setPortName("Some port-name") - .setPortRack("Some port-rack") - .setPortShelf("Some port-shelf") - .setPortSlot("Some port-slot") - .setPortSubSlot("Some port-sub-slot") - .build() - ).build()) - .build(); - return new PathComputationRequestInputBuilder() - .setServiceName("service1") - .setResourceReserve(true) - .setPceRoutingMetric(PceMetric.HopCount) - .setServiceHandlerHeader(serviceHandlerHeader) - .setServiceAEnd(serviceAEnd) - .setServiceZEnd(serviceZEnd) + .setTxDirection(new TxDirectionBuilder() + .setPort(new PortBuilder() + .setPortDeviceName("Some port-device-name") + .setPortType("Some port-type") + .setPortName("Some port-name") + .setPortRack("Some port-rack") + .setPortShelf("Some port-shelf") + .setPortSlot("Some port-slot") + .setPortSubSlot("Some port-sub-slot") + .build()) + .build()) + .setRxDirection(new RxDirectionBuilder() + .setPort(new PortBuilder() + .setPortDeviceName("Some port-device-name") + .setPortType("Some port-type") + .setPortName("Some port-name") + .setPortRack("Some port-rack") + .setPortShelf("Some port-shelf") + .setPortSlot("Some port-slot") + .setPortSubSlot("Some port-sub-slot") + .build()) + .build()) + .build()) .setHardConstraints(new HardConstraintsBuilder() - .setCustomerCode(Arrays.asList("Some customer-code")) + .setCustomerCode(Set.of("Some customer-code")) .setCoRouting(new CoRoutingBuilder() .setServiceIdentifierList(Map.of( new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.co @@ -850,7 +810,7 @@ public final class PceTestData { .build()) .build()) .setSoftConstraints(new SoftConstraintsBuilder() - .setCustomerCode(Arrays.asList("Some customer-code")) + .setCustomerCode(Set.of("Some customer-code")) .setCoRouting(new CoRoutingBuilder() .setServiceIdentifierList(Map.of( new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.co