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=7f467e6fd0cf4b5b4308fd9bee7852915dabe4d5;hb=1e2f9a502de80450411761fd2f636e2b7ee32301;hp=7e484b89d8b349989d9ccec3e769e44b4647e6d6;hpb=e376a7f4aca935a952013993d712b7667f847e70;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 7e484b89d..7f467e6fd 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 @@ -9,43 +9,50 @@ 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.rev190624.PathComputationRequestInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev190624.PathComputationRequestInputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev190624.PathComputationRequestOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev190624.PathComputationRequestOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev190624.path.computation.request.input.ServiceAEnd; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev190624.path.computation.request.input.ServiceAEndBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev190624.path.computation.request.input.ServiceZEnd; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev190624.path.computation.request.input.ServiceZEndBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.ConnectionType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.ServiceFormat; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.configuration.response.common.ConfigurationResponseCommon; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.configuration.response.common.ConfigurationResponseCommonBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.sdnc.request.header.SdncRequestHeaderBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.service.port.PortBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceCreateInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.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.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.routing.constraints.sp.HardConstraintsBuilder; -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.rev191009.response.parameters.sp.ResponseParameters; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev191009.response.parameters.sp.ResponseParametersBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev191009.response.parameters.sp.response.parameters.PathDescription; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev191009.response.parameters.sp.response.parameters.PathDescriptionBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev191009.service.endpoint.sp.RxDirectionBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev191009.service.endpoint.sp.TxDirectionBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev191009.service.handler.header.ServiceHandlerHeader; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev191009.service.handler.header.ServiceHandlerHeaderBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.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.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 { @@ -56,10 +63,208 @@ public final class PceTestData { ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder() .setRequestId("request1") .build(); - PathComputationRequestInput input = new PathComputationRequestInputBuilder() - .setServiceHandlerHeader(serviceHandlerHeader) + return new PathComputationRequestInputBuilder() + .setServiceHandlerHeader(serviceHandlerHeader) + .build(); + } + + public static PathComputationRequestInput getEmptyPCERequestServiceNameWithRequestId() { + ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder() + .setRequestId("request1") + .build(); + return new PathComputationRequestInputBuilder() + .setServiceName("serviceName") + .setServiceHandlerHeader(serviceHandlerHeader) + .build(); + } + + public static PathComputationRequestInput getEmptyPCERequestServiceNameWithOutRequestId() { + ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder() .build(); - return input; + return new PathComputationRequestInputBuilder() + .setServiceName("serviceName") + .setServiceHandlerHeader(serviceHandlerHeader) + .build(); + } + + public static PathComputationRequestInput getPathComputationRequestInputWithCoRoutingOrGeneral2() { + ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder() + .setRequestId("request1") + .build(); + ServiceAEnd serviceAEnd = 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() + .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) + .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() { + ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder() + .setRequestId("request1") + .build(); + ServiceAEnd serviceAEnd = 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() + .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) + .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() { @@ -68,7 +273,7 @@ public final class PceTestData { .build(); ServiceAEnd serviceAEnd = new ServiceAEndBuilder() .setServiceFormat(ServiceFormat.Ethernet) - .setServiceRate(0L) + .setServiceRate(Uint32.valueOf(100)) .setClli("clli11") .setNodeId("XPONDER-2-2") .setTxDirection(new TxDirectionBuilder().setPort( @@ -96,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( @@ -122,34 +327,34 @@ public final class PceTestData { .build() ).build()) .build(); - PathComputationRequestInput input = new PathComputationRequestInputBuilder() + return new PathComputationRequestInputBuilder() .setServiceName("service1") .setResourceReserve(true) - .setPceMetric(PceMetric.HopCount) - .setLocallyProtectedLinks(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.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()) + .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.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()) + .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(); - return input; } public static PathComputationRequestOutput getFailedPCEResultYes() { @@ -177,23 +382,23 @@ public final class PceTestData { /** * Generate Data for Test 1 request 5-4. * { - "pce:input": { - "pce:service-name": "service 1", - "pce:resource-reserve": "true", - "pce:service-handler-header": { - "pce:request-id": "request 1" - }, - "pce:service-a-end": { - "pce:service-rate": "0", - "pce:node-id": "XPONDER-1-2" - }, - "pce:service-z-end": { - "pce:service-rate": "0", - "pce:node-id": "XPONDER-3-2" - }, - "pce:pce-metric": "hop-count" - } - } + * "pce:input": { + * "pce:service-name": "service 1", + * "pce:resource-reserve": "true", + * "pce:service-handler-header": { + * "pce:request-id": "request 1" + * }, + * "pce:service-a-end": { + * "pce:service-rate": "0", + * "pce:node-id": "XPONDER-1-2" + * }, + * "pce:service-z-end": { + * "pce:service-rate": "0", + * "pce:node-id": "XPONDER-3-2" + * }, + * "pce:pce-metric": "hop-count" + * } + * } * * @return input PathComputationRequestInput data */ @@ -202,28 +407,27 @@ 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(); } /** * Generate Data for Test 1 result 5-4. - * @param wl WaveLength * + * @param wl WaveLength * @return output PathComputationRequestOutput data */ public static PathComputationRequestOutput getPCE_test_result_54(Long wl) { @@ -238,29 +442,30 @@ public final class PceTestData { /** * Generate Data for Test 2 request 5-4. - *{ - "pce:input": { - "pce:service-name": "service 1", - "pce:resource-reserve": "true", - "pce:service-handler-header": { - "pce:request-id": "request 1" - }, - "pce:service-a-end": { - "pce:service-rate": "0", - "pce:node-id": "XPONDER-1-2" - }, - "pce:service-z-end": { - "pce:service-rate": "0", - "pce:node-id": "XPONDER-3-2" - }, - "pce:hard-constraints": { - "pce:exclude_": { - "node-id": [ "OpenROADM-2-2" ] - } - }, - "pce:pce-metric": "hop-count" - } - } + * { + * "pce:input": { + * "pce:service-name": "service 1", + * "pce:resource-reserve": "true", + * "pce:service-handler-header": { + * "pce:request-id": "request 1" + * }, + * "pce:service-a-end": { + * "pce:service-rate": "0", + * "pce:node-id": "XPONDER-1-2" + * }, + * "pce:service-z-end": { + * "pce:service-rate": "0", + * "pce:node-id": "XPONDER-3-2" + * }, + * "pce:hard-constraints": { + * "pce:exclude_": { + * "node-id": [ "OpenROADM-2-2" ] + * } + * }, + * "pce:pce-metric": "hop-count" + * } + * } + * * @return input PathComputationRequestInput data */ public static PathComputationRequestInput getPCE_test2_request_54() { @@ -268,33 +473,37 @@ 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()) - .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(); } /** * Generate Data for Test 2 result 5-4. + * * @return output PathComputationRequestOutput data */ public static PathComputationRequestOutput getPCE_test2_result_54() { @@ -309,63 +518,68 @@ public final class PceTestData { /** * Generate Data for Test 2 request 5-4. - *{ - "pce:input": { - "pce:service-name": "service 1", - "pce:resource-reserve": "true", - "pce:service-handler-header": { - "pce:request-id": "request 1" - }, - "pce:service-a-end": { - "pce:service-rate": "0", - "pce:node-id": "XPONDER-1-2" - }, - "pce:service-z-end": { - "pce:service-rate": "0", - "pce:node-id": "XPONDER-3-2" - }, - "pce:hard-constraints": { - "pce:exclude_": { - "node-id": [ "OpenROADM-2-1", "OpenROADM-2-2" ] - } - }, - "pce:pce-metric": "hop-count" - } - } + * { + * "pce:input": { + * "pce:service-name": "service 1", + * "pce:resource-reserve": "true", + * "pce:service-handler-header": { + * "pce:request-id": "request 1" + * }, + * "pce:service-a-end": { + * "pce:service-rate": "0", + * "pce:node-id": "XPONDER-1-2" + * }, + * "pce:service-z-end": { + * "pce:service-rate": "0", + * "pce:node-id": "XPONDER-3-2" + * }, + * "pce:hard-constraints": { + * "pce:exclude_": { + * "node-id": [ "OpenROADM-2-1", "OpenROADM-2-2" ] + * } + * }, + * "pce:pce-metric": "hop-count" + * } + * } + * * @return input PathComputationRequestInput data */ public static PathComputationRequestInput getPCE_test3_request_54() { 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(); } /** * Generate Data for Test 3 result 5-4. + * * @return output PathComputationRequestOutput data */ public static PathComputationRequestOutput getPCE_test3_result_54() { @@ -378,27 +592,52 @@ public final class PceTestData { return outputBuilder.build(); } - public static PathComputationRequestInput getPCE_simpletopology_test1_request() { + public static PathComputationRequestInput getPCE_simpletopology_test1_requestSetHardAndSoftConstrains() { ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder() .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) + 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(); + } + + public static PathComputationRequestInput getPCE_simpletopology_test1_request() { + ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder() + .setRequestId("request 1") + .build(); + ServiceAEnd serviceAEnd = new ServiceAEndBuilder() + .setServiceRate(Uint32.valueOf(0)) + .setNodeId("XPONDER-1-2") .build(); - return input; + ServiceZEnd serviceZEnd = 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(); } public static PathComputationRequestOutput getPCE_simpletopology_test1_result(Long wl) { @@ -421,54 +660,51 @@ public final class PceTestData { } private static PathDescription createPathDescription(long azRate, long azWaveLength, long zaRate, - long zaWaveLength) { + 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) + .setRate(Uint32.valueOf(zaRate)) + .setZToAWavelengthNumber(Uint32.valueOf(zaWaveLength)) .build(); - PathDescription pathDescription = new PathDescriptionBuilder() - .setAToZDirection(atozDirection) - .setZToADirection(ztoaDirection) - .build(); - return pathDescription; + return new PathDescriptionBuilder() + .setAToZDirection(atozDirection) + .setZToADirection(ztoaDirection) + .build(); } /** * Generate Data for Test Diversity test 1 request 5-4. - *{ - "pce:input": { - "pce:service-name": "service 1", - "pce:resource-reserve": "true", - "pce:service-handler-header": { - "pce:request-id": "request 1" - }, - "pce:service-a-end": { - "pce:service-rate": "0", - "pce:node-id": "XPONDER-1-1" - }, - "pce:service-z-end": { - "pce:service-rate": "0", - "pce:node-id": "XPONDER-3-1" - }, - "pce:hard-constraints": { - "pce:diversity": { - "existing-service": ["Path test-1-54"], - "existing-service-applicability": { - "node": "true" - } - } - }, - "pce:pce-metric": "hop-count" - } - } - * @param base Path Computation Request Input base + * { + * "pce:input": { + * "pce:service-name": "service 1", + * "pce:resource-reserve": "true", + * "pce:service-handler-header": { + * "pce:request-id": "request 1" + * }, + * "pce:service-a-end": { + * "pce:service-rate": "0", + * "pce:node-id": "XPONDER-1-1" + * }, + * "pce:service-z-end": { + * "pce:service-rate": "0", + * "pce:node-id": "XPONDER-3-1" + * }, + * "pce:hard-constraints": { + * "pce:diversity": { + * "existing-service": ["Path test-1-54"], + * "existing-service-applicability": { + * "node": "true" + * } + * } + * }, + * "pce:pce-metric": "hop-count" + * } + * } * + * @param base Path Computation Request Input base * @return input PathComputationRequestInput data */ public static PathComputationRequestInput build_diversity_from_request(PathComputationRequestInput base) { @@ -477,79 +713,163 @@ 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() - .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() { - ServiceCreateInputBuilder builtInput = new ServiceCreateInputBuilder(); + 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.rev161014.service.create.input.ServiceAEnd serviceAEnd = - new org.opendaylight.yang.gen.v1.http.org.openroadm.service - .rev161014.service.create.input.ServiceAEndBuilder() - .setClli("clli") - .setServiceRate((long)0) - .setNodeId("XPONDER-1-2") - .setTxDirection(new org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types - .rev161014.service.endpoint.TxDirectionBuilder() - .setPort(new PortBuilder().build()) - .build()) - .setRxDirection(new org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types - .rev161014.service.endpoint.RxDirectionBuilder() - .setPort(new PortBuilder().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) + .setCustomer("Customer") + .setServiceName("service 1") + .setServiceAEnd(serviceAEnd) + .setServiceZEnd(serviceZEnd) + .setSdncRequestHeader(new SdncRequestHeaderBuilder() + .setRequestId("request 1") .build()) - .build(); - + .build(); + } - org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.service.create.input.ServiceZEnd serviceZEnd = - new org.opendaylight.yang.gen.v1.http.org.openroadm.service - .rev161014.service.create.input.ServiceZEndBuilder() - .setClli("clli") - .setServiceRate((long)0) - .setNodeId("XPONDER-3-2") - .setTxDirection(new org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types - .rev161014.service.endpoint.TxDirectionBuilder() - .setPort(new PortBuilder().build()) + public static PathComputationRequestInput getGnpyPCERequest(String nodeA, String nodeZ) { + ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder() + .setRequestId("request1") + .build(); + ServiceAEnd serviceAEnd = 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() + .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) + .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()) - .setRxDirection(new org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types - .rev161014.service.endpoint.RxDirectionBuilder() - .setPort(new PortBuilder().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(); - - builtInput.setCommonId("commonId"); - builtInput.setConnectionType(ConnectionType.Service); - builtInput.setCustomer("Customer"); - builtInput.setServiceName("service 1"); - builtInput.setServiceAEnd(serviceAEnd); - builtInput.setServiceZEnd(serviceZEnd); - builtInput.setSdncRequestHeader(new SdncRequestHeaderBuilder() - .setRequestId("request 1") - .build()); - - - - return builtInput.build(); + .build(); } }