From e74b194cfc45e998e9e6c1a537231f2d97f5f717 Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Mon, 13 Mar 2023 15:18:38 +0100 Subject: [PATCH] Convert OtnDeviceRendererServiceImpl to Component JIRA: TRNSPRTPCE-736 Signed-off-by: Gilles Thouenon Change-Id: I018e6a5d916857949ee584f852b34b34d8851c5f --- .../tpce/module/TransportPCEImpl.java | 6 +++--- .../OtnDeviceRendererServiceImpl.java | 19 +++++++++++++------ .../OSGI-INF/blueprint/renderer-blueprint.xml | 17 +---------------- 3 files changed, 17 insertions(+), 25 deletions(-) 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 209ba9638..4961ec83c 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 @@ -169,12 +169,12 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP olmProvider = new OlmProvider(lightyServices.getRpcProviderService(), olmPowerServiceRpc); LOG.info("Creating renderer beans ..."); - OpenRoadmInterfaceFactory openRoadmInterfaceFactory = initOpenRoadmFactory(mappingUtils, openRoadmInterfaces, portMapping); + initOpenRoadmFactory(mappingUtils, openRoadmInterfaces, portMapping); DeviceRendererService deviceRendererService = new DeviceRendererServiceImpl( lightyServices.getBindingDataBroker(), deviceTransactionManager, openRoadmInterfaces, crossConnect, mappingUtils, portMapping); - OtnDeviceRendererService otnDeviceRendererService = new OtnDeviceRendererServiceImpl(openRoadmInterfaceFactory, - crossConnect, openRoadmInterfaces, deviceTransactionManager, networkModelService); + OtnDeviceRendererService otnDeviceRendererService = new OtnDeviceRendererServiceImpl(crossConnect, + openRoadmInterfaces, deviceTransactionManager, mappingUtils, portMapping); rendererProvider = initRenderer(lightyServices, olmPowerServiceRpc, deviceRendererService, otnDeviceRendererService, portMapping); diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRendererServiceImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRendererServiceImpl.java index 4fceed951..9573ed322 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRendererServiceImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRendererServiceImpl.java @@ -25,9 +25,10 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.crossconnect.CrossConnect; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; +import org.opendaylight.transportpce.common.mapping.MappingUtils; +import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; -import org.opendaylight.transportpce.networkmodel.service.NetworkModelService; import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterfaceFactory; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.OtnServicePathInput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.OtnServicePathOutput; @@ -41,10 +42,14 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926 import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.node.interfaces.NodeInterfaceBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.node.interfaces.NodeInterfaceKey; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.otn.renderer.nodes.Nodes; +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 OtnDeviceRendererServiceImpl implements OtnDeviceRendererService { private static final Logger LOG = LoggerFactory.getLogger(OtnDeviceRendererServiceImpl.class); private static final String PT_03 = "03"; @@ -54,14 +59,16 @@ public class OtnDeviceRendererServiceImpl implements OtnDeviceRendererService { private final OpenRoadmInterfaces openRoadmInterfaces; private final DeviceTransactionManager deviceTransactionManager; - public OtnDeviceRendererServiceImpl(OpenRoadmInterfaceFactory openRoadmInterfaceFactory, CrossConnect crossConnect, - OpenRoadmInterfaces openRoadmInterfaces, - DeviceTransactionManager deviceTransactionManager, - NetworkModelService networkModelService) { - this.openRoadmInterfaceFactory = openRoadmInterfaceFactory; + @Activate + public OtnDeviceRendererServiceImpl(@Reference CrossConnect crossConnect, + @Reference OpenRoadmInterfaces openRoadmInterfaces, + @Reference DeviceTransactionManager deviceTransactionManager, + @Reference MappingUtils mappingUtils, + @Reference PortMapping portMapping) { this.crossConnect = crossConnect; this.openRoadmInterfaces = openRoadmInterfaces; this.deviceTransactionManager = deviceTransactionManager; + this.openRoadmInterfaceFactory = new OpenRoadmInterfaceFactory(mappingUtils, portMapping, openRoadmInterfaces); } //TODO Align log messages and returned results messages diff --git a/renderer/src/main/resources/OSGI-INF/blueprint/renderer-blueprint.xml b/renderer/src/main/resources/OSGI-INF/blueprint/renderer-blueprint.xml index 7404257b3..80dd82543 100644 --- a/renderer/src/main/resources/OSGI-INF/blueprint/renderer-blueprint.xml +++ b/renderer/src/main/resources/OSGI-INF/blueprint/renderer-blueprint.xml @@ -21,21 +21,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html + - - - - - - - - - - - - - @@ -60,7 +47,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - -- 2.36.6