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=8ce95c33956f0c65f4ff2bc78227ad279a5a2726;hb=5e89fe2242ea395f6aee61b1f060c7b6183aeb27;hp=34c824810123359c18ec9af6e5592444e4ad8cc0;hpb=5e3f7dd89cb088ef4957f5559a82b8c6436afa17;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 34c824810..8ce95c339 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 @@ -8,9 +8,9 @@ package org.opendaylight.transportpce.tapi.impl; import java.util.HashMap; -import org.eclipse.jdt.annotation.NonNull; 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; @@ -24,6 +24,7 @@ import org.opendaylight.transportpce.tapi.listeners.TapiPceListenerImpl; import org.opendaylight.transportpce.tapi.listeners.TapiRendererListenerImpl; import org.opendaylight.transportpce.tapi.listeners.TapiServiceHandlerListenerImpl; 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; @@ -31,10 +32,11 @@ 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.pce.rev220118.TransportpcePceListener; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.TransportpcePceListener; +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.renderer.rev210915.TransportpceRendererListener; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.servicehandler.rev201125.TransportpceServicehandlerListener; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.tapinetworkutils.rev210408.TransportpceTapinetworkutilsService; @@ -46,12 +48,17 @@ 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.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.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; @@ -61,19 +68,26 @@ 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.rev220114.network.Nodes.class); + .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 final NotificationService notificationService; + private final NetworkTransactionService networkTransactionService; + private final OrgOpenroadmServiceService serviceHandler; + private final ServiceDataStoreOperations serviceDataStoreOperations; + private final TransportpceTapinetworkutilsService tapiNetworkUtils; + private TapiNotificationListener tapiNetworkModelListenerImpl; private ObjectRegistration rpcRegistration; private ObjectRegistration tapiNetworkutilsServiceRpcRegistration; private ListenerRegistration dataTreeChangeListenerRegistration; @@ -82,50 +96,32 @@ public class TapiProvider { private ListenerRegistration pcelistenerRegistration; private ListenerRegistration rendererlistenerRegistration; private ListenerRegistration servicehandlerlistenerRegistration; - private final OrgOpenroadmServiceService serviceHandler; - private final ServiceDataStoreOperations serviceDataStoreOperations; - private final TapiListener tapiListener; - private final TapiNetconfTopologyListener topologyListener; - private final TapiOrLinkListener orLinkListener; - private TapiPortMappingListener tapiPortMappingListener; - private final NetworkTransactionService networkTransactionService; - private final TransportpceTapinetworkutilsService tapiNetworkUtils; - private TapiPceListenerImpl pceListenerImpl; - private TapiRendererListenerImpl rendererListenerImpl; - private TapiServiceHandlerListenerImpl serviceHandlerListenerImpl; - private final NotificationService notificationService; + private ListenerRegistration tapinetworkmodellistenerRegistration; - public TapiProvider(DataBroker dataBroker, RpcProviderService rpcProviderService, - OrgOpenroadmServiceService serviceHandler, ServiceDataStoreOperations serviceDataStoreOperations, - TapiListener tapiListener, NetworkTransactionService networkTransactionService, - TapiNetconfTopologyListener topologyListener, TapiPortMappingListener tapiPortMappingListener, - TransportpceTapinetworkutilsService tapiNetworkUtils, TapiPceListenerImpl pceListenerImpl, - TapiRendererListenerImpl rendererListenerImpl, TapiServiceHandlerListenerImpl serviceHandlerListenerImpl, - NotificationService notificationService, TapiOrLinkListener orLinkListener) { + @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 TransportpceTapinetworkutilsService tapiNetworkUtils, + @Reference TapiNotificationListener tapiNetworkModelListenerImpl, + @Reference TapiNetworkModelService tapiNetworkModelServiceImpl) { this.dataBroker = dataBroker; this.rpcProviderService = rpcProviderService; + this.notificationService = notificationService; + this.networkTransactionService = networkTransactionService; this.serviceHandler = serviceHandler; this.serviceDataStoreOperations = serviceDataStoreOperations; - this.tapiListener = tapiListener; - this.networkTransactionService = networkTransactionService; - this.topologyListener = topologyListener; - this.tapiPortMappingListener = tapiPortMappingListener; this.tapiNetworkUtils = tapiNetworkUtils; - this.pceListenerImpl = pceListenerImpl; - this.rendererListenerImpl = rendererListenerImpl; - this.serviceHandlerListenerImpl = serviceHandlerListenerImpl; - this.notificationService = notificationService; - this.orLinkListener = orLinkListener; - } + this.tapiNetworkModelListenerImpl = tapiNetworkModelListenerImpl; - /** - * 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()); - TapiLink tapiLink = new TapiLink(this.networkTransactionService); + TapiLink tapiLink = new TapiLinkImpl(this.networkTransactionService); TopologyUtils topologyUtils = new TopologyUtils(this.networkTransactionService, this.dataBroker, tapiLink); ConnectivityUtils connectivityUtils = new ConnectivityUtils(this.serviceDataStoreOperations, new HashMap<>(), tapiContext, this.networkTransactionService); @@ -133,13 +129,21 @@ public class TapiProvider { tapiContext, this.serviceDataStoreOperations); tapiInitialORMapping.performTopoInitialMapping(); tapiInitialORMapping.performServInitialMapping(); + TapiPceListenerImpl pceListenerImpl = new TapiPceListenerImpl(dataBroker); + TapiRendererListenerImpl rendererListenerImpl = new TapiRendererListenerImpl(dataBroker, + notificationPublishService); TapiConnectivityImpl tapi = new TapiConnectivityImpl(this.serviceHandler, tapiContext, connectivityUtils, - pceListenerImpl, rendererListenerImpl, serviceHandlerListenerImpl); + pceListenerImpl, rendererListenerImpl); 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); + + TapiNetconfTopologyListener topologyListener = new TapiNetconfTopologyListener(tapiNetworkModelServiceImpl); + TapiOrLinkListener orLinkListener = new TapiOrLinkListener(tapiLink, networkTransactionService); + TapiPortMappingListener tapiPortMappingListener = new TapiPortMappingListener(tapiNetworkModelServiceImpl); dataTreeChangeListenerRegistration1 = dataBroker.registerDataTreeChangeListener(DataTreeIdentifier.create(LogicalDatastoreType.CONFIGURATION, LINK_II), orLinkListener); @@ -152,20 +156,26 @@ public class TapiProvider { tapiNetworkutilsServiceRpcRegistration = rpcProviderService.registerRpcImplementation(TransportpceTapinetworkutilsService.class, this.tapiNetworkUtils); - @NonNull - InstanceIdentifier sipIID = InstanceIdentifier.create(ServiceInterfacePoints.class); - dataBroker.registerDataTreeChangeListener(DataTreeIdentifier.create( - LogicalDatastoreType.CONFIGURATION, sipIID), tapiListener); + TapiListener tapiListener = new TapiListener(); + dataBroker.registerDataTreeChangeListener( + DataTreeIdentifier.create( + LogicalDatastoreType.CONFIGURATION, + InstanceIdentifier.create(ServiceInterfacePoints.class)), + tapiListener); // Notification Listener pcelistenerRegistration = notificationService.registerNotificationListener(pceListenerImpl); rendererlistenerRegistration = notificationService.registerNotificationListener(rendererListenerImpl); - servicehandlerlistenerRegistration = - notificationService.registerNotificationListener(serviceHandlerListenerImpl); + TapiServiceHandlerListenerImpl serviceHandlerListenerImpl = new TapiServiceHandlerListenerImpl(dataBroker); + servicehandlerlistenerRegistration = notificationService + .registerNotificationListener(serviceHandlerListenerImpl); + tapinetworkmodellistenerRegistration = notificationService + .registerNotificationListener(tapiNetworkModelListenerImpl); } /** * Method called when the blueprint container is destroyed. */ + @Deactivate public void close() { LOG.info("TapiProvider Session Closed"); if (dataTreeChangeListenerRegistration != null) { @@ -184,5 +194,6 @@ public class TapiProvider { rendererlistenerRegistration.close(); servicehandlerlistenerRegistration.close(); rpcRegistration.close(); + tapinetworkmodellistenerRegistration.close(); } }