X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;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=a9d34d6a6177fba70efd91f72d99ba55092e07ac;hb=0250f5ba4fe91a980e34a6cb63b5fbe056d0325b;hp=945f920b097ceb4b9babf8524052f412194ae2b7;hpb=c12a0eefdd386e48847520e5d1568404865e7fc9;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 945f920b0..a9d34d6a6 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 @@ -68,31 +68,28 @@ public final class PceTestData { ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder() .setRequestId("request1") .build(); - PathComputationRequestInput input = new PathComputationRequestInputBuilder() - .setServiceHandlerHeader(serviceHandlerHeader) - .build(); - return input; + return new PathComputationRequestInputBuilder() + .setServiceHandlerHeader(serviceHandlerHeader) + .build(); } public static PathComputationRequestInput getEmptyPCERequestServiceNameWithRequestId() { ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder() .setRequestId("request1") .build(); - PathComputationRequestInput input = new PathComputationRequestInputBuilder() - .setServiceName("serviceName") - .setServiceHandlerHeader(serviceHandlerHeader) - .build(); - return input; + return new PathComputationRequestInputBuilder() + .setServiceName("serviceName") + .setServiceHandlerHeader(serviceHandlerHeader) + .build(); } public static PathComputationRequestInput getEmptyPCERequestServiceNameWithOutRequestId() { ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder() .build(); - PathComputationRequestInput input = new PathComputationRequestInputBuilder() - .setServiceName("serviceName") - .setServiceHandlerHeader(serviceHandlerHeader) - .build(); - return input; + return new PathComputationRequestInputBuilder() + .setServiceName("serviceName") + .setServiceHandlerHeader(serviceHandlerHeader) + .build(); } public static PathComputationRequestInput getPathComputationRequestInputWithCoRoutingOrGeneral2() { @@ -155,37 +152,35 @@ public final class PceTestData { .build() ).build()) .build(); - PathComputationRequestInput input = new PathComputationRequestInputBuilder() - .setServiceName("service1") - .setResourceReserve(true) - .setPceMetric(PceMetric.HopCount) - .setLocallyProtectedLinks(true) - .setServiceHandlerHeader(serviceHandlerHeader) - .setServiceAEnd(serviceAEnd) - .setServiceZEnd(serviceZEnd) - .setHardConstraints(new HardConstraintsBuilder() - .setCustomerCode(Arrays.asList("Some customer-code")) - .setCoRoutingOrGeneral(new CoRoutingBuilder() - .setCoRouting(new org.opendaylight.yang.gen.v1.http.org + return new PathComputationRequestInputBuilder() + .setServiceName("service1") + .setResourceReserve(true) + .setPceMetric(PceMetric.HopCount) + .setLocallyProtectedLinks(true) + .setServiceHandlerHeader(serviceHandlerHeader) + .setServiceAEnd(serviceAEnd) + .setServiceZEnd(serviceZEnd) + .setHardConstraints(new HardConstraintsBuilder() + .setCustomerCode(Arrays.asList("Some customer-code")) + .setCoRoutingOrGeneral(new CoRoutingBuilder() + .setCoRouting(new org.opendaylight.yang.gen.v1.http.org .transportpce.b.c._interface.routing.constraints.rev171017 .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder() - .setExistingService(Arrays.asList("Some existing-service")) - - .build()) - .build()) - .build()) - .setSoftConstraints(new SoftConstraintsBuilder() - .setCustomerCode(Arrays.asList("Some customer-code")) - .setCoRoutingOrGeneral(new CoRoutingBuilder() - .setCoRouting(new org.opendaylight.yang.gen.v1.http.org + .setExistingService(Arrays.asList("Some existing-service")) + .build()) + .build()) + .build()) + .setSoftConstraints(new SoftConstraintsBuilder() + .setCustomerCode(Arrays.asList("Some customer-code")) + .setCoRoutingOrGeneral(new CoRoutingBuilder() + .setCoRouting(new org.opendaylight.yang.gen.v1.http.org .transportpce.b.c._interface.routing.constraints.rev171017 .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder() - .setExistingService(Arrays.asList("Some existing-service")) - .build()) - .build()) - .build()) - .build(); - return input; + .setExistingService(Arrays.asList("Some existing-service")) + .build()) + .build()) + .build()) + .build(); } public static PathComputationRequestInput getPathComputationRequestInputWithCoRoutingOrGeneral() { @@ -248,37 +243,35 @@ public final class PceTestData { .build() ).build()) .build(); - PathComputationRequestInput input = new PathComputationRequestInputBuilder() - .setServiceName("service1") - .setResourceReserve(true) - .setPceMetric(PceMetric.HopCount) - .setLocallyProtectedLinks(true) - .setServiceHandlerHeader(serviceHandlerHeader) - .setServiceAEnd(serviceAEnd) - .setServiceZEnd(serviceZEnd) - .setHardConstraints(new HardConstraintsBuilder() - .setCustomerCode(Arrays.asList("Some customer-code")) - .setCoRoutingOrGeneral(new CoRoutingBuilder() - .setCoRouting(new org.opendaylight.yang.gen.v1.http.org + return new PathComputationRequestInputBuilder() + .setServiceName("service1") + .setResourceReserve(true) + .setPceMetric(PceMetric.HopCount) + .setLocallyProtectedLinks(true) + .setServiceHandlerHeader(serviceHandlerHeader) + .setServiceAEnd(serviceAEnd) + .setServiceZEnd(serviceZEnd) + .setHardConstraints(new HardConstraintsBuilder() + .setCustomerCode(Arrays.asList("Some customer-code")) + .setCoRoutingOrGeneral(new CoRoutingBuilder() + .setCoRouting(new org.opendaylight.yang.gen.v1.http.org .transportpce.b.c._interface.routing.constraints.rev171017 .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder() - .setExistingService(Arrays.asList("Some existing-service")) - - .build()) - .build()) - .build()) - .setSoftConstraints(new SoftConstraintsBuilder() - .setCustomerCode(Arrays.asList("Some customer-code")) - .setCoRoutingOrGeneral(new CoRoutingBuilder() - .setCoRouting(new org.opendaylight.yang.gen.v1.http.org + .setExistingService(Arrays.asList("Some existing-service")) + .build()) + .build()) + .build()) + .setSoftConstraints(new SoftConstraintsBuilder() + .setCustomerCode(Arrays.asList("Some customer-code")) + .setCoRoutingOrGeneral(new CoRoutingBuilder() + .setCoRouting(new org.opendaylight.yang.gen.v1.http.org .transportpce.b.c._interface.routing.constraints.rev171017 .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder() - .setExistingService(Arrays.asList("Some existing-service")) - .build()) - .build()) - .build()) - .build(); - return input; + .setExistingService(Arrays.asList("Some existing-service")) + .build()) + .build()) + .build()) + .build(); } public static PathComputationRequestInput getPCERequest() { @@ -341,36 +334,35 @@ public final class PceTestData { .build() ).build()) .build(); - PathComputationRequestInput input = new PathComputationRequestInputBuilder() - .setServiceName("service1") - .setResourceReserve(true) - .setPceMetric(PceMetric.HopCount) - .setLocallyProtectedLinks(true) - .setServiceHandlerHeader(serviceHandlerHeader) - .setServiceAEnd(serviceAEnd) - .setServiceZEnd(serviceZEnd) - .setHardConstraints(new HardConstraintsBuilder() - .setCustomerCode(Arrays.asList("Some customer-code")) - .setCoRoutingOrGeneral(new CoRoutingBuilder() - .setCoRouting(new org.opendaylight.yang.gen.v1.http.org + return new PathComputationRequestInputBuilder() + .setServiceName("service1") + .setResourceReserve(true) + .setPceMetric(PceMetric.HopCount) + .setLocallyProtectedLinks(true) + .setServiceHandlerHeader(serviceHandlerHeader) + .setServiceAEnd(serviceAEnd) + .setServiceZEnd(serviceZEnd) + .setHardConstraints(new HardConstraintsBuilder() + .setCustomerCode(Arrays.asList("Some customer-code")) + .setCoRoutingOrGeneral(new CoRoutingBuilder() + .setCoRouting(new org.opendaylight.yang.gen.v1.http.org .transportpce.b.c._interface.routing.constraints.rev171017 .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder() - .setExistingService(Arrays.asList("Some existing-service")) - .build()) - .build()) - .build()) - .setSoftConstraints(new SoftConstraintsBuilder() - .setCustomerCode(Arrays.asList("Some customer-code")) - .setCoRoutingOrGeneral(new CoRoutingBuilder() - .setCoRouting(new org.opendaylight.yang.gen.v1.http.org + .setExistingService(Arrays.asList("Some existing-service")) + .build()) + .build()) + .build()) + .setSoftConstraints(new SoftConstraintsBuilder() + .setCustomerCode(Arrays.asList("Some customer-code")) + .setCoRoutingOrGeneral(new CoRoutingBuilder() + .setCoRouting(new org.opendaylight.yang.gen.v1.http.org .transportpce.b.c._interface.routing.constraints.rev171017 .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder() - .setExistingService(Arrays.asList("Some existing-service")) - .build()) - .build()) - .build()) - .build(); - return input; + .setExistingService(Arrays.asList("Some existing-service")) + .build()) + .build()) + .build()) + .build(); } public static PathComputationRequestOutput getFailedPCEResultYes() { @@ -430,15 +422,14 @@ public final class PceTestData { .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) + .setPceMetric(PceMetric.HopCount) + .setServiceAEnd(serviceAEnd) + .setServiceZEnd(serviceZEnd) + .build(); } /** @@ -502,26 +493,25 @@ public final class PceTestData { .setHopType(new HopTypeBuilder() .setHopType(new HopTypeBuilder().getHopType()).build()) .build(); - PathComputationRequestInput input = new PathComputationRequestInputBuilder() - .setServiceHandlerHeader(serviceHandlerHeader) - .setServiceName("service 1") - .setResourceReserve(true) - .setPceMetric(PceMetric.HopCount) - .setServiceAEnd(serviceAEnd) - .setServiceZEnd(serviceZEnd) - .setHardConstraints(new HardConstraintsBuilder() - .setCoRoutingOrGeneral(new GeneralBuilder() - .setExclude(new ExcludeBuilder() - .setNodeId(Arrays.asList("OpenROADM-2-2")) - .build()) - .setLatency(new LatencyBuilder().setMaxLatency(Uint32.valueOf(3223)).build()) - .setInclude(new IncludeBuilder() - .setOrderedHops(Map.of(orderedHops.key(),orderedHops)) - .build()) - .build()) - .build()) - .build(); - return input; + return new PathComputationRequestInputBuilder() + .setServiceHandlerHeader(serviceHandlerHeader) + .setServiceName("service 1") + .setResourceReserve(true) + .setPceMetric(PceMetric.HopCount) + .setServiceAEnd(serviceAEnd) + .setServiceZEnd(serviceZEnd) + .setHardConstraints(new HardConstraintsBuilder() + .setCoRoutingOrGeneral(new GeneralBuilder() + .setExclude(new ExcludeBuilder() + .setNodeId(Arrays.asList("OpenROADM-2-2")) + .build()) + .setLatency(new LatencyBuilder().setMaxLatency(Uint32.valueOf(3223)).build()) + .setInclude(new IncludeBuilder() + .setOrderedHops(Map.of(orderedHops.key(),orderedHops)) + .build()) + .build()) + .build()) + .build(); } /** @@ -582,22 +572,21 @@ public final class PceTestData { .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) + .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(); } /** @@ -629,17 +618,16 @@ public final class PceTestData { .build(); HardConstraints hardConstrains = new HardConstraintsBuilder().build(); SoftConstraints softConstraints = new SoftConstraintsBuilder().build(); - PathComputationRequestInput input = new PathComputationRequestInputBuilder() - .setServiceHandlerHeader(serviceHandlerHeader) - .setServiceName("service 1") - .setResourceReserve(true) - .setPceMetric(PceMetric.HopCount) - .setServiceAEnd(serviceAEnd) - .setServiceZEnd(serviceZEnd) - .setHardConstraints(hardConstrains) - .setSoftConstraints(softConstraints) - .build(); - return input; + return new PathComputationRequestInputBuilder() + .setServiceHandlerHeader(serviceHandlerHeader) + .setServiceName("service 1") + .setResourceReserve(true) + .setPceMetric(PceMetric.HopCount) + .setServiceAEnd(serviceAEnd) + .setServiceZEnd(serviceZEnd) + .setHardConstraints(hardConstrains) + .setSoftConstraints(softConstraints) + .build(); } public static PathComputationRequestInput getPCE_simpletopology_test1_request() { @@ -654,15 +642,14 @@ public final class PceTestData { .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) + .setPceMetric(PceMetric.HopCount) + .setServiceAEnd(serviceAEnd) + .setServiceZEnd(serviceZEnd) + .build(); } public static PathComputationRequestOutput getPCE_simpletopology_test1_result(Long wl) { @@ -694,11 +681,10 @@ public final class PceTestData { .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(); } /** @@ -746,23 +732,21 @@ public final class PceTestData { .setServiceRate(Uint32.valueOf(0)) .setNodeId("XPONDER-3-1") .build(); - - PathComputationRequestInput input = new PathComputationRequestInputBuilder(base) - .setServiceName("service 2") - .setServiceAEnd(serviceAEnd) - .setServiceZEnd(serviceZEnd) - .setHardConstraints(new HardConstraintsBuilder() - .setCoRoutingOrGeneral(new GeneralBuilder() - .setLatency(new LatencyBuilder() - .setMaxLatency(Uint32.valueOf(3223)).build()) - .setDiversity(new DiversityBuilder() - .setExistingService(Arrays.asList(base.getServiceName())) - .setExistingServiceApplicability(nodeTrue) - .build()) - .build()) - .build()) - .build(); - return input; + return new PathComputationRequestInputBuilder(base) + .setServiceName("service 2") + .setServiceAEnd(serviceAEnd) + .setServiceZEnd(serviceZEnd) + .setHardConstraints(new HardConstraintsBuilder() + .setCoRoutingOrGeneral(new GeneralBuilder() + .setLatency(new LatencyBuilder() + .setMaxLatency(Uint32.valueOf(3223)).build()) + .setDiversity(new DiversityBuilder() + .setExistingService(Arrays.asList(base.getServiceName())) + .setExistingServiceApplicability(nodeTrue) + .build()) + .build()) + .build()) + .build(); } public static ServiceCreateInput buildServiceCreateInput() { @@ -774,43 +758,41 @@ public final class PceTestData { .setServiceRate(Uint32.valueOf(0)) .setNodeId(new NodeIdType("XPONDER-1-2")) .setTxDirection(new org.opendaylight.yang.gen.v1.http.org - .openroadm.common.service.types.rev190531.service.endpoint.TxDirectionBuilder() + .openroadm.common.service.types.rev190531.service.endpoint.TxDirectionBuilder() .setPort(new PortBuilder().build()) .build()) .setRxDirection(new org.opendaylight.yang.gen.v1.http.org - .openroadm.common.service.types.rev190531.service.endpoint.RxDirectionBuilder() + .openroadm.common.service.types.rev190531.service.endpoint.RxDirectionBuilder() .setPort(new PortBuilder().build()) .build()) .build(); org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.create.input.ServiceZEnd serviceZEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531 - .service.create.input.ServiceZEndBuilder() + .service.create.input.ServiceZEndBuilder() .setClli("clli") .setServiceRate(Uint32.valueOf(0)) .setNodeId(new NodeIdType("XPONDER-3-2")) .setTxDirection(new org.opendaylight.yang.gen.v1.http.org - .openroadm.common.service.types.rev190531.service.endpoint.TxDirectionBuilder() + .openroadm.common.service.types.rev190531.service.endpoint.TxDirectionBuilder() .setPort(new PortBuilder().build()) .build()) .setRxDirection(new org.opendaylight.yang.gen.v1.http.org - .openroadm.common.service.types.rev190531.service.endpoint.RxDirectionBuilder() + .openroadm.common.service.types.rev190531.service.endpoint.RxDirectionBuilder() .setPort(new PortBuilder().build()) .build()) .build(); - - ServiceCreateInputBuilder builtInput = new ServiceCreateInputBuilder() - .setCommonId("commonId") - .setConnectionType(ConnectionType.Service) - .setCustomer("Customer") - .setServiceName("service 1") - .setServiceAEnd(serviceAEnd) - .setServiceZEnd(serviceZEnd) - .setSdncRequestHeader(new SdncRequestHeaderBuilder() - .setRequestId("request 1") - .build()); - - return builtInput.build(); + return new ServiceCreateInputBuilder() + .setCommonId("commonId") + .setConnectionType(ConnectionType.Service) + .setCustomer("Customer") + .setServiceName("service 1") + .setServiceAEnd(serviceAEnd) + .setServiceZEnd(serviceZEnd) + .setSdncRequestHeader(new SdncRequestHeaderBuilder() + .setRequestId("request 1") + .build()) + .build(); } public static PathComputationRequestInput getGnpyPCERequest(String nodeA, String nodeZ) { @@ -873,35 +855,34 @@ public final class PceTestData { .build() ).build()) .build(); - PathComputationRequestInput input = new PathComputationRequestInputBuilder() - .setServiceName("service1") - .setResourceReserve(true) - .setPceMetric(PceMetric.HopCount) - .setLocallyProtectedLinks(true) - .setServiceHandlerHeader(serviceHandlerHeader) - .setServiceAEnd(serviceAEnd) - .setServiceZEnd(serviceZEnd) - .setHardConstraints(new HardConstraintsBuilder() - .setCustomerCode(Arrays.asList("Some customer-code")) - .setCoRoutingOrGeneral(new CoRoutingBuilder() - .setCoRouting(new org.opendaylight.yang.gen.v1.http.org + return new PathComputationRequestInputBuilder() + .setServiceName("service1") + .setResourceReserve(true) + .setPceMetric(PceMetric.HopCount) + .setLocallyProtectedLinks(true) + .setServiceHandlerHeader(serviceHandlerHeader) + .setServiceAEnd(serviceAEnd) + .setServiceZEnd(serviceZEnd) + .setHardConstraints(new HardConstraintsBuilder() + .setCustomerCode(Arrays.asList("Some customer-code")) + .setCoRoutingOrGeneral(new CoRoutingBuilder() + .setCoRouting(new org.opendaylight.yang.gen.v1.http.org .transportpce.b.c._interface.routing.constraints.rev171017 .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder() - .setExistingService(Arrays.asList("Some existing-service")) - .build()) - .build()) - .build()) - .setSoftConstraints(new SoftConstraintsBuilder() - .setCustomerCode(Arrays.asList("Some customer-code")) - .setCoRoutingOrGeneral(new CoRoutingBuilder() - .setCoRouting(new org.opendaylight.yang.gen.v1.http.org + .setExistingService(Arrays.asList("Some existing-service")) + .build()) + .build()) + .build()) + .setSoftConstraints(new SoftConstraintsBuilder() + .setCustomerCode(Arrays.asList("Some customer-code")) + .setCoRoutingOrGeneral(new CoRoutingBuilder() + .setCoRouting(new org.opendaylight.yang.gen.v1.http.org .transportpce.b.c._interface.routing.constraints.rev171017 .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder() - .setExistingService(Arrays.asList("Some existing-service")) - .build()) - .build()) - .build()) - .build(); - return input; + .setExistingService(Arrays.asList("Some existing-service")) + .build()) + .build()) + .build()) + .build(); } }