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=065a840968c5283a01d312b3cf3d3be2bc3395ab;hb=7163540eb75ce9968881b470ebf640b7a92f9eaa;hp=19b91a44a6bc059c9c4180d76649400d2f7043c8;hpb=27070ce7114dcdb1da7203c54724fa3fe59e7cc3;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 19b91a44a..065a84096 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 @@ -41,7 +41,6 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmappi 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; 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; @@ -84,15 +83,10 @@ public class TapiProvider { 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 List listeners; private ListenerRegistration pcelistenerRegistration; private ListenerRegistration rendererlistenerRegistration; @@ -107,18 +101,12 @@ public class TapiProvider { @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.tapiNetworkUtils = tapiNetworkUtils; - this.tapiNetworkModelListenerImpl = tapiNetworkModelListenerImpl; - LOG.info("TapiProvider Session Initiated"); TapiContext tapiContext = new TapiContext(this.networkTransactionService); LOG.info("Empty TAPI context created: {}", tapiContext.getTapiContext()); @@ -154,9 +142,6 @@ public class TapiProvider { topologyListener)); listeners.add(dataBroker.registerDataTreeChangeListener( DataTreeIdentifier.create(LogicalDatastoreType.CONFIGURATION, MAPPING_II), tapiPortMappingListener)); - tapiNetworkutilsServiceRpcRegistration = - rpcProviderService.registerRpcImplementation(TransportpceTapinetworkutilsService.class, - this.tapiNetworkUtils); TapiListener tapiListener = new TapiListener(); listeners.add(dataBroker.registerDataTreeChangeListener( DataTreeIdentifier.create( @@ -180,9 +165,6 @@ public class TapiProvider { public void close() { listeners.forEach(lis -> lis.close()); listeners.clear(); - if (tapiNetworkutilsServiceRpcRegistration != null) { - tapiNetworkutilsServiceRpcRegistration.close(); - } pcelistenerRegistration.close(); rendererlistenerRegistration.close(); servicehandlerlistenerRegistration.close();