From 336faa20de5184eaf8b0c1e84d22b4a708381235 Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Wed, 27 Jan 2021 09:30:29 +0100 Subject: [PATCH] Reorganise dependency injection in ServiceHandler - solve the ServiceHandler instance duplication issue when installing T-API feature - remove manuel instanciations from ServicehandlerProvider to let blueprint manage object instantiation as a singleton - remove ServiceHandlerOperations interface and its implementation that was duplicating OrgOpenroadmServiceService interface, and chose that latter in T-API module - adapt constructors of service handler UT accordingly - reorganise dependency injection in lighty to be aligned with blueprint files JIRA: TRNSPRTPCE-391 Signed-off-by: Gilles Thouenon Change-Id: I99d93bef801e24fe9972c277abbcdf5d28f8e781 --- .../tpce/module/TransportPCEImpl.java | 40 ++++++----- .../impl/ServicehandlerProvider.java | 37 ++++------ .../service/ServiceHandlerOperations.java | 20 ------ .../service/ServiceHandlerOperationsImpl.java | 68 ------------------- .../blueprint/servicehandler-blueprint.xml | 11 +-- .../impl/ServicehandlerProviderTest.java | 23 ++++--- .../transportpce/tapi/impl/TapiImpl.java | 13 ++-- .../transportpce/tapi/impl/TapiProvider.java | 8 +-- .../OSGI-INF/blueprint/tapi-blueprint.xml | 2 +- 9 files changed, 64 insertions(+), 158 deletions(-) delete mode 100644 servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceHandlerOperations.java delete mode 100644 servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceHandlerOperationsImpl.java diff --git a/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java b/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java index 02bf1a50b..fa3680503 100644 --- a/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java +++ b/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java @@ -60,18 +60,18 @@ import org.opendaylight.transportpce.renderer.provisiondevice.OtnDeviceRendererS import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations; import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperationsImpl; import org.opendaylight.transportpce.renderer.rpcs.DeviceRendererRPCImpl; +import org.opendaylight.transportpce.servicehandler.impl.ServicehandlerImpl; import org.opendaylight.transportpce.servicehandler.impl.ServicehandlerProvider; import org.opendaylight.transportpce.servicehandler.listeners.NetworkModelListenerImpl; import org.opendaylight.transportpce.servicehandler.listeners.PceListenerImpl; import org.opendaylight.transportpce.servicehandler.listeners.RendererListenerImpl; import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations; import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperationsImpl; -import org.opendaylight.transportpce.servicehandler.service.ServiceHandlerOperations; -import org.opendaylight.transportpce.servicehandler.service.ServiceHandlerOperationsImpl; import org.opendaylight.transportpce.tapi.impl.TapiProvider; import org.opendaylight.transportpce.tapi.utils.TapiListener; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.TransportpceNetworkutilsService; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.TransportpceOlmService; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.OrgOpenroadmServiceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -154,10 +154,22 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP RendererServiceOperations rendererServiceOperations = new RendererServiceOperationsImpl(deviceRendererService, otnDeviceRendererService, olmPowerServiceRpc, lightyServices.getBindingDataBroker(), lightyServices.getBindingNotificationPublishService()); + ServiceDataStoreOperations serviceDataStoreOperations = new ServiceDataStoreOperationsImpl( + lightyServices.getBindingDataBroker()); + RendererListenerImpl rendererListenerImpl = new RendererListenerImpl(pathComputationService, + lightyServices.getBindingNotificationPublishService()); + PceListenerImpl pceListenerImpl = new PceListenerImpl(rendererServiceOperations, pathComputationService, + lightyServices.getBindingNotificationPublishService(), serviceDataStoreOperations); + NetworkModelListenerImpl networkModelListenerImpl = new NetworkModelListenerImpl( + lightyServices.getBindingNotificationPublishService(), serviceDataStoreOperations); + ServicehandlerImpl servicehandler = new ServicehandlerImpl(lightyServices.getBindingDataBroker(), + pathComputationService, rendererServiceOperations, lightyServices.getBindingNotificationPublishService(), + pceListenerImpl, rendererListenerImpl, networkModelListenerImpl, serviceDataStoreOperations); servicehandlerProvider = new ServicehandlerProvider(lightyServices.getBindingDataBroker(), - lightyServices.getRpcProviderService(), lightyServices.getNotificationService(), pathComputationService, - rendererServiceOperations, lightyServices.getBindingNotificationPublishService()); - tapiProvider = initTapi(lightyServices, rendererServiceOperations, pathComputationService); + lightyServices.getRpcProviderService(), lightyServices.getNotificationService(), + serviceDataStoreOperations, pceListenerImpl, rendererListenerImpl, networkModelListenerImpl, + servicehandler); + tapiProvider = initTapi(lightyServices, servicehandler); } @Override @@ -205,23 +217,9 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP * @param rendererServiceOperations RendererServiceOperations * @return TapiProvider instance */ - private TapiProvider initTapi(LightyServices lightyServices, RendererServiceOperations rendererServiceOperations, - PathComputationService pathComputationService) { - RendererListenerImpl rendererListenerImpl = new RendererListenerImpl(pathComputationService, - lightyServices.getBindingNotificationPublishService()); - ServiceDataStoreOperations serviceDataStoreOperations = new ServiceDataStoreOperationsImpl( - lightyServices.getBindingDataBroker()); - PceListenerImpl pceListenerImpl = new PceListenerImpl(rendererServiceOperations, pathComputationService, - lightyServices.getBindingNotificationPublishService(), serviceDataStoreOperations); - NetworkModelListenerImpl networkModelListenerImpl = - new NetworkModelListenerImpl(lightyServices.getBindingNotificationPublishService(), - serviceDataStoreOperations); - ServiceHandlerOperations serviceHandlerOperations = new ServiceHandlerOperationsImpl( - lightyServices.getBindingDataBroker(), pathComputationService, rendererServiceOperations, - lightyServices.getBindingNotificationPublishService(), pceListenerImpl, rendererListenerImpl, - networkModelListenerImpl); + private TapiProvider initTapi(LightyServices lightyServices, OrgOpenroadmServiceService servicehandler) { return new TapiProvider(lightyServices.getBindingDataBroker(), lightyServices.getRpcProviderService(), - serviceHandlerOperations, new TapiListener()); + servicehandler, new TapiListener()); } /** diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProvider.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProvider.java index 672f8517f..c5da973eb 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProvider.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProvider.java @@ -9,11 +9,8 @@ package org.opendaylight.transportpce.servicehandler.impl; import org.opendaylight.mdsal.binding.api.DataBroker; -import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.mdsal.binding.api.NotificationService; import org.opendaylight.mdsal.binding.api.RpcProviderService; -import org.opendaylight.transportpce.pce.service.PathComputationService; -import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations; import org.opendaylight.transportpce.servicehandler.listeners.NetworkModelListenerImpl; import org.opendaylight.transportpce.servicehandler.listeners.PceListenerImpl; import org.opendaylight.transportpce.servicehandler.listeners.RendererListenerImpl; @@ -40,28 +37,30 @@ public class ServicehandlerProvider { private final DataBroker dataBroker; private final RpcProviderService rpcService; private final NotificationService notificationService; - private final NotificationPublishService notificationPublishService; private ListenerRegistration pcelistenerRegistration; private ListenerRegistration rendererlistenerRegistration; private ListenerRegistration networkmodellistenerRegistration; private ObjectRegistration rpcRegistration; - private PathComputationService pathComputationService; - private RendererServiceOperations rendererServiceOperations; private ServiceDataStoreOperations serviceDataStoreOperations; + private PceListenerImpl pceListenerImpl; + private RendererListenerImpl rendererListenerImpl; + private NetworkModelListenerImpl networkModelListenerImpl; + private ServicehandlerImpl servicehandler; + public ServicehandlerProvider(final DataBroker dataBroker, RpcProviderService rpcProviderService, - NotificationService notificationService, PathComputationService pathComputationService, - RendererServiceOperations rendererServiceOperations, - NotificationPublishService notificationPublishService, - ServiceDataStoreOperations serviceDataStoreOperations) { + NotificationService notificationService, ServiceDataStoreOperations serviceDataStoreOperations, + PceListenerImpl pceListenerImpl, RendererListenerImpl rendererListenerImpl, + NetworkModelListenerImpl networkModelListenerImpl, ServicehandlerImpl servicehandler) { this.dataBroker = dataBroker; this.rpcService = rpcProviderService; this.notificationService = notificationService; - this.pathComputationService = pathComputationService; - this.rendererServiceOperations = rendererServiceOperations; - this.notificationPublishService = notificationPublishService; this.serviceDataStoreOperations = serviceDataStoreOperations; this.serviceDataStoreOperations.initialize(); + this.pceListenerImpl = pceListenerImpl; + this.rendererListenerImpl = rendererListenerImpl; + this.networkModelListenerImpl = networkModelListenerImpl; + this.servicehandler = servicehandler; } /** @@ -69,20 +68,10 @@ public class ServicehandlerProvider { */ public void init() { LOG.info("ServicehandlerProvider Session Initiated"); - final PceListenerImpl pceListenerImpl = new PceListenerImpl(rendererServiceOperations, - pathComputationService, notificationPublishService, serviceDataStoreOperations); - final RendererListenerImpl rendererListenerImpl = - new RendererListenerImpl(pathComputationService, notificationPublishService); - final NetworkModelListenerImpl networkModelListenerImpl = - new NetworkModelListenerImpl(notificationPublishService, serviceDataStoreOperations); pcelistenerRegistration = notificationService.registerNotificationListener(pceListenerImpl); rendererlistenerRegistration = notificationService.registerNotificationListener(rendererListenerImpl); networkmodellistenerRegistration = notificationService.registerNotificationListener(networkModelListenerImpl); - final ServicehandlerImpl servicehandler = new ServicehandlerImpl(dataBroker, pathComputationService, - rendererServiceOperations, notificationPublishService, pceListenerImpl, rendererListenerImpl, - networkModelListenerImpl, serviceDataStoreOperations); - rpcRegistration = - rpcService.registerRpcImplementation(OrgOpenroadmServiceService.class, servicehandler); + rpcRegistration = rpcService.registerRpcImplementation(OrgOpenroadmServiceService.class, servicehandler); } /** diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceHandlerOperations.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceHandlerOperations.java deleted file mode 100644 index 6ab432830..000000000 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceHandlerOperations.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright © 2018 Orange, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.transportpce.servicehandler.service; - -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteOutput; - -public interface ServiceHandlerOperations { - ServiceCreateOutput serviceCreate(ServiceCreateInput input); - - ServiceDeleteOutput serviceDelete(ServiceDeleteInput input); - -} diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceHandlerOperationsImpl.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceHandlerOperationsImpl.java deleted file mode 100644 index ed8ab32d7..000000000 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceHandlerOperationsImpl.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright © 2018 Orange, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.transportpce.servicehandler.service; - -import com.google.common.util.concurrent.ListenableFuture; -import java.util.concurrent.ExecutionException; -import org.opendaylight.mdsal.binding.api.DataBroker; -import org.opendaylight.mdsal.binding.api.NotificationPublishService; -import org.opendaylight.transportpce.pce.service.PathComputationService; -import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations; -import org.opendaylight.transportpce.servicehandler.impl.ServicehandlerImpl; -import org.opendaylight.transportpce.servicehandler.listeners.NetworkModelListenerImpl; -import org.opendaylight.transportpce.servicehandler.listeners.PceListenerImpl; -import org.opendaylight.transportpce.servicehandler.listeners.RendererListenerImpl; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteOutput; -import org.opendaylight.yangtools.yang.common.RpcResult; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class ServiceHandlerOperationsImpl implements ServiceHandlerOperations { - - private static final Logger LOG = LoggerFactory.getLogger(ServiceHandlerOperationsImpl.class); - - private ServicehandlerImpl serviceHandler; - - public ServiceHandlerOperationsImpl(DataBroker databroker, PathComputationService pathComputationService, - RendererServiceOperations rendererServiceOperations, NotificationPublishService notificationPublishService, - PceListenerImpl pceListenerImpl, RendererListenerImpl rendererListenerImpl, - NetworkModelListenerImpl networkModelListenerImpl, ServiceDataStoreOperations serviceDataStoreOperations) { - this.serviceHandler = new ServicehandlerImpl(databroker, pathComputationService, rendererServiceOperations, - notificationPublishService, pceListenerImpl, rendererListenerImpl, networkModelListenerImpl, - serviceDataStoreOperations); - } - - @Override - public ServiceCreateOutput serviceCreate(ServiceCreateInput input) { - ListenableFuture> output = this.serviceHandler.serviceCreate(input); - ServiceCreateOutput outputresult = null; - try { - outputresult = output.get().getResult(); - } catch (InterruptedException | ExecutionException e) { - LOG.error("Rpc service create failed", e); - } - return outputresult; - } - - @Override - public ServiceDeleteOutput serviceDelete(ServiceDeleteInput input) { - return null; - } - - public void init() { - LOG.info("init ServiceHandlerOperationsImpl..."); - } - - public void close() { - LOG.info("close ServiceHandlerOperationsImpl..."); - } - -} diff --git a/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml b/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml index 393ad9e3a..d3e7a2727 100644 --- a/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml +++ b/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml @@ -52,7 +52,7 @@ Author: Martial Coulibaly on behalf of Orange - + @@ -69,13 +69,14 @@ Author: Martial Coulibaly on behalf of Orange - - - + + + + + interface="org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.OrgOpenroadmServiceService"/> diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProviderTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProviderTest.java index f2ec02f19..5c78e67ee 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProviderTest.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProviderTest.java @@ -15,29 +15,32 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.mdsal.binding.api.RpcProviderService; -import org.opendaylight.transportpce.pce.service.PathComputationService; -import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations; +import org.opendaylight.transportpce.servicehandler.listeners.NetworkModelListenerImpl; +import org.opendaylight.transportpce.servicehandler.listeners.PceListenerImpl; +import org.opendaylight.transportpce.servicehandler.listeners.RendererListenerImpl; import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations; import org.opendaylight.transportpce.test.AbstractTest; public class ServicehandlerProviderTest extends AbstractTest { @Mock - private PathComputationService pathComputationService; + RpcProviderService rpcProviderRegistry; @Mock - private RendererServiceOperations rendererServiceOperations; + ServiceDataStoreOperations serviceDataStoreOperations; @Mock - private NotificationPublishService notificationPublishService; + PceListenerImpl pceListenerImpl; @Mock - RpcProviderService rpcProviderRegistry; + RendererListenerImpl rendererListenerImpl; @Mock - ServiceDataStoreOperations serviceDataStoreOperations; + NetworkModelListenerImpl networkModelListenerImpl; + + @Mock + ServicehandlerImpl servicehandler; @Before public void init() { @@ -49,8 +52,8 @@ public class ServicehandlerProviderTest extends AbstractTest { public void testInitRegisterServiceHandlerToRpcRegistry() { ServicehandlerProvider provider = new ServicehandlerProvider( getDataBroker(), rpcProviderRegistry, - getNotificationService() , pathComputationService, - rendererServiceOperations, notificationPublishService, serviceDataStoreOperations); + getNotificationService() , serviceDataStoreOperations, pceListenerImpl, rendererListenerImpl, + networkModelListenerImpl, servicehandler); provider.init(); diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiImpl.java index 00e98ce48..19af382c5 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiImpl.java @@ -12,12 +12,13 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; import org.opendaylight.transportpce.common.OperationResult; -import org.opendaylight.transportpce.servicehandler.service.ServiceHandlerOperations; import org.opendaylight.transportpce.tapi.utils.GenericServiceEndpoint; import org.opendaylight.transportpce.tapi.utils.MappingUtils; import org.opendaylight.transportpce.tapi.utils.TapiUtils; import org.opendaylight.transportpce.tapi.validation.CreateConnectivityServiceValidation; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.OrgOpenroadmServiceService; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateOutput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.Uuid; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.global._class.Name; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.global._class.NameBuilder; @@ -58,9 +59,9 @@ public class TapiImpl implements TapiConnectivityService { private static final Logger LOG = LoggerFactory.getLogger(TapiImpl.class); - private ServiceHandlerOperations serviceHandler; + private OrgOpenroadmServiceService serviceHandler; - public TapiImpl(ServiceHandlerOperations serviceHandler) { + public TapiImpl(OrgOpenroadmServiceService serviceHandler) { LOG.info("inside TapiImpl constructor"); this.serviceHandler = serviceHandler; } @@ -88,7 +89,10 @@ public class TapiImpl implements TapiConnectivityService { map.get(input.getEndPoint().values().stream().skip(1).findFirst().get() .getServiceInterfacePoint() .getServiceInterfacePointUuid())); - this.serviceHandler.serviceCreate(sci); + ListenableFuture> output = this.serviceHandler.serviceCreate(sci); + if (!output.isDone()) { + return RpcResultBuilder.failed().buildFuture(); + } } else { LOG.error("Unknown UUID"); } @@ -123,7 +127,6 @@ public class TapiImpl implements TapiConnectivityService { .setConnection(Map.of(connection.key(), connection)) .build()) .build(); - return RpcResultBuilder.success(output).buildFuture(); } 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 03708beb7..b6173df6b 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 @@ -12,9 +12,9 @@ import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; import org.opendaylight.mdsal.binding.api.RpcProviderService; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; -import org.opendaylight.transportpce.servicehandler.service.ServiceHandlerOperations; import org.opendaylight.transportpce.tapi.topology.TapiTopologyImpl; 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; @@ -36,14 +36,14 @@ public class TapiProvider { private final DataBroker dataBroker; private final RpcProviderService rpcProviderService; private ObjectRegistration rpcRegistration; - private final ServiceHandlerOperations serviceHandler; + private final OrgOpenroadmServiceService serviceHandler; private final TapiListener tapiListener; public TapiProvider(DataBroker dataBroker, RpcProviderService rpcProviderService, - ServiceHandlerOperations serviceHanlder, TapiListener tapiListener) { + OrgOpenroadmServiceService serviceHandler, TapiListener tapiListener) { this.dataBroker = dataBroker; this.rpcProviderService = rpcProviderService; - this.serviceHandler = serviceHanlder; + this.serviceHandler = serviceHandler; this.tapiListener = tapiListener; } diff --git a/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml b/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml index 75aa57932..6149a54c8 100644 --- a/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml +++ b/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml @@ -20,7 +20,7 @@ Author: Gilles Thouenon interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/> + interface="org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.OrgOpenroadmServiceService" /> -- 2.36.6