X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=servicehandler%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fservicehandler%2Futils%2FModelMappingUtils.java;h=2194e2a359ec3b86b0f8cd9cd6aea34cc1a072e8;hb=c3304a3906d642b4fb2b4b57ae0a3a1081d5014a;hp=e8b7d6de48e8e1958a41b048e243c8f28a57b892;hpb=f6a0a3a9e078bf4ab57e1ad9c39cc16f4de4d89b;p=transportpce.git diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ModelMappingUtils.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ModelMappingUtils.java index e8b7d6de4..2194e2a35 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ModelMappingUtils.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ModelMappingUtils.java @@ -10,12 +10,12 @@ package org.opendaylight.transportpce.servicehandler.utils; import com.google.common.util.concurrent.ListenableFuture; import org.opendaylight.transportpce.servicehandler.MappingConstraints; import org.opendaylight.transportpce.servicehandler.ServiceInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.PathComputationRequestOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.path.computation.request.input.ServiceAEnd; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.path.computation.request.input.ServiceAEndBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.path.computation.request.input.ServiceZEnd; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.path.computation.request.input.ServiceZEndBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.service.path.rpc.result.PathDescription; +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.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.rev220118.service.path.rpc.result.PathDescription; 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; @@ -45,14 +45,14 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.TempSer import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.TempServiceDeleteOutputBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.list.Services; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.list.ServicesBuilder; -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.rev200128.service.endpoint.sp.RxDirection; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.service.endpoint.sp.RxDirectionBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.service.endpoint.sp.TxDirection; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.service.endpoint.sp.TxDirectionBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.service.handler.header.ServiceHandlerHeaderBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.service.path.PathDescriptionBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev220118.routing.constraints.sp.HardConstraintsBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev220118.routing.constraints.sp.SoftConstraintsBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.service.endpoint.sp.RxDirection; +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.TxDirection; +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.ServiceHandlerHeaderBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.service.path.PathDescriptionBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev171017.service.path.list.ServicePaths; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev171017.service.path.list.ServicePathsBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -76,10 +76,10 @@ public final class ModelMappingUtils { .setServiceRate(input.getServiceAEnd().getServiceRate()).setClli(input.getServiceAEnd().getClli()) .setNodeId(input.getServiceAEnd().getNodeId().getValue()) .setTxDirection(new org.opendaylight.yang.gen.v1.http - .org.transportpce.b.c._interface.service.types.rev200128.service.endpoint.sp.TxDirectionBuilder() + .org.transportpce.b.c._interface.service.types.rev220118.service.endpoint.sp.TxDirectionBuilder() .setPort(input.getServiceAEnd().getTxDirection().getPort()).build()) .setRxDirection(new org.opendaylight.yang.gen.v1.http - .org.transportpce.b.c._interface.service.types.rev200128.service.endpoint.sp.RxDirectionBuilder() + .org.transportpce.b.c._interface.service.types.rev220118.service.endpoint.sp.RxDirectionBuilder() .setPort(input.getServiceAEnd().getRxDirection().getPort()).build()); org.opendaylight.yang.gen.v1.http .org.opendaylight.transportpce.renderer.rev210915.service.implementation.request.input.ServiceZEndBuilder @@ -89,10 +89,10 @@ public final class ModelMappingUtils { .setServiceRate(input.getServiceZEnd().getServiceRate()).setClli(input.getServiceZEnd().getClli()) .setNodeId(input.getServiceZEnd().getNodeId().getValue()) .setTxDirection(new org.opendaylight.yang.gen.v1.http - .org.transportpce.b.c._interface.service.types.rev200128.service.endpoint.sp.TxDirectionBuilder() + .org.transportpce.b.c._interface.service.types.rev220118.service.endpoint.sp.TxDirectionBuilder() .setPort(input.getServiceZEnd().getTxDirection().getPort()).build()) .setRxDirection(new org.opendaylight.yang.gen.v1.http - .org.transportpce.b.c._interface.service.types.rev200128.service.endpoint.sp.RxDirectionBuilder() + .org.transportpce.b.c._interface.service.types.rev220118.service.endpoint.sp.RxDirectionBuilder() .setPort(input.getServiceZEnd().getRxDirection().getPort()).build()); serviceImplementationRequestInputBuilder.setServiceAEnd(serviceAEnd.build()); serviceImplementationRequestInputBuilder.setServiceZEnd(serviceZEnd.build()); @@ -295,33 +295,33 @@ public final class ModelMappingUtils { public static ServicePaths mappingServicePaths(ServiceInput serviceInput, PathComputationRequestOutput output) { ServicePathsBuilder servicePathBuilder = new ServicePathsBuilder(); if (serviceInput != null) { - org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128 + org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118 .service.path.ServiceAEndBuilder serviceAEnd = - new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128 + new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118 .service.path.ServiceAEndBuilder(); serviceAEnd.setServiceFormat(serviceInput.getServiceAEnd().getServiceFormat()) .setServiceRate(serviceInput.getServiceAEnd().getServiceRate()) .setClli(serviceInput.getServiceAEnd().getClli()) .setNodeId(new NodeIdType(serviceInput.getServiceAEnd().getNodeId().getValue()).getValue()) .setTxDirection(new org.opendaylight.yang.gen.v1.http.org - .transportpce.b.c._interface.service.types.rev200128.service.endpoint.sp.TxDirectionBuilder() + .transportpce.b.c._interface.service.types.rev220118.service.endpoint.sp.TxDirectionBuilder() .setPort(serviceInput.getServiceAEnd().getTxDirection().getPort()).build()) .setRxDirection(new org.opendaylight.yang.gen.v1.http.org - .transportpce.b.c._interface.service.types.rev200128.service.endpoint.sp.RxDirectionBuilder() + .transportpce.b.c._interface.service.types.rev220118.service.endpoint.sp.RxDirectionBuilder() .setPort(serviceInput.getServiceAEnd().getRxDirection().getPort()).build()); - org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128 + org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118 .service.path.ServiceZEndBuilder serviceZEnd = - new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128 + new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118 .service.path.ServiceZEndBuilder(); serviceZEnd.setServiceFormat(serviceInput.getServiceZEnd().getServiceFormat()) .setServiceRate(serviceInput.getServiceZEnd().getServiceRate()) .setClli(serviceInput.getServiceZEnd().getClli()) .setNodeId(new NodeIdType(serviceInput.getServiceZEnd().getNodeId().getValue()).getValue()) .setTxDirection(new org.opendaylight.yang.gen.v1.http.org - .transportpce.b.c._interface.service.types.rev200128.service.endpoint.sp.TxDirectionBuilder() + .transportpce.b.c._interface.service.types.rev220118.service.endpoint.sp.TxDirectionBuilder() .setPort(serviceInput.getServiceZEnd().getTxDirection().getPort()).build()) .setRxDirection(new org.opendaylight.yang.gen.v1.http.org - .transportpce.b.c._interface.service.types.rev200128.service.endpoint.sp.RxDirectionBuilder() + .transportpce.b.c._interface.service.types.rev220118.service.endpoint.sp.RxDirectionBuilder() .setPort(serviceInput.getServiceZEnd().getRxDirection().getPort()).build()); servicePathBuilder.setServiceAEnd(serviceAEnd.build()); servicePathBuilder.setServiceZEnd(serviceZEnd.build());