From: Gilles Thouenon Date: Thu, 16 Mar 2023 09:09:51 +0000 (+0100) Subject: Convert TapiNetworkModelServiceImpl to a Component X-Git-Tag: 8.0.0~72 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=f4774d83c69f8c4dcb14291e4f9d5827b9c29020 Convert TapiNetworkModelServiceImpl to a Component JIRA: TRNSPRTPCE-736 Signed-off-by: Gilles Thouenon Change-Id: I07d791a46372b17725faa440c093a4419290908b (cherry picked from commit 6b42803ee32ed5f8f75a8edd51b73e80e0db830c) --- 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 842d5a679..f88c16ad1 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 @@ -35,8 +35,6 @@ import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfa import org.opendaylight.transportpce.nbinotifications.impl.NbiNotificationsProvider; import org.opendaylight.transportpce.networkmodel.NetConfTopologyListener; import org.opendaylight.transportpce.networkmodel.NetworkModelProvider; -import org.opendaylight.transportpce.networkmodel.NetworkUtilsImpl; -import org.opendaylight.transportpce.networkmodel.R2RLinkDiscovery; import org.opendaylight.transportpce.networkmodel.listeners.PortMappingListener; import org.opendaylight.transportpce.networkmodel.service.FrequenciesService; import org.opendaylight.transportpce.networkmodel.service.FrequenciesServiceImpl; @@ -73,7 +71,6 @@ import org.opendaylight.transportpce.servicehandler.listeners.RendererListenerIm import org.opendaylight.transportpce.servicehandler.listeners.ServiceListener; import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations; import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperationsImpl; -import org.opendaylight.transportpce.tapi.R2RTapiLinkDiscovery; import org.opendaylight.transportpce.tapi.impl.TapiProvider; import org.opendaylight.transportpce.tapi.listeners.TapiNetworkModelListenerImpl; import org.opendaylight.transportpce.tapi.listeners.TapiPceListenerImpl; @@ -89,7 +86,6 @@ 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.olm.rev210618.TransportpceOlmService; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.TransportpceRendererService; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.tapinetworkutils.rev210408.TransportpceTapinetworkutilsService; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.OrgOpenroadmServiceService; import org.slf4j.Logger; @@ -133,8 +129,6 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP networkTransaction = new NetworkTransactionImpl(lightyServices.getBindingDataBroker()); LOG.info("Creating network-model beans ..."); - R2RLinkDiscovery linkDiscoveryImpl = new R2RLinkDiscovery(lightyServices.getBindingDataBroker(), - deviceTransactionManager, networkTransaction); PortMapping portMapping = initPortMapping(lightyServices); NetworkModelService networkModelService = new NetworkModelServiceImpl(lightyServices.getBindingDataBroker(), deviceTransactionManager, networkTransaction, portMapping, @@ -205,8 +199,6 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP if (activateTapi) { LOG.info("Creating tapi beans ..."); TapiLink tapiLink = new TapiLinkImpl(networkTransaction); - R2RTapiLinkDiscovery tapilinkDiscoveryImpl = new R2RTapiLinkDiscovery(networkTransaction, - deviceTransactionManager, tapiLink); TapiRendererListenerImpl tapiRendererListenerImpl = new TapiRendererListenerImpl(lightyServices .getBindingDataBroker(), lightyServices.getBindingNotificationPublishService()); TapiPceListenerImpl tapiPceListenerImpl = new TapiPceListenerImpl(lightyServices.getBindingDataBroker()); @@ -214,9 +206,8 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP lightyServices.getBindingDataBroker()); TransportpceTapinetworkutilsService tapiNetworkutilsServiceImpl = new TapiNetworkUtilsImpl( networkTransaction, tapiLink); - TapiNetworkModelService tapiNetworkModelService = new TapiNetworkModelServiceImpl( - tapilinkDiscoveryImpl, networkTransaction, tapiLink, - lightyServices.getBindingNotificationPublishService()); + TapiNetworkModelService tapiNetworkModelService = new TapiNetworkModelServiceImpl(networkTransaction, + deviceTransactionManager, tapiLink, lightyServices.getBindingNotificationPublishService()); TapiNetconfTopologyListener tapiNetConfTopologyListener = new TapiNetconfTopologyListener(tapiNetworkModelService); TapiOrLinkListener orLinkListener = new TapiOrLinkListener(tapiLink, networkTransaction); diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/R2RTapiLinkDiscovery.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/R2RTapiLinkDiscovery.java index 2af887042..3af6fec15 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/R2RTapiLinkDiscovery.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/R2RTapiLinkDiscovery.java @@ -51,7 +51,7 @@ public class R2RTapiLinkDiscovery { private final TapiLink tapiLink; public R2RTapiLinkDiscovery(NetworkTransactionService networkTransactionService, - DeviceTransactionManager deviceTransactionManager, TapiLink tapiLink) { + DeviceTransactionManager deviceTransactionManager, TapiLink tapiLink) { this.networkTransactionService = networkTransactionService; this.deviceTransactionManager = deviceTransactionManager; this.tapiLink = tapiLink; diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiNetworkModelServiceImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiNetworkModelServiceImpl.java index 7d9e5d217..058962808 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiNetworkModelServiceImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiNetworkModelServiceImpl.java @@ -24,6 +24,7 @@ import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.network.NetworkTransactionService; import org.opendaylight.transportpce.tapi.R2RTapiLinkDiscovery; import org.opendaylight.transportpce.tapi.TapiStringConstants; @@ -137,26 +138,32 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.Notification; import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint32; +import org.osgi.service.component.annotations.Activate; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Reference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@Component public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { private static final Logger LOG = LoggerFactory.getLogger(TapiNetworkModelServiceImpl.class); + private final Uuid tapiTopoUuid = new Uuid(UUID.nameUUIDFromBytes(TapiStringConstants.T0_FULL_MULTILAYER .getBytes(StandardCharsets.UTF_8)).toString()); private final NetworkTransactionService networkTransactionService; - private Map sipMap; private final R2RTapiLinkDiscovery linkDiscovery; private final TapiLink tapiLink; private final NotificationPublishService notificationPublishService; + private Map sipMap = new HashMap<>(); - public TapiNetworkModelServiceImpl(final R2RTapiLinkDiscovery linkDiscovery, - NetworkTransactionService networkTransactionService, TapiLink tapiLink, - final NotificationPublishService notificationPublishService) { + @Activate + public TapiNetworkModelServiceImpl(@Reference NetworkTransactionService networkTransactionService, + @Reference DeviceTransactionManager deviceTransactionManager, + @Reference TapiLink tapiLink, + @Reference final NotificationPublishService notificationPublishService) { this.networkTransactionService = networkTransactionService; - this.sipMap = new HashMap<>(); - this.linkDiscovery = linkDiscovery; + this.linkDiscovery = new R2RTapiLinkDiscovery(networkTransactionService, deviceTransactionManager, tapiLink); this.tapiLink = tapiLink; this.notificationPublishService = notificationPublishService; } 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 77e28e650..ea27da793 100644 --- a/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml +++ b/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml @@ -35,6 +35,7 @@ Author: Gilles Thouenon + @@ -58,13 +59,6 @@ Author: Gilles Thouenon - - - - - - - @@ -102,13 +96,4 @@ Author: Gilles Thouenon - - - - - - - - -