From: guillaume.lambert Date: Wed, 27 Mar 2024 08:59:15 +0000 (+0100) Subject: Refactor some small TAPI rpcs X-Git-Tag: 9.0.0~7 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=e032240a9215e0c64cb0904926de5b30021ab2d7 Refactor some small TAPI rpcs Signed-off-by: guillaume.lambert Change-Id: I5ed08975b462d2e01eb053ddd2f30d4a7d6c3a17 --- diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetConnectivityServiceListImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetConnectivityServiceListImpl.java index 3091214f3..724cae4dd 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetConnectivityServiceListImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetConnectivityServiceListImpl.java @@ -18,6 +18,7 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev22112 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev221121.connectivity.context.ConnectivityService; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev221121.connectivity.context.ConnectivityServiceKey; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev221121.get.connectivity.service.list.output.Service; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev221121.get.connectivity.service.list.output.ServiceBuilder; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev221121.get.connectivity.service.list.output.ServiceKey; import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -48,13 +49,12 @@ public class GetConnectivityServiceListImpl implements GetConnectivityServiceLis Map serviceMap = new HashMap<>(); for (ConnectivityService connectivityService: connMap.values()) { - Service service = new org.opendaylight.yang.gen.v1.urn - .onf.otcc.yang.tapi.connectivity.rev221121.get.connectivity.service.list.output.ServiceBuilder( - connectivityService).build(); + Service service = new ServiceBuilder(connectivityService).build(); serviceMap.put(service.key(), service); } - return RpcResultBuilder.success(new GetConnectivityServiceListOutputBuilder().setService(serviceMap) - .build()).buildFuture(); + return RpcResultBuilder + .success(new GetConnectivityServiceListOutputBuilder().setService(serviceMap).build()) + .buildFuture(); } } diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetLinkDetailsImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetLinkDetailsImpl.java index c10050da4..ba2240bec 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetLinkDetailsImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetLinkDetailsImpl.java @@ -9,12 +9,12 @@ package org.opendaylight.transportpce.tapi.impl.rpc; import com.google.common.util.concurrent.ListenableFuture; import org.opendaylight.transportpce.tapi.utils.TapiContext; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.Uuid; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.GetLinkDetails; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.GetLinkDetailsInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.GetLinkDetailsOutput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.GetLinkDetailsOutputBuilder; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.get.link.details.output.LinkBuilder; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Link; import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; @@ -33,18 +33,15 @@ public class GetLinkDetailsImpl implements GetLinkDetails { @Override public ListenableFuture> invoke(GetLinkDetailsInput input) { // TODO Auto-generated method stub - Uuid topoUuid = input.getTopologyId(); // Link id: same as OR link id - Uuid linkUuid = input.getLinkId(); - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Link link = this.tapiContext - .getTapiLink(topoUuid, linkUuid); + Link link = this.tapiContext.getTapiLink(input.getTopologyId(), input.getLinkId()); if (link == null) { LOG.error("Invalid TAPI link name"); return RpcResultBuilder.failed() .withError(ErrorType.RPC, "Invalid Link name") .buildFuture(); } - LOG.info("debug link is : {}", link.getName().toString()); + LOG.info("debug link is : {}", link.getName()); return RpcResultBuilder .success(new GetLinkDetailsOutputBuilder().setLink(new LinkBuilder(link).build()).build()) .buildFuture(); diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetNodeDetailsImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetNodeDetailsImpl.java index 434033bf3..80cf31db6 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetNodeDetailsImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetNodeDetailsImpl.java @@ -9,11 +9,12 @@ package org.opendaylight.transportpce.tapi.impl.rpc; import com.google.common.util.concurrent.ListenableFuture; import org.opendaylight.transportpce.tapi.utils.TapiContext; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.Uuid; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.GetNodeDetails; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.GetNodeDetailsInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.GetNodeDetailsOutput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.GetNodeDetailsOutputBuilder; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.get.node.details.output.NodeBuilder; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node; import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; @@ -33,21 +34,19 @@ public class GetNodeDetailsImpl implements GetNodeDetails { public ListenableFuture> invoke(GetNodeDetailsInput input) { // TODO Auto-generated method stub // TODO -> maybe we get errors when having CEPs? - Uuid topoUuid = input.getTopologyId(); // Node id: if roadm -> ROADM+PHOTONIC_MEDIA. if xpdr -> XPDR-XPDR+DSR/OTSi - Uuid nodeUuid = input.getNodeId(); - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node node = this.tapiContext - .getTapiNode(topoUuid, nodeUuid); + Node node = this.tapiContext.getTapiNode(input.getTopologyId(), input.getNodeId()); if (node == null) { LOG.error("Invalid TAPI node name"); return RpcResultBuilder.failed() .withError(ErrorType.RPC, "Invalid Tapi Node name") .buildFuture(); } - return RpcResultBuilder.success(new GetNodeDetailsOutputBuilder() - .setNode(new org.opendaylight.yang.gen.v1.urn - .onf.otcc.yang.tapi.topology.rev221121.get.node.details.output.NodeBuilder(node).build()) - .build()).buildFuture(); + return RpcResultBuilder + .success(new GetNodeDetailsOutputBuilder() + .setNode(new NodeBuilder(node).build()) + .build()) + .buildFuture(); } } diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetNodeEdgePointDetailsImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetNodeEdgePointDetailsImpl.java index 382cc1ef4..f26606fa3 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetNodeEdgePointDetailsImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetNodeEdgePointDetailsImpl.java @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.tapi.impl.rpc; import com.google.common.util.concurrent.ListenableFuture; import org.opendaylight.transportpce.tapi.utils.TapiContext; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.Uuid; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.GetNodeEdgePointDetails; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.GetNodeEdgePointDetailsInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.GetNodeEdgePointDetailsOutput; @@ -35,13 +34,11 @@ public class GetNodeEdgePointDetailsImpl implements GetNodeEdgePointDetails { public ListenableFuture> invoke(GetNodeEdgePointDetailsInput input) { // TODO Auto-generated method stub // TODO -> maybe we get errors when having CEPs? - Uuid topoUuid = input.getTopologyId(); // Node id: if roadm -> ROADMid+PHOTONIC_MEDIA. if xpdr -> XPDRid-XPDRnbr+DSR/OTSi - Uuid nodeUuid = input.getNodeId(); // NEP id: if roadm -> ROADMid+PHOTONIC_MEDIA/MC/OTSiMC+TPid. // if xpdr -> XPDRid-XPDRnbr+DSR/eODU/iODU/iOTSi/eOTSi/PHOTONIC_MEDIA+TPid - Uuid nepUuid = input.getNodeEdgePointId(); - OwnedNodeEdgePoint nep = this.tapiContext.getTapiNEP(topoUuid, nodeUuid, nepUuid); + OwnedNodeEdgePoint nep = + this.tapiContext.getTapiNEP(input.getTopologyId(), input.getNodeId(), input.getNodeEdgePointId()); if (nep == null) { LOG.error("Invalid TAPI nep name"); return RpcResultBuilder.failed() @@ -50,7 +47,8 @@ public class GetNodeEdgePointDetailsImpl implements GetNodeEdgePointDetails { } return RpcResultBuilder .success(new GetNodeEdgePointDetailsOutputBuilder() - .setNodeEdgePoint(new NodeEdgePointBuilder(nep).build()).build()) + .setNodeEdgePoint(new NodeEdgePointBuilder(nep).build()) + .build()) .buildFuture(); } diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetServiceInterfacePointDetailsImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetServiceInterfacePointDetailsImpl.java index 4eb28a7b8..fc10f05a7 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetServiceInterfacePointDetailsImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetServiceInterfacePointDetailsImpl.java @@ -14,7 +14,7 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.GetS import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.GetServiceInterfacePointDetailsInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.GetServiceInterfacePointDetailsOutput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.GetServiceInterfacePointDetailsOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.Uuid; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.get.service._interface.point.details.output.SipBuilder; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.tapi.context.ServiceInterfacePoint; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.tapi.context.ServiceInterfacePointKey; import org.opendaylight.yangtools.yang.common.ErrorType; @@ -35,7 +35,6 @@ public class GetServiceInterfacePointDetailsImpl implements GetServiceInterfaceP @Override public ListenableFuture> invoke( GetServiceInterfacePointDetailsInput input) { - Uuid sipUuid = input.getUuid(); Map sips = this.tapiContext.getTapiContext().getServiceInterfacePoint(); if (sips == null || sips.isEmpty()) { @@ -43,17 +42,16 @@ public class GetServiceInterfacePointDetailsImpl implements GetServiceInterfaceP .withError(ErrorType.RPC, "No sips in datastore") .buildFuture(); } - if (!sips.containsKey(new ServiceInterfacePointKey(sipUuid))) { + var sipKey = new ServiceInterfacePointKey(input.getUuid()); + if (!sips.containsKey(sipKey)) { return RpcResultBuilder.failed() .withError(ErrorType.RPC, "Sip doesnt exist in datastore") .buildFuture(); } - var outSip = new org.opendaylight.yang.gen.v1.urn - .onf.otcc.yang.tapi.common.rev221121.get.service._interface.point.details.output.SipBuilder( - sips.get(new ServiceInterfacePointKey(sipUuid))) - .build(); return RpcResultBuilder - .success(new GetServiceInterfacePointDetailsOutputBuilder().setSip(outSip).build()) + .success(new GetServiceInterfacePointDetailsOutputBuilder() + .setSip(new SipBuilder(sips.get(sipKey)).build()) + .build()) .buildFuture(); }