X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tapi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Ftapi%2Fimpl%2FTapiProvider.java;h=f5cb9dd76c2efdc07011114fa9ab90c3d83f30fb;hb=HEAD;hp=657b9c200a4c2f8fe4912b354f586601ef41c36d;hpb=46b020d25342f0ca86d83f6a503d7565f67f829e;p=transportpce.git 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 657b9c200..f5cb9dd76 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 @@ -15,13 +15,25 @@ import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.mdsal.binding.api.NotificationService; import org.opendaylight.mdsal.binding.api.RpcProviderService; +import org.opendaylight.mdsal.binding.api.RpcService; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.InstanceIdentifiers; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.common.network.NetworkTransactionService; import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations; import org.opendaylight.transportpce.tapi.connectivity.ConnectivityUtils; -import org.opendaylight.transportpce.tapi.connectivity.TapiConnectivityImpl; +import org.opendaylight.transportpce.tapi.impl.rpc.CreateConnectivityServiceImpl; +import org.opendaylight.transportpce.tapi.impl.rpc.DeleteConnectivityServiceImpl; +import org.opendaylight.transportpce.tapi.impl.rpc.GetConnectionDetailsImpl; +import org.opendaylight.transportpce.tapi.impl.rpc.GetConnectivityServiceDetailsImpl; +import org.opendaylight.transportpce.tapi.impl.rpc.GetConnectivityServiceListImpl; +import org.opendaylight.transportpce.tapi.impl.rpc.GetLinkDetailsImpl; +import org.opendaylight.transportpce.tapi.impl.rpc.GetNodeDetailsImpl; +import org.opendaylight.transportpce.tapi.impl.rpc.GetNodeEdgePointDetailsImpl; +import org.opendaylight.transportpce.tapi.impl.rpc.GetServiceInterfacePointDetailsImpl; +import org.opendaylight.transportpce.tapi.impl.rpc.GetServiceInterfacePointListImpl; +import org.opendaylight.transportpce.tapi.impl.rpc.GetTopologyDetailsImpl; +import org.opendaylight.transportpce.tapi.impl.rpc.GetTopologyListImpl; import org.opendaylight.transportpce.tapi.listeners.TapiNetworkModelNotificationHandler; import org.opendaylight.transportpce.tapi.listeners.TapiPceNotificationHandler; import org.opendaylight.transportpce.tapi.listeners.TapiRendererNotificationHandler; @@ -30,25 +42,21 @@ import org.opendaylight.transportpce.tapi.topology.TapiNetconfTopologyListener; import org.opendaylight.transportpce.tapi.topology.TapiNetworkModelService; import org.opendaylight.transportpce.tapi.topology.TapiOrLinkListener; import org.opendaylight.transportpce.tapi.topology.TapiPortMappingListener; -import org.opendaylight.transportpce.tapi.topology.TapiTopologyImpl; import org.opendaylight.transportpce.tapi.topology.TopologyUtils; import org.opendaylight.transportpce.tapi.utils.TapiContext; import org.opendaylight.transportpce.tapi.utils.TapiInitialORMapping; import org.opendaylight.transportpce.tapi.utils.TapiLink; import org.opendaylight.transportpce.tapi.utils.TapiLinkImpl; import org.opendaylight.transportpce.tapi.utils.TapiListener; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.tapinetworkutils.rev210408.TransportpceTapinetworkutilsService; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.OrgOpenroadmServiceService; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev231221.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev231221.network.Nodes; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.Networks; 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.opendaylight.params.xml.ns.yang.tapi.rev180928.ServiceInterfacePoints; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.tapi.rev230728.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.ObjectRegistration; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.osgi.service.component.annotations.Activate; @@ -71,18 +79,16 @@ public class TapiProvider { private static final InstanceIdentifier MAPPING_II = InstanceIdentifier.create(Network.class) .child(org.opendaylight.yang.gen.v1.http - .org.opendaylight.transportpce.portmapping.rev220922.network.Nodes.class); + .org.opendaylight.transportpce.portmapping.rev231221.network.Nodes.class); private static final InstanceIdentifier LINK_II = InstanceIdentifier.create(Networks.class).child( org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))).augmentation(Network1.class) .child(Link.class); private final DataBroker dataBroker; private final NetworkTransactionService networkTransactionService; - private final OrgOpenroadmServiceService serviceHandler; private final ServiceDataStoreOperations serviceDataStoreOperations; - private ObjectRegistration tapiNetworkutilsServiceRpcRegistration; private List listeners; - private List rpcRegistrations = new ArrayList<>(); + private Registration rpcRegistration; private Registration pcelistenerRegistration; private Registration rendererlistenerRegistration; private Registration servicehandlerlistenerRegistration; @@ -91,16 +97,15 @@ public class TapiProvider { @Activate public TapiProvider(@Reference DataBroker dataBroker, @Reference RpcProviderService rpcProviderService, + @Reference RpcService rpcService, @Reference NotificationService notificationService, @Reference NotificationPublishService notificationPublishService, @Reference NetworkTransactionService networkTransactionService, - @Reference OrgOpenroadmServiceService serviceHandler, @Reference ServiceDataStoreOperations serviceDataStoreOperations, @Reference TapiNetworkModelNotificationHandler tapiNetworkModelNotificationHandler, @Reference TapiNetworkModelService tapiNetworkModelServiceImpl) { this.dataBroker = dataBroker; this.networkTransactionService = networkTransactionService; - this.serviceHandler = serviceHandler; this.serviceDataStoreOperations = serviceDataStoreOperations; LOG.info("TapiProvider Session Initiated"); TapiContext tapiContext = new TapiContext(this.networkTransactionService); @@ -113,31 +118,40 @@ public class TapiProvider { tapiContext, this.serviceDataStoreOperations); tapiInitialORMapping.performTopoInitialMapping(); tapiInitialORMapping.performServInitialMapping(); - TapiPceNotificationHandler pceListenerImpl = new TapiPceNotificationHandler(dataBroker); + TapiPceNotificationHandler pceListenerImpl = new TapiPceNotificationHandler(dataBroker, connectivityUtils); TapiRendererNotificationHandler rendererListenerImpl = new TapiRendererNotificationHandler(dataBroker, notificationPublishService); - 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); - rpcRegistrations.add(rpcProviderService.registerRpcImplementations(topo.registerRPCs())); + rpcRegistration = rpcProviderService.registerRpcImplementations( + new CreateConnectivityServiceImpl(rpcService, tapiContext, connectivityUtils, pceListenerImpl, + rendererListenerImpl), + new GetConnectivityServiceDetailsImpl(tapiContext), + new GetConnectionDetailsImpl(tapiContext), + new DeleteConnectivityServiceImpl(rpcService, tapiContext, networkTransactionService), + new GetConnectivityServiceListImpl(tapiContext), + new GetNodeDetailsImpl(tapiContext), + new GetTopologyDetailsImpl(tapiContext, topologyUtils, tapiLink, networkTransactionService), + new GetNodeEdgePointDetailsImpl(tapiContext), + new GetLinkDetailsImpl(tapiContext), + new GetTopologyListImpl(tapiContext), + new GetServiceInterfacePointDetailsImpl(tapiContext), + new GetServiceInterfacePointListImpl(tapiContext)); this.listeners = new ArrayList<>(); TapiNetconfTopologyListener topologyListener = new TapiNetconfTopologyListener(tapiNetworkModelServiceImpl); TapiOrLinkListener orLinkListener = new TapiOrLinkListener(tapiLink, networkTransactionService); TapiPortMappingListener tapiPortMappingListener = new TapiPortMappingListener(tapiNetworkModelServiceImpl); - listeners.add(dataBroker.registerDataTreeChangeListener( - DataTreeIdentifier.create(LogicalDatastoreType.CONFIGURATION, LINK_II), orLinkListener)); - listeners.add(dataBroker.registerDataTreeChangeListener( - DataTreeIdentifier.create(LogicalDatastoreType.OPERATIONAL, InstanceIdentifiers.NETCONF_TOPOLOGY_II + listeners.add(dataBroker.registerTreeChangeListener( + DataTreeIdentifier.of(LogicalDatastoreType.CONFIGURATION, LINK_II), orLinkListener)); + listeners.add(dataBroker.registerTreeChangeListener( + DataTreeIdentifier.of(LogicalDatastoreType.OPERATIONAL, InstanceIdentifiers.NETCONF_TOPOLOGY_II .child(Node.class)), topologyListener)); - listeners.add(dataBroker.registerDataTreeChangeListener( - DataTreeIdentifier.create(LogicalDatastoreType.CONFIGURATION, MAPPING_II), tapiPortMappingListener)); + listeners.add(dataBroker.registerTreeChangeListener( + DataTreeIdentifier.of(LogicalDatastoreType.CONFIGURATION, MAPPING_II), tapiPortMappingListener)); TapiListener tapiListener = new TapiListener(); - listeners.add(dataBroker.registerDataTreeChangeListener( - DataTreeIdentifier.create( + listeners.add(dataBroker.registerTreeChangeListener( + DataTreeIdentifier.of( LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(ServiceInterfacePoints.class)), tapiListener)); @@ -163,14 +177,12 @@ public class TapiProvider { rendererlistenerRegistration.close(); servicehandlerlistenerRegistration.close(); tapinetworkmodellistenerRegistration.close(); - for (Registration reg : rpcRegistrations) { - reg.close(); - } + rpcRegistration.close(); LOG.info("TapiProvider Session Closed"); } - public List getRegisteredRpcs() { - return rpcRegistrations; + public Registration getRegisteredRpcs() { + return rpcRegistration; } }