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=fe13e5906649b602c7dd32c8d64412fa7e1614d3;hb=db87ba733190c2e59997e00e0fe9199c9c74234d;hp=68c9f023699fce3c319a24dc0f03d475d3af1dec;hpb=e4106d346bc8313726b154af4d30e3cc875b4706;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 68c9f0236..fe13e5906 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 @@ -7,27 +7,52 @@ */ package org.opendaylight.transportpce.tapi.impl; +import java.util.ArrayList; import java.util.HashMap; -import org.eclipse.jdt.annotation.NonNull; +import java.util.List; import org.opendaylight.mdsal.binding.api.DataBroker; 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.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.listeners.TapiNetworkModelNotificationHandler; +import org.opendaylight.transportpce.tapi.listeners.TapiPceNotificationHandler; +import org.opendaylight.transportpce.tapi.listeners.TapiRendererNotificationHandler; +import org.opendaylight.transportpce.tapi.listeners.TapiServiceNotificationHandler; +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.openroadm.service.rev190531.OrgOpenroadmServiceService; -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.topology.rev181210.TapiTopologyService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.tapi.rev180928.ServiceInterfacePoints; -import org.opendaylight.yangtools.concepts.ObjectRegistration; +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.openroadm.service.rev230526.OrgOpenroadmServiceService; +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.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.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.osgi.service.component.annotations.Activate; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Deactivate; +import org.osgi.service.component.annotations.Reference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,60 +62,112 @@ import org.slf4j.LoggerFactory; * @author Gilles Thouenon (gilles.thouenon@orange.com) on behalf of Orange * */ +@Component public class TapiProvider { private static final Logger LOG = LoggerFactory.getLogger(TapiProvider.class); + 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); + 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 RpcProviderService rpcProviderService; - private ObjectRegistration rpcRegistration; + private final NetworkTransactionService networkTransactionService; private final OrgOpenroadmServiceService serviceHandler; private final ServiceDataStoreOperations serviceDataStoreOperations; - private final TapiListener tapiListener; - private final NetworkTransactionService networkTransactionService; + private List listeners; + private List rpcRegistrations = new ArrayList<>(); + private Registration pcelistenerRegistration; + private Registration rendererlistenerRegistration; + private Registration servicehandlerlistenerRegistration; + private Registration tapinetworkmodellistenerRegistration; - public TapiProvider(DataBroker dataBroker, RpcProviderService rpcProviderService, - OrgOpenroadmServiceService serviceHandler, ServiceDataStoreOperations serviceDataStoreOperations, - TapiListener tapiListener, NetworkTransactionService networkTransactionService) { + @Activate + public TapiProvider(@Reference DataBroker dataBroker, + @Reference RpcProviderService rpcProviderService, + @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.rpcProviderService = rpcProviderService; + this.networkTransactionService = networkTransactionService; this.serviceHandler = serviceHandler; this.serviceDataStoreOperations = serviceDataStoreOperations; - this.tapiListener = tapiListener; - this.networkTransactionService = networkTransactionService; - } - - /** - * Method called when the blueprint container is created. - */ - public void init() { LOG.info("TapiProvider Session Initiated"); TapiContext tapiContext = new TapiContext(this.networkTransactionService); LOG.info("Empty TAPI context created: {}", tapiContext.getTapiContext()); - - TopologyUtils topologyUtils = new TopologyUtils(this.networkTransactionService, this.dataBroker); + TapiLink tapiLink = new TapiLinkImpl(this.networkTransactionService); + TopologyUtils topologyUtils = new TopologyUtils(this.networkTransactionService, this.dataBroker, tapiLink); ConnectivityUtils connectivityUtils = new ConnectivityUtils(this.serviceDataStoreOperations, new HashMap<>(), - tapiContext); + tapiContext, this.networkTransactionService); TapiInitialORMapping tapiInitialORMapping = new TapiInitialORMapping(topologyUtils, connectivityUtils, tapiContext, this.serviceDataStoreOperations); tapiInitialORMapping.performTopoInitialMapping(); tapiInitialORMapping.performServInitialMapping(); + TapiPceNotificationHandler pceListenerImpl = new TapiPceNotificationHandler(dataBroker); + TapiRendererNotificationHandler rendererListenerImpl = new TapiRendererNotificationHandler(dataBroker, + notificationPublishService); + + TapiConnectivityImpl tapiConnectivity = new TapiConnectivityImpl(this.serviceHandler, tapiContext, + connectivityUtils, pceListenerImpl, rendererListenerImpl, networkTransactionService); + rpcRegistrations.add(rpcProviderService.registerRpcImplementations(tapiConnectivity.registerRPCs())); + TapiTopologyImpl topo = new TapiTopologyImpl(this.dataBroker, tapiContext, topologyUtils, tapiLink); + rpcRegistrations.add(rpcProviderService.registerRpcImplementations(topo.registerRPCs())); - TapiConnectivityImpl tapi = new TapiConnectivityImpl(this.serviceHandler); - TapiTopologyImpl topo = new TapiTopologyImpl(this.dataBroker, tapiContext, topologyUtils); - rpcRegistration = rpcProviderService.registerRpcImplementation(TapiConnectivityService.class, tapi); - rpcProviderService.registerRpcImplementation(TapiTopologyService.class, topo); - @NonNull - InstanceIdentifier sipIID = InstanceIdentifier.create(ServiceInterfacePoints.class); - dataBroker.registerDataTreeChangeListener(DataTreeIdentifier.create( - LogicalDatastoreType.CONFIGURATION, sipIID), tapiListener); + 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 + .child(Node.class)), + topologyListener)); + listeners.add(dataBroker.registerDataTreeChangeListener( + DataTreeIdentifier.create(LogicalDatastoreType.CONFIGURATION, MAPPING_II), tapiPortMappingListener)); + TapiListener tapiListener = new TapiListener(); + listeners.add(dataBroker.registerDataTreeChangeListener( + DataTreeIdentifier.create( + LogicalDatastoreType.CONFIGURATION, + InstanceIdentifier.create(ServiceInterfacePoints.class)), + tapiListener)); + // Notification Listener + pcelistenerRegistration = notificationService.registerCompositeListener(pceListenerImpl.getCompositeListener()); + rendererlistenerRegistration = notificationService + .registerCompositeListener(rendererListenerImpl.getCompositeListener()); + TapiServiceNotificationHandler serviceHandlerListenerImpl = new TapiServiceNotificationHandler(dataBroker); + servicehandlerlistenerRegistration = notificationService + .registerCompositeListener(serviceHandlerListenerImpl.getCompositeListener()); + tapinetworkmodellistenerRegistration = notificationService + .registerCompositeListener(tapiNetworkModelNotificationHandler.getCompositeListener()); } /** * Method called when the blueprint container is destroyed. */ + @Deactivate public void close() { + listeners.forEach(lis -> lis.close()); + listeners.clear(); + pcelistenerRegistration.close(); + rendererlistenerRegistration.close(); + servicehandlerlistenerRegistration.close(); + tapinetworkmodellistenerRegistration.close(); + for (Registration reg : rpcRegistrations) { + reg.close(); + } LOG.info("TapiProvider Session Closed"); - rpcRegistration.close(); } + + public List getRegisteredRpcs() { + return rpcRegistrations; + } + }