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=520de74c6529bd8ee2b27da6f132eed11b45a003;hb=02120b6f30aece5acfa0fba69419c6b65f0f1659;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..520de74c6 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 @@ -11,21 +11,38 @@ 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.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.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.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.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.TapiListener; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.TransportpcePceListener; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.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; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.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.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.slf4j.Logger; @@ -41,23 +58,50 @@ 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.rev210426.network.Nodes.class); private final DataBroker dataBroker; private final RpcProviderService rpcProviderService; private ObjectRegistration rpcRegistration; + private ObjectRegistration tapiNetworkutilsServiceRpcRegistration; + private ListenerRegistration dataTreeChangeListenerRegistration; + private ListenerRegistration mappingListenerListenerRegistration; + 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 TapiPortMappingListener tapiPortMappingListener; private final NetworkTransactionService networkTransactionService; + private final TransportpceTapinetworkutilsService tapiNetworkUtils; + private TapiPceListenerImpl pceListenerImpl; + private TapiRendererListenerImpl rendererListenerImpl; + private TapiServiceHandlerListenerImpl serviceHandlerListenerImpl; + private final NotificationService notificationService; public TapiProvider(DataBroker dataBroker, RpcProviderService rpcProviderService, OrgOpenroadmServiceService serviceHandler, ServiceDataStoreOperations serviceDataStoreOperations, - TapiListener tapiListener, NetworkTransactionService networkTransactionService) { + TapiListener tapiListener, NetworkTransactionService networkTransactionService, + TapiNetconfTopologyListener topologyListener, TapiPortMappingListener tapiPortMappingListener, + TransportpceTapinetworkutilsService tapiNetworkUtils, TapiPceListenerImpl pceListenerImpl, + TapiRendererListenerImpl rendererListenerImpl, TapiServiceHandlerListenerImpl serviceHandlerListenerImpl, + NotificationService notificationService) { this.dataBroker = dataBroker; this.rpcProviderService = rpcProviderService; 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; } /** @@ -67,8 +111,8 @@ public class TapiProvider { 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 TapiLink(this.networkTransactionService); + TopologyUtils topologyUtils = new TopologyUtils(this.networkTransactionService, this.dataBroker, tapiLink); ConnectivityUtils connectivityUtils = new ConnectivityUtils(this.serviceDataStoreOperations, new HashMap<>(), tapiContext); TapiInitialORMapping tapiInitialORMapping = new TapiInitialORMapping(topologyUtils, connectivityUtils, @@ -76,14 +120,30 @@ public class TapiProvider { tapiInitialORMapping.performTopoInitialMapping(); tapiInitialORMapping.performServInitialMapping(); - TapiConnectivityImpl tapi = new TapiConnectivityImpl(this.serviceHandler); - TapiTopologyImpl topo = new TapiTopologyImpl(this.dataBroker, tapiContext, topologyUtils); + TapiConnectivityImpl tapi = new TapiConnectivityImpl(this.serviceHandler, tapiContext, connectivityUtils, + pceListenerImpl, rendererListenerImpl, serviceHandlerListenerImpl); + 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); + dataTreeChangeListenerRegistration = + dataBroker.registerDataTreeChangeListener(DataTreeIdentifier.create(LogicalDatastoreType.OPERATIONAL, + InstanceIdentifiers.NETCONF_TOPOLOGY_II.child(Node.class)), topologyListener); + mappingListenerListenerRegistration = + dataBroker.registerDataTreeChangeListener(DataTreeIdentifier.create(LogicalDatastoreType.CONFIGURATION, + MAPPING_II), tapiPortMappingListener); + tapiNetworkutilsServiceRpcRegistration = + rpcProviderService.registerRpcImplementation(TransportpceTapinetworkutilsService.class, + this.tapiNetworkUtils); @NonNull InstanceIdentifier sipIID = InstanceIdentifier.create(ServiceInterfacePoints.class); dataBroker.registerDataTreeChangeListener(DataTreeIdentifier.create( LogicalDatastoreType.CONFIGURATION, sipIID), tapiListener); + // Notification Listener + pcelistenerRegistration = notificationService.registerNotificationListener(pceListenerImpl); + rendererlistenerRegistration = notificationService.registerNotificationListener(rendererListenerImpl); + servicehandlerlistenerRegistration = + notificationService.registerNotificationListener(serviceHandlerListenerImpl); } /** @@ -91,6 +151,18 @@ public class TapiProvider { */ public void close() { LOG.info("TapiProvider Session Closed"); + if (dataTreeChangeListenerRegistration != null) { + dataTreeChangeListenerRegistration.close(); + } + if (mappingListenerListenerRegistration != null) { + mappingListenerListenerRegistration.close(); + } + if (tapiNetworkutilsServiceRpcRegistration != null) { + tapiNetworkutilsServiceRpcRegistration.close(); + } + pcelistenerRegistration.close(); + rendererlistenerRegistration.close(); + servicehandlerlistenerRegistration.close(); rpcRegistration.close(); } }