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=1c1ec8b122014d3d09766674624dcb63364899e6;hb=c10e4140f3cc89f7b4d635d7a370209d8a1e15ff;hp=e8c0bcadcd23155c0365da8c6f0c23ba2cfb0406;hpb=fb4518248d42b89992a227c94fde2fe9d6fe4df5;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 e8c0bcadc..1c1ec8b12 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,22 +7,49 @@ */ 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.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.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.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.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.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.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.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.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; @@ -38,21 +65,57 @@ 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); + 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 ObjectRegistration tapiNetworkutilsServiceRpcRegistration; + private ListenerRegistration dataTreeChangeListenerRegistration; + private ListenerRegistration dataTreeChangeListenerRegistration1; + 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 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; public TapiProvider(DataBroker dataBroker, RpcProviderService rpcProviderService, - OrgOpenroadmServiceService serviceHandler, TapiListener tapiListener, - NetworkTransactionService networkTransactionService) { + OrgOpenroadmServiceService serviceHandler, ServiceDataStoreOperations serviceDataStoreOperations, + TapiListener tapiListener, NetworkTransactionService networkTransactionService, + TapiNetconfTopologyListener topologyListener, TapiPortMappingListener tapiPortMappingListener, + TransportpceTapinetworkutilsService tapiNetworkUtils, TapiPceListenerImpl pceListenerImpl, + TapiRendererListenerImpl rendererListenerImpl, TapiServiceHandlerListenerImpl serviceHandlerListenerImpl, + NotificationService notificationService, TapiOrLinkListener orLinkListener) { 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; + this.orLinkListener = orLinkListener; } /** @@ -62,19 +125,42 @@ 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); - TapiInitialORMapping tapiInitialORMapping = new TapiInitialORMapping(topologyUtils, tapiContext); + TapiLink tapiLink = new TapiLink(this.networkTransactionService); + TopologyUtils topologyUtils = new TopologyUtils(this.networkTransactionService, this.dataBroker, tapiLink); + ConnectivityUtils connectivityUtils = new ConnectivityUtils(this.serviceDataStoreOperations, new HashMap<>(), + tapiContext, this.networkTransactionService); + TapiInitialORMapping tapiInitialORMapping = new TapiInitialORMapping(topologyUtils, connectivityUtils, + tapiContext, this.serviceDataStoreOperations); 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); + dataTreeChangeListenerRegistration1 = + dataBroker.registerDataTreeChangeListener(DataTreeIdentifier.create(LogicalDatastoreType.CONFIGURATION, + LINK_II), orLinkListener); + 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); } /** @@ -82,6 +168,21 @@ public class TapiProvider { */ public void close() { LOG.info("TapiProvider Session Closed"); + if (dataTreeChangeListenerRegistration != null) { + dataTreeChangeListenerRegistration.close(); + } + if (mappingListenerListenerRegistration != null) { + mappingListenerListenerRegistration.close(); + } + if (dataTreeChangeListenerRegistration1 != null) { + dataTreeChangeListenerRegistration1.close(); + } + if (tapiNetworkutilsServiceRpcRegistration != null) { + tapiNetworkutilsServiceRpcRegistration.close(); + } + pcelistenerRegistration.close(); + rendererlistenerRegistration.close(); + servicehandlerlistenerRegistration.close(); rpcRegistration.close(); } }