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);
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;
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";
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
<reference id="networkModelService" interface="org.opendaylight.transportpce.networkmodel.service.NetworkModelService"/>
<reference id="olmService" interface="org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.TransportpceOlmService"/>
<reference id="deviceRenderer" interface="org.opendaylight.transportpce.renderer.provisiondevice.DeviceRendererService" />
+ <reference id="otnDeviceRenderer" interface="org.opendaylight.transportpce.renderer.provisiondevice.OtnDeviceRendererService"/>
- <bean id="openRoadmInterfaceFactory"
- class="org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterfaceFactory">
- <argument ref="mappingUtils"/>
- <argument ref="portMapping"/>
- <argument ref="openRoadmInterfaces"/>
- </bean>
-
- <bean id="otnDeviceRenderer" class="org.opendaylight.transportpce.renderer.provisiondevice.OtnDeviceRendererServiceImpl" >
- <argument ref="openRoadmInterfaceFactory" />
- <argument ref="crossConnect" />
- <argument ref="openRoadmInterfaces" />
- <argument ref="deviceTransactionManager" />
- <argument ref="networkModelService" />
- </bean>
<bean id="deviceRendererRPCImpl" class="org.opendaylight.transportpce.renderer.rpcs.DeviceRendererRPCImpl" >
<argument ref="deviceRenderer" />
<service ref="rendererServiceOperations"
interface="org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations" />
- <service ref="otnDeviceRenderer"
- interface="org.opendaylight.transportpce.renderer.provisiondevice.OtnDeviceRendererService"/>
</blueprint>