From: Gilles Thouenon Date: Sun, 1 Oct 2023 15:27:52 +0000 (+0200) Subject: Do not use RpcService in TPCE tapi module X-Git-Tag: 9.0.0~94 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=37a539ad2c5ad1006cd0203de63d80350c32b72e Do not use RpcService in TPCE tapi module - Migrate usage of RpcService to the new style yang.binding.Rpc-based implementation for tapi module - Adapt lighty implementation JIRA: TRNSPRTPCE-752 Signed-off-by: Gilles Thouenon Change-Id: Iac5a054c092db47c74782b3bc2980490b88ecfd1 --- diff --git a/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java b/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java index c324d4bd0..b93e5c4b6 100644 --- a/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java +++ b/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java @@ -201,6 +201,7 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP new TapiNetworkModelServiceImpl( networkTransaction, deviceTransactionManager, tapiLink, lgServBNPS)); + rpcRegistrations.addAll(tapiProvider.getRegisteredRpcs()); } if (activateNbiNotification) { LOG.info("Creating nbi-notifications beans ..."); diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/connectivity/TapiConnectivityImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/connectivity/TapiConnectivityImpl.java index 5870c1b89..449b212e9 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/connectivity/TapiConnectivityImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/connectivity/TapiConnectivityImpl.java @@ -7,6 +7,7 @@ */ package org.opendaylight.transportpce.tapi.connectivity; +import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.common.util.concurrent.ListenableFuture; import java.nio.charset.StandardCharsets; import java.util.HashMap; @@ -39,26 +40,33 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.glob import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.global._class.NameBuilder; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.tapi.context.ServiceInterfacePoint; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.tapi.context.ServiceInterfacePointKey; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.CreateConnectivityService; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.CreateConnectivityServiceInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.CreateConnectivityServiceOutput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.CreateConnectivityServiceOutputBuilder; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.DeleteConnectivityService; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.DeleteConnectivityServiceInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.DeleteConnectivityServiceOutput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.DeleteConnectivityServiceOutputBuilder; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.GetConnectionDetails; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.GetConnectionDetailsInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.GetConnectionDetailsOutput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.GetConnectionDetailsOutputBuilder; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.GetConnectionEndPointDetails; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.GetConnectionEndPointDetailsInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.GetConnectionEndPointDetailsOutput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.GetConnectionEndPointDetailsOutputBuilder; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.GetConnectivityServiceDetails; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.GetConnectivityServiceDetailsInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.GetConnectivityServiceDetailsOutput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.GetConnectivityServiceDetailsOutputBuilder; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.GetConnectivityServiceList; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.GetConnectivityServiceListInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.GetConnectivityServiceListOutput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.GetConnectivityServiceListOutputBuilder; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.ServiceType; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.TapiConnectivityService; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.UpdateConnectivityService; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.UpdateConnectivityServiceInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.UpdateConnectivityServiceOutput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.cep.list.ConnectionEndPoint; @@ -76,6 +84,7 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev18121 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.get.connection.end.point.details.output.ConnectionEndPointBuilder; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.get.connectivity.service.list.output.Service; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.get.connectivity.service.list.output.ServiceKey; +import org.opendaylight.yangtools.yang.binding.Rpc; import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; @@ -198,37 +207,6 @@ public class TapiConnectivityImpl implements TapiConnectivityService { .setService(new ServiceBuilder(service).build()).build()).buildFuture(); } - private Map createEndPoints( - Map endPoints) { - Map endPointMap = new HashMap<>(); - for (org.opendaylight.yang.gen.v1.urn - .onf.otcc.yang.tapi.connectivity.rev181210.create.connectivity.service.input.EndPoint ep: - endPoints.values()) { - EndPoint endpoint = new EndPointBuilder() - .setServiceInterfacePoint(new ServiceInterfacePointBuilder() - .setServiceInterfacePointUuid(ep.getServiceInterfacePoint().getServiceInterfacePointUuid()) - .build()) - .setName(ep.getName()) - .setAdministrativeState(ep.getAdministrativeState()) - .setDirection(ep.getDirection()) - .setLifecycleState(ep.getLifecycleState()) - .setOperationalState(ep.getOperationalState()) - .setLayerProtocolName(ep.getLayerProtocolName()) - .setCapacity(new CapacityBuilder() - .setTotalSize(new TotalSizeBuilder().build()) - .setBandwidthProfile(new BandwidthProfileBuilder().build()) // TODO: implement bandwidth profile - .build()) - .setProtectionRole(ep.getProtectionRole()) - .setRole(ep.getRole()) - .setLocalId(ep.getLocalId()) - .build(); - endPointMap.put(endpoint.key(), endpoint); - } - return endPointMap; - } @Override public ListenableFuture> getConnectivityServiceDetails( @@ -351,6 +329,50 @@ public class TapiConnectivityImpl implements TapiConnectivityService { new ConnectionEndPointBuilder(cep).build()).build()).buildFuture(); } + public ImmutableClassToInstanceMap> registerRPCs() { + return ImmutableClassToInstanceMap.>builder() + .put(CreateConnectivityService.class, this::createConnectivityService) + .put(GetConnectivityServiceDetails.class, this::getConnectivityServiceDetails) + .put(UpdateConnectivityService.class, this::updateConnectivityService) + .put(GetConnectionDetails.class, this::getConnectionDetails) + .put(DeleteConnectivityService.class, this::deleteConnectivityService) + .put(GetConnectivityServiceList.class, this::getConnectivityServiceList) + .put(GetConnectionEndPointDetails.class, this::getConnectionEndPointDetails) + .build(); + } + + private Map createEndPoints( + Map endPoints) { + Map endPointMap = new HashMap<>(); + for (org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210 + .create.connectivity.service.input.EndPoint ep: endPoints.values()) { + EndPoint endpoint = new EndPointBuilder() + .setServiceInterfacePoint(new ServiceInterfacePointBuilder() + .setServiceInterfacePointUuid(ep.getServiceInterfacePoint().getServiceInterfacePointUuid()) + .build()) + .setName(ep.getName()) + .setAdministrativeState(ep.getAdministrativeState()) + .setDirection(ep.getDirection()) + .setLifecycleState(ep.getLifecycleState()) + .setOperationalState(ep.getOperationalState()) + .setLayerProtocolName(ep.getLayerProtocolName()) + // TODO: implement bandwidth profile + .setCapacity(new CapacityBuilder() + .setTotalSize(new TotalSizeBuilder().build()) + .setBandwidthProfile(new BandwidthProfileBuilder().build()) + .build()) + .setProtectionRole(ep.getProtectionRole()) + .setRole(ep.getRole()) + .setLocalId(ep.getLocalId()) + .build(); + endPointMap.put(endpoint.key(), endpoint); + } + return endPointMap; + } + private Uuid getUuidFromIput(String serviceIdOrName) { try { UUID.fromString(serviceIdOrName); diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiProvider.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiProvider.java index 065a84096..880ef0383 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiProvider.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiProvider.java @@ -47,14 +47,10 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.NetworkKey; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.TapiCommonService; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.TapiConnectivityService; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.notification.rev181210.TapiNotificationListener; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.TapiTopologyService; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.tapi.rev180928.ServiceInterfacePoints; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.concepts.ObjectRegistration; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.osgi.service.component.annotations.Activate; @@ -86,12 +82,12 @@ public class TapiProvider { private final NetworkTransactionService networkTransactionService; private final OrgOpenroadmServiceService serviceHandler; private final ServiceDataStoreOperations serviceDataStoreOperations; - private ObjectRegistration rpcRegistration; private List listeners; private ListenerRegistration pcelistenerRegistration; private ListenerRegistration rendererlistenerRegistration; private ListenerRegistration servicehandlerlistenerRegistration; private ListenerRegistration tapinetworkmodellistenerRegistration; + private List rpcRegistrations = new ArrayList<>(); @Activate public TapiProvider(@Reference DataBroker dataBroker, @@ -122,13 +118,11 @@ public class TapiProvider { TapiRendererListenerImpl rendererListenerImpl = new TapiRendererListenerImpl(dataBroker, notificationPublishService); - TapiConnectivityImpl tapi = new TapiConnectivityImpl(this.serviceHandler, tapiContext, connectivityUtils, - pceListenerImpl, rendererListenerImpl); + TapiConnectivityImpl tapiConnectivity = new TapiConnectivityImpl(this.serviceHandler, tapiContext, + connectivityUtils, pceListenerImpl, rendererListenerImpl); + rpcRegistrations.add(rpcProviderService.registerRpcImplementations(tapiConnectivity.registerRPCs())); TapiTopologyImpl topo = new TapiTopologyImpl(this.dataBroker, tapiContext, topologyUtils, tapiLink); - - rpcRegistration = rpcProviderService.registerRpcImplementation(TapiConnectivityService.class, tapi); - rpcProviderService.registerRpcImplementation(TapiTopologyService.class, topo); - rpcProviderService.registerRpcImplementation(TapiCommonService.class, topo); + rpcRegistrations.add(rpcProviderService.registerRpcImplementations(topo.registerRPCs())); this.listeners = new ArrayList<>(); TapiNetconfTopologyListener topologyListener = new TapiNetconfTopologyListener(tapiNetworkModelServiceImpl); @@ -168,8 +162,15 @@ public class TapiProvider { pcelistenerRegistration.close(); rendererlistenerRegistration.close(); servicehandlerlistenerRegistration.close(); - rpcRegistration.close(); tapinetworkmodellistenerRegistration.close(); + for (Registration reg : rpcRegistrations) { + reg.close(); + } LOG.info("TapiProvider Session Closed"); } + + public List getRegisteredRpcs() { + return rpcRegistrations; + } + } diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java index 2bd1b333f..d895858d4 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java @@ -7,6 +7,7 @@ */ package org.opendaylight.transportpce.tapi.topology; +import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.ListenableFuture; import java.nio.charset.Charset; @@ -50,9 +51,11 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPoint; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.AdministrativeState; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.Context; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.GetServiceInterfacePointDetails; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.GetServiceInterfacePointDetailsInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.GetServiceInterfacePointDetailsOutput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.GetServiceInterfacePointDetailsOutputBuilder; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.GetServiceInterfacePointList; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.GetServiceInterfacePointListInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.GetServiceInterfacePointListOutput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.GetServiceInterfacePointListOutputBuilder; @@ -60,6 +63,7 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.Laye import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.LifecycleState; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.OperationalState; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.TapiCommonService; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.UpdateServiceInterfacePoint; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.UpdateServiceInterfacePointInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.UpdateServiceInterfacePointOutput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.Uuid; @@ -73,18 +77,23 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.tapi import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.tapi.context.ServiceInterfacePointKey; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.Context1; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.ForwardingRule; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetLinkDetails; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetLinkDetailsInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetLinkDetailsOutput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetLinkDetailsOutputBuilder; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetNodeDetails; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetNodeDetailsInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetNodeDetailsOutput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetNodeDetailsOutputBuilder; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetNodeEdgePointDetails; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetNodeEdgePointDetailsInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetNodeEdgePointDetailsOutput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetNodeEdgePointDetailsOutputBuilder; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyDetails; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyDetailsInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyDetailsOutput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyDetailsOutputBuilder; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyList; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyListInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyListOutput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyListOutputBuilder; @@ -108,6 +117,7 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.to import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.context.TopologyKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; +import org.opendaylight.yangtools.yang.binding.Rpc; import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; @@ -130,6 +140,19 @@ public class TapiTopologyImpl implements TapiTopologyService, TapiCommonService this.tapiLink = tapiLink; } + public ImmutableClassToInstanceMap> registerRPCs() { + return ImmutableClassToInstanceMap.>builder() + .put(GetNodeDetails.class, this::getNodeDetails) + .put(GetTopologyDetails.class, this::getTopologyDetails) + .put(GetNodeEdgePointDetails.class, this::getNodeEdgePointDetails) + .put(GetLinkDetails.class, this::getLinkDetails) + .put(GetTopologyList.class, this::getTopologyList) + .put(GetServiceInterfacePointDetails.class, this::getServiceInterfacePointDetails) + .put(GetServiceInterfacePointList.class, this::getServiceInterfacePointList) + .put(UpdateServiceInterfacePoint.class, this::updateServiceInterfacePoint) + .build(); + } + @Override public ListenableFuture> getNodeDetails(GetNodeDetailsInput input) { // TODO Auto-generated method stub @@ -145,10 +168,13 @@ public class TapiTopologyImpl implements TapiTopologyService, TapiCommonService .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.rev181210.get.node.details.output.NodeBuilder(node).build()) - .build()).buildFuture(); + return RpcResultBuilder + .success(new GetNodeDetailsOutputBuilder() + .setNode(new org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210 + .get.node.details.output.NodeBuilder(node) + .build()) + .build()) + .buildFuture(); } @Override @@ -171,7 +197,8 @@ public class TapiTopologyImpl implements TapiTopologyService, TapiCommonService } org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.context.Topology topology = topologyMap.get(new TopologyKey(topoUuid)); - return RpcResultBuilder.success(new GetTopologyDetailsOutputBuilder() + return RpcResultBuilder + .success(new GetTopologyDetailsOutputBuilder() .setTopology(this.topologyUtils.transformTopology(topology)) .build()) .buildFuture(); @@ -197,6 +224,129 @@ public class TapiTopologyImpl implements TapiTopologyService, TapiCommonService } } + @Override + public ListenableFuture> getNodeEdgePointDetails( + GetNodeEdgePointDetailsInput input) { + // TODO Auto-generated method stub + // TODO -> maybe we get errors when having CEPs? + Uuid topoUuid = getUuidFromIput(input.getTopologyIdOrName()); + // Node id: if roadm -> ROADMid+PHOTONIC_MEDIA. if xpdr -> XPDRid-XPDRnbr+DSR/OTSi + Uuid nodeUuid = getUuidFromIput(input.getNodeIdOrName()); + // NEP id: if roadm -> ROADMid+PHOTONIC_MEDIA/MC/OTSiMC+TPid. + // if xpdr -> XPDRid-XPDRnbr+DSR/eODU/iODU/iOTSi/eOTSi/PHOTONIC_MEDIA+TPid + Uuid nepUuid = getUuidFromIput(input.getEpIdOrName()); + OwnedNodeEdgePoint nep = this.tapiContext.getTapiNEP(topoUuid, nodeUuid, nepUuid); + if (nep == null) { + LOG.error("Invalid TAPI nep name"); + return RpcResultBuilder.failed() + .withError(ErrorType.RPC, "Invalid NEP name") + .buildFuture(); + } + return RpcResultBuilder + .success(new GetNodeEdgePointDetailsOutputBuilder() + .setNodeEdgePoint(new NodeEdgePointBuilder(nep).build()) + .build()) + .buildFuture(); + } + + @Override + public ListenableFuture> getLinkDetails(GetLinkDetailsInput input) { + // TODO Auto-generated method stub + Uuid topoUuid = getUuidFromIput(input.getTopologyIdOrName()); + // Link id: same as OR link id + Uuid linkUuid = getUuidFromIput(input.getLinkIdOrName()); + org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Link link = + this.tapiContext.getTapiLink(topoUuid, linkUuid); + if (link == null) { + LOG.error("Invalid TAPI link name"); + return RpcResultBuilder.failed() + .withError(ErrorType.RPC, "Invalid Link name") + .buildFuture(); + } + return RpcResultBuilder + .success(new GetLinkDetailsOutputBuilder().setLink(new LinkBuilder(link).build()).build()) + .buildFuture(); + } + + @Override + public ListenableFuture> getTopologyList(GetTopologyListInput input) { + // TODO Auto-generated method stub + // TODO -> maybe we get errors when having CEPs? + Map + topologyMap = this.tapiContext.getTopologyContext(); + if (topologyMap.isEmpty()) { + LOG.error("No topologies exist in tapi context"); + return RpcResultBuilder.failed() + .withError(ErrorType.APPLICATION, "No topologies exist in tapi context") + .buildFuture(); + } + Map + newTopoMap = new HashMap<>(); + for (org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.context.Topology + topo:topologyMap.values()) { + org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.get.topology.list.output.Topology + newTopo = new org.opendaylight.yang.gen.v1.urn + .onf.otcc.yang.tapi.topology.rev181210.get.topology.list.output.TopologyBuilder(topo).build(); + newTopoMap.put(newTopo.key(), newTopo); + } + return RpcResultBuilder + .success(new GetTopologyListOutputBuilder().setTopology(newTopoMap).build()) + .buildFuture(); + } + + @Override + public ListenableFuture> + getServiceInterfacePointDetails(GetServiceInterfacePointDetailsInput input) { + Uuid sipUuid = getUuidFromIput(input.getSipIdOrName()); + Map sips = + this.tapiContext.getTapiContext().getServiceInterfacePoint(); + if (sips == null || sips.isEmpty()) { + return RpcResultBuilder.failed() + .withError(ErrorType.RPC, "No sips in datastore") + .buildFuture(); + } + if (!sips.containsKey(new ServiceInterfacePointKey(sipUuid))) { + 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.rev181210 + .get.service._interface.point.details.output.SipBuilder(sips.get(new ServiceInterfacePointKey(sipUuid))) + .build(); + return RpcResultBuilder + .success(new GetServiceInterfacePointDetailsOutputBuilder().setSip(outSip).build()) + .buildFuture(); + } + + @Override + public ListenableFuture> + getServiceInterfacePointList(GetServiceInterfacePointListInput input) { + Map sips = + this.tapiContext.getTapiContext().getServiceInterfacePoint(); + if (sips == null || sips.isEmpty()) { + return RpcResultBuilder.failed() + .withError(ErrorType.RPC, "No sips in datastore") + .buildFuture(); + } + Map outSipMap = new HashMap<>(); + for (ServiceInterfacePoint sip : sips.values()) { + Sip si = new SipBuilder(sip).build(); + outSipMap.put(si.key(), si); + } + return RpcResultBuilder + .success(new GetServiceInterfacePointListOutputBuilder().setSip(outSipMap).build()) + .buildFuture(); + } + + @Override + public ListenableFuture> + updateServiceInterfacePoint(UpdateServiceInterfacePointInput input) { + // TODO --> not yet implemented + return null; + } + private Topology createAbstracted100GTpdrTopology(Topology topology) { List dsrNodes = topology.nonnullNode().values().stream() @@ -320,95 +470,28 @@ public class TapiTopologyImpl implements TapiTopologyService, TapiCommonService .setLink(tapiLinkList).build(); } - @Override - public ListenableFuture> getNodeEdgePointDetails( - GetNodeEdgePointDetailsInput input) { - // TODO Auto-generated method stub - // TODO -> maybe we get errors when having CEPs? - Uuid topoUuid = getUuidFromIput(input.getTopologyIdOrName()); - // Node id: if roadm -> ROADMid+PHOTONIC_MEDIA. if xpdr -> XPDRid-XPDRnbr+DSR/OTSi - Uuid nodeUuid = getUuidFromIput(input.getNodeIdOrName()); - // NEP id: if roadm -> ROADMid+PHOTONIC_MEDIA/MC/OTSiMC+TPid. - // if xpdr -> XPDRid-XPDRnbr+DSR/eODU/iODU/iOTSi/eOTSi/PHOTONIC_MEDIA+TPid - Uuid nepUuid = getUuidFromIput(input.getEpIdOrName()); - OwnedNodeEdgePoint nep = this.tapiContext.getTapiNEP(topoUuid, nodeUuid, nepUuid); - if (nep == null) { - LOG.error("Invalid TAPI nep name"); - return RpcResultBuilder.failed() - .withError(ErrorType.RPC, "Invalid NEP name") - .buildFuture(); - } - return RpcResultBuilder.success(new GetNodeEdgePointDetailsOutputBuilder() - .setNodeEdgePoint(new NodeEdgePointBuilder(nep).build()).build()).buildFuture(); - } - - @Override - public ListenableFuture> getLinkDetails(GetLinkDetailsInput input) { - // TODO Auto-generated method stub - Uuid topoUuid = getUuidFromIput(input.getTopologyIdOrName()); - // Link id: same as OR link id - Uuid linkUuid = getUuidFromIput(input.getLinkIdOrName()); - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Link link = this.tapiContext - .getTapiLink(topoUuid, linkUuid); - if (link == null) { - LOG.error("Invalid TAPI link name"); - return RpcResultBuilder.failed() - .withError(ErrorType.RPC, "Invalid Link name") - .buildFuture(); - } - return RpcResultBuilder.success(new GetLinkDetailsOutputBuilder().setLink(new LinkBuilder(link).build()) - .build()).buildFuture(); - } - - @Override - public ListenableFuture> getTopologyList(GetTopologyListInput input) { - // TODO Auto-generated method stub - // TODO -> maybe we get errors when having CEPs? - Map - topologyMap = this.tapiContext.getTopologyContext(); - if (topologyMap.isEmpty()) { - LOG.error("No topologies exist in tapi context"); - return RpcResultBuilder.failed() - .withError(ErrorType.APPLICATION, "No topologies exist in tapi context") - .buildFuture(); - } - Map - newTopoMap = new HashMap<>(); - for (org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.context.Topology - topo:topologyMap.values()) { - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.get.topology.list.output.Topology - newTopo = new org.opendaylight.yang.gen.v1.urn - .onf.otcc.yang.tapi.topology.rev181210.get.topology.list.output.TopologyBuilder(topo).build(); - newTopoMap.put(newTopo.key(), newTopo); - } - return RpcResultBuilder.success(new GetTopologyListOutputBuilder().setTopology(newTopoMap).build()) - .buildFuture(); - } - private org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node createTapiNode(List nepList, Uuid topoUuid) { Name name = new NameBuilder().setValueName("Tpdr100g node name").setValue("Tpdr100g over WDM node").build(); Map onepMap = new HashMap<>(); - for (OwnedNodeEdgePoint ownedNodeEdgePoint: nepList) { + for (OwnedNodeEdgePoint ownedNodeEdgePoint : nepList) { onepMap.put(ownedNodeEdgePoint.key(), ownedNodeEdgePoint); } Uuid nodeUuid = new Uuid(UUID.nameUUIDFromBytes(name.getValue().getBytes(Charset.forName("UTF-8"))).toString()); return new NodeBuilder() - .setUuid(nodeUuid) - .setName(Map.of(name.key(), name)) - .setLayerProtocolName(Set.of(LayerProtocolName.ETH)) - .setAdministrativeState(AdministrativeState.UNLOCKED) - .setOperationalState(OperationalState.ENABLED) - .setLifecycleState(LifecycleState.INSTALLED) - .setOwnedNodeEdgePoint(onepMap) - .setNodeRuleGroup(createNodeRuleGroupFor100gTpdrNode(topoUuid, nodeUuid, nepList)) - .build(); + .setUuid(nodeUuid) + .setName(Map.of(name.key(), name)) + .setLayerProtocolName(Set.of(LayerProtocolName.ETH)) + .setAdministrativeState(AdministrativeState.UNLOCKED) + .setOperationalState(OperationalState.ENABLED) + .setLifecycleState(LifecycleState.INSTALLED) + .setOwnedNodeEdgePoint(onepMap) + .setNodeRuleGroup(createNodeRuleGroupFor100gTpdrNode(topoUuid, nodeUuid, nepList)) + .build(); } private boolean checkTp(String nodeIdTopo, String nodeIdPortMap, TerminationPoint tp, List xpdOut, - List xpdIn) { + List xpdIn) { String networkLcp; if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERCLIENT)) { networkLcp = tp.augmentation( @@ -469,20 +552,21 @@ public class TapiTopologyImpl implements TapiTopologyService, TapiCommonService } } - private Map createNodeRuleGroupFor100gTpdrNode( - Uuid topoUuid, Uuid nodeUuid, Collection onepl) { + private Map createNodeRuleGroupFor100gTpdrNode(Uuid topoUuid, Uuid nodeUuid, + Collection onepl) { - Map - nepMap = new HashMap<>(); - for (OwnedNodeEdgePoint onep: onepl) { + Map< + org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.NodeEdgePointKey, + org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.NodeEdgePoint> nepMap + = new HashMap<>(); + for (OwnedNodeEdgePoint onep : onepl) { org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.NodeEdgePoint nep = - new org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group - .NodeEdgePointBuilder() - .setTopologyUuid(topoUuid) - .setNodeUuid(nodeUuid) - .setNodeEdgePointUuid(onep.key().getUuid()) - .build(); + new org.opendaylight.yang.gen.v1.urn + .onf.otcc.yang.tapi.topology.rev181210.node.rule.group.NodeEdgePointBuilder() + .setTopologyUuid(topoUuid) + .setNodeUuid(nodeUuid) + .setNodeEdgePointUuid(onep.key().getUuid()) + .build(); nepMap.put(nep.key(), nep); } Map nodeRuleGroupMap = new HashMap<>(); @@ -503,58 +587,6 @@ public class TapiTopologyImpl implements TapiTopologyService, TapiCommonService return nodeRuleGroupMap; } - @Override - public ListenableFuture> - getServiceInterfacePointDetails(GetServiceInterfacePointDetailsInput input) { - Uuid sipUuid = getUuidFromIput(input.getSipIdOrName()); - Map sips = - this.tapiContext.getTapiContext().getServiceInterfacePoint(); - if (sips == null || sips.isEmpty()) { - return RpcResultBuilder.failed() - .withError(ErrorType.RPC, "No sips in datastore") - .buildFuture(); - } - if (!sips.containsKey(new ServiceInterfacePointKey(sipUuid))) { - return RpcResultBuilder.failed() - .withError(ErrorType.RPC, "Sip doesnt exist in datastore") - .buildFuture(); - } - org.opendaylight.yang.gen.v1.urn - .onf.otcc.yang.tapi.common.rev181210.get.service._interface.point.details.output.Sip outSip = - new org.opendaylight.yang.gen.v1.urn - .onf.otcc.yang.tapi.common.rev181210.get.service._interface.point.details.output.SipBuilder( - sips.get(new ServiceInterfacePointKey(sipUuid))) - .build(); - return RpcResultBuilder.success(new GetServiceInterfacePointDetailsOutputBuilder().setSip(outSip).build()) - .buildFuture(); - } - - @Override - public ListenableFuture> - getServiceInterfacePointList(GetServiceInterfacePointListInput input) { - Map sips = - this.tapiContext.getTapiContext().getServiceInterfacePoint(); - if (sips == null || sips.isEmpty()) { - return RpcResultBuilder.failed() - .withError(ErrorType.RPC, "No sips in datastore") - .buildFuture(); - } - Map outSipMap = new HashMap<>(); - for (ServiceInterfacePoint sip : sips.values()) { - Sip si = new SipBuilder(sip).build(); - outSipMap.put(si.key(), si); - } - return RpcResultBuilder.success(new GetServiceInterfacePointListOutputBuilder().setSip(outSipMap).build()) - .buildFuture(); - } - - @Override - public ListenableFuture> - updateServiceInterfacePoint(UpdateServiceInterfacePointInput input) { - // TODO --> not yet implemented - return null; - } - private Uuid getUuidFromIput(String serviceIdOrName) { try { UUID.fromString(serviceIdOrName); diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java index ce03c9c46..8efd04410 100644 --- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java +++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java @@ -29,10 +29,7 @@ import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOper import org.opendaylight.transportpce.tapi.impl.TapiProvider; import org.opendaylight.transportpce.tapi.topology.TapiNetworkModelService; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.OrgOpenroadmServiceService; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.TapiCommonService; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.TapiConnectivityService; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.notification.rev181210.TapiNotificationListener; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.TapiTopologyService; @ExtendWith(MockitoExtension.class) public class TapiProviderTest { @@ -64,9 +61,7 @@ public class TapiProviderTest { networkTransactionService, serviceHandler, serviceDataStoreOperations, tapiNetworkModelListenerImpl, tapiNetworkModelServiceImpl); - verify(rpcProviderRegistry, times(1)).registerRpcImplementation(any(), any(TapiConnectivityService.class)); - verify(rpcProviderRegistry, times(2)).registerRpcImplementation(any(), any(TapiTopologyService.class)); - verify(rpcProviderRegistry, times(2)).registerRpcImplementation(any(), any(TapiCommonService.class)); + verify(rpcProviderRegistry, times(2)).registerRpcImplementations(any()); verify(dataBroker, times(4)).registerDataTreeChangeListener(any(), any()); } } \ No newline at end of file