X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=servicehandler%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fservicehandler%2FModelMappingUtils.java;h=302227797ce20ef59fe3dfc1c4f80201d7dcc7a3;hb=4bb3743a3214fb481e4cc147914a314c9ff6d1c3;hp=20203edb24d1d974f2252d61dbc4cc7ee960b0d1;hpb=26ae7f03806a3079dca25ec6e3285f2ba369c481;p=transportpce.git diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtils.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtils.java index 20203edb2..302227797 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtils.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtils.java @@ -18,7 +18,7 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev22 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceDeleteInputBuilder; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceImplementationRequestInput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceImplementationRequestInputBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.node.types.rev181130.NodeIdType; +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.ServiceEndpoint; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.configuration.response.common.ConfigurationResponseCommonBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.response.parameters.ResponseParametersBuilder; @@ -46,6 +46,12 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev21092 import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev210924.OTUflex; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev210924.OduRateIdentity; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev210924.OtuRateIdentity; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.AddOpenroadmOperationalModesToCatalogInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.AddOpenroadmOperationalModesToCatalogOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.AddOpenroadmOperationalModesToCatalogOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.AddSpecificOperationalModesToCatalogInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.AddSpecificOperationalModesToCatalogOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.AddSpecificOperationalModesToCatalogOutputBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceCreateInput; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceCreateOutput; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceCreateOutputBuilder; @@ -142,13 +148,15 @@ public final class ModelMappingUtils { new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118 .service.endpoint.sp.TxDirectionBuilder() .setPort( - input.getServiceAEnd().getTxDirection().values().stream().findFirst().get().getPort()) + input.getServiceAEnd().getTxDirection().values().stream().findFirst().orElseThrow() + .getPort()) .build()) .setRxDirection( new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118 .service.endpoint.sp.RxDirectionBuilder() .setPort( - input.getServiceAEnd().getRxDirection().values().stream().findFirst().get().getPort()) + input.getServiceAEnd().getRxDirection().values().stream().findFirst().orElseThrow() + .getPort()) .build()) .build()) .setServiceZEnd( @@ -164,13 +172,15 @@ public final class ModelMappingUtils { new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118 .service.endpoint.sp.TxDirectionBuilder() .setPort( - input.getServiceZEnd().getTxDirection().values().stream().findFirst().get().getPort()) + input.getServiceZEnd().getTxDirection().values().stream().findFirst().orElseThrow() + .getPort()) .build()) .setRxDirection( new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118 .service.endpoint.sp.RxDirectionBuilder() .setPort( - input.getServiceZEnd().getRxDirection().values().stream().findFirst().get().getPort()) + input.getServiceZEnd().getRxDirection().values().stream().findFirst().orElseThrow() + .getPort()) .build()) .build()) .setConnectionType(input.getConnectionType()) @@ -252,24 +262,54 @@ public final class ModelMappingUtils { return new ServiceAEndBuilder() .setClli(serviceAEnd.getClli()) .setNodeId(serviceAEnd.getNodeId().getValue()) - .setRxDirection(createRxDirection(serviceAEnd.getRxDirection().values().stream().findFirst().get())) + .setRxDirection(createRxDirection(serviceAEnd.getRxDirection().values().stream().findFirst().orElseThrow())) .setServiceFormat(serviceAEnd.getServiceFormat()) .setServiceRate(serviceAEnd.getServiceRate()) - .setTxDirection(createTxDirection(serviceAEnd.getTxDirection().values().stream().findFirst().get())) + .setTxDirection(createTxDirection(serviceAEnd.getTxDirection().values().stream().findFirst().orElseThrow())) .build(); } + public static org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808 + .path.computation.reroute.request.input.ServiceAEnd createServiceAEndReroute(ServiceEndpoint serviceAEnd) { + return new org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808 + .path.computation.reroute.request.input.ServiceAEndBuilder() + .setClli(serviceAEnd.getClli()) + .setNodeId(serviceAEnd.getNodeId().getValue()) + .setRxDirection(createRxDirection(serviceAEnd.getRxDirection().values().stream().findFirst() + .orElseThrow())) + .setServiceFormat(serviceAEnd.getServiceFormat()) + .setServiceRate(serviceAEnd.getServiceRate()) + .setTxDirection(createTxDirection(serviceAEnd.getTxDirection().values().stream().findFirst() + .orElseThrow())) + .build(); + } + public static ServiceZEnd createServiceZEnd(ServiceEndpoint serviceZEnd) { return new ServiceZEndBuilder() .setClli(serviceZEnd.getClli()) .setNodeId(serviceZEnd.getNodeId().getValue()) - .setRxDirection(createRxDirection(serviceZEnd.getRxDirection().values().stream().findFirst().get())) + .setRxDirection(createRxDirection(serviceZEnd.getRxDirection().values().stream().findFirst().orElseThrow())) .setServiceFormat(serviceZEnd.getServiceFormat()) .setServiceRate(serviceZEnd.getServiceRate()) - .setTxDirection(createTxDirection(serviceZEnd.getTxDirection().values().stream().findFirst().get())) + .setTxDirection(createTxDirection(serviceZEnd.getTxDirection().values().stream().findFirst().orElseThrow())) .build(); } + public static org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808 + .path.computation.reroute.request.input.ServiceZEnd createServiceZEndReroute(ServiceEndpoint serviceZEnd) { + return new org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808 + .path.computation.reroute.request.input.ServiceZEndBuilder() + .setClli(serviceZEnd.getClli()) + .setNodeId(serviceZEnd.getNodeId().getValue()) + .setRxDirection(createRxDirection(serviceZEnd.getRxDirection().values().stream().findFirst() + .orElseThrow())) + .setServiceFormat(serviceZEnd.getServiceFormat()) + .setServiceRate(serviceZEnd.getServiceRate()) + .setTxDirection(createTxDirection(serviceZEnd.getTxDirection().values().stream().findFirst() + .orElseThrow())) + .build(); + } + public static RxDirection createRxDirection( org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210 .service.endpoint.RxDirection rxDirection) { @@ -391,14 +431,16 @@ public final class ModelMappingUtils { } public static ListenableFuture> createRerouteServiceReply( - ServiceRerouteInput input, String finalAckYes, String message) { + ServiceRerouteInput input, String finalAckYes, String message, String responseCode) { return RpcResultBuilder .success( new ServiceRerouteOutputBuilder() .setConfigurationResponseCommon( new ConfigurationResponseCommonBuilder() - .setResponseMessage(message) - .build()) + .setAckFinalIndicator(finalAckYes) + .setResponseCode(responseCode) + .setResponseMessage(message) + .build()) .setHardConstraints(null) .setSoftConstraints(null) .build()) @@ -523,7 +565,7 @@ public final class ModelMappingUtils { .service.endpoint.sp.TxDirectionBuilder() .setPort( serviceInput.getServiceAEnd().getTxDirection() - .values().stream().findFirst().get().getPort()) + .values().stream().findFirst().orElseThrow().getPort()) .build()) .setRxDirection( new org.opendaylight.yang.gen.v1 @@ -531,7 +573,7 @@ public final class ModelMappingUtils { .service.endpoint.sp.RxDirectionBuilder() .setPort( serviceInput.getServiceAEnd().getRxDirection() - .values().stream().findFirst().get().getPort()) + .values().stream().findFirst().orElseThrow().getPort()) .build()) .build()) .setServiceZEnd( @@ -547,7 +589,7 @@ public final class ModelMappingUtils { .service.endpoint.sp.TxDirectionBuilder() .setPort( serviceInput.getServiceZEnd().getTxDirection() - .values().stream().findFirst().get().getPort()) + .values().stream().findFirst().orElseThrow().getPort()) .build()) .setRxDirection( new org.opendaylight.yang.gen.v1 @@ -555,7 +597,7 @@ public final class ModelMappingUtils { .service.endpoint.sp.RxDirectionBuilder() .setPort( serviceInput.getServiceZEnd().getRxDirection() - .values().stream().findFirst().get().getPort()) + .values().stream().findFirst().orElseThrow().getPort()) .build()) .build()) .setServicePathName(serviceInput.getServiceName()) @@ -604,4 +646,45 @@ public final class ModelMappingUtils { } return new int[] { endPos - maxLen, endPos }; } + + public static ListenableFuture> + addOpenroadmServiceReply(AddOpenroadmOperationalModesToCatalogInput input, String finalAck, + String message,String responseCode) { + return RpcResultBuilder + .success( + new AddOpenroadmOperationalModesToCatalogOutputBuilder() + .setConfigurationResponseCommon( + new ConfigurationResponseCommonBuilder() + .setAckFinalIndicator(finalAck) + .setResponseMessage(message) + .setResponseCode(responseCode) + .setRequestId( + input.getSdncRequestHeader() == null + ? null + : input.getSdncRequestHeader().getRequestId()) + .build()) + .build()) + .buildFuture(); + } + + public static ListenableFuture> + addSpecificOpenroadmServiceReply(AddSpecificOperationalModesToCatalogInput input, String finalAck, + String message,String responseCode) { + return RpcResultBuilder + .success( + new AddSpecificOperationalModesToCatalogOutputBuilder() + .setConfigurationResponseCommon( + new ConfigurationResponseCommonBuilder() + .setAckFinalIndicator(finalAck) + .setResponseMessage(message) + .setResponseCode(responseCode) + .setRequestId( + input.getSdncRequestHeader() == null + ? null + : input.getSdncRequestHeader().getRequestId()) + .build()) + .build()) + .buildFuture(); + } + }