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.renderer.rpcs.TransportPCEServicePathRPCImpl;
import org.opendaylight.transportpce.servicehandler.impl.ServicehandlerImpl;
import org.opendaylight.transportpce.servicehandler.impl.ServicehandlerProvider;
import org.opendaylight.transportpce.servicehandler.listeners.NetworkModelListenerImpl;
lightyServices.getBindingDataBroker(), lightyServices.getBindingNotificationPublishService(),
portMapping);
return new RendererProvider(lightyServices.getRpcProviderService(), deviceRendererService,
- otnDeviceRendererService, rendererServiceOperations);
+ otnDeviceRendererService, deviceRendererRPC,
+ new TransportPCEServicePathRPCImpl(rendererServiceOperations));
}
private OpenRoadmInterfaceFactory initOpenRoadmFactory(MappingUtils mappingUtils,
import org.opendaylight.mdsal.binding.api.RpcProviderService;
import org.opendaylight.transportpce.renderer.provisiondevice.DeviceRendererService;
import org.opendaylight.transportpce.renderer.provisiondevice.OtnDeviceRendererService;
-import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations;
-import org.opendaylight.transportpce.renderer.rpcs.DeviceRendererRPCImpl;
-import org.opendaylight.transportpce.renderer.rpcs.TransportPCEServicePathRPCImpl;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.TransportpceDeviceRendererService;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.TransportpceRendererService;
import org.opendaylight.yangtools.concepts.ObjectRegistration;
private static final Logger LOG = LoggerFactory.getLogger(RendererProvider.class);
private final RpcProviderService rpcProviderService;
- private DeviceRendererRPCImpl deviceRendererRPCImpl;
- private TransportPCEServicePathRPCImpl transportPCEServicePathRPCImpl;
- private ObjectRegistration<DeviceRendererRPCImpl> deviceRendererRegistration;
+ private ObjectRegistration<TransportpceDeviceRendererService> deviceRendererRegistration;
private ObjectRegistration<TransportpceRendererService> tpceServiceRegistry;
@Activate
public RendererProvider(@Reference RpcProviderService rpcProviderService,
@Reference DeviceRendererService deviceRenderer,
@Reference OtnDeviceRendererService otnDeviceRendererService,
- @Reference RendererServiceOperations rendererServiceOperations) {
+ @Reference TransportpceDeviceRendererService deviceRendererRPCImpl,
+ @Reference TransportpceRendererService transportPCEServicePathRPCImpl) {
this.rpcProviderService = rpcProviderService;
- this.deviceRendererRPCImpl = new DeviceRendererRPCImpl(deviceRenderer, otnDeviceRendererService);
- this.transportPCEServicePathRPCImpl = new TransportPCEServicePathRPCImpl(rendererServiceOperations);
LOG.info("RendererProvider Session Initiated");
this.deviceRendererRegistration = this.rpcProviderService
.registerRpcImplementation(TransportpceDeviceRendererService.class, deviceRendererRPCImpl);
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.TransportpceDeviceRendererService;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+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(immediate = true)
public class DeviceRendererRPCImpl implements TransportpceDeviceRendererService {
private static final Logger LOG = LoggerFactory.getLogger(DeviceRendererRPCImpl.class);
private DeviceRendererService deviceRenderer;
private OtnDeviceRendererService otnDeviceRendererService;
- public DeviceRendererRPCImpl(DeviceRendererService deviceRenderer,
- OtnDeviceRendererService otnDeviceRendererService) {
+ @Activate
+ public DeviceRendererRPCImpl(@Reference DeviceRendererService deviceRenderer,
+ @Reference OtnDeviceRendererService otnDeviceRendererService) {
this.deviceRenderer = deviceRenderer;
this.otnDeviceRendererService = otnDeviceRendererService;
LOG.debug("DeviceRendererRPCImpl instantiated");
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceImplementationRequestOutput;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.TransportpceRendererService;
import org.opendaylight.yangtools.yang.common.RpcResult;
+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(immediate = true)
public class TransportPCEServicePathRPCImpl implements TransportpceRendererService {
private static final Logger LOG = LoggerFactory.getLogger(TransportPCEServicePathRPCImpl.class);
private final RendererServiceOperations rendererServiceOperations;
- public TransportPCEServicePathRPCImpl(RendererServiceOperations rendererServiceOperations) {
+ @Activate
+ public TransportPCEServicePathRPCImpl(@Reference RendererServiceOperations rendererServiceOperations) {
this.rendererServiceOperations = rendererServiceOperations;
LOG.debug("TransportPCEServicePathRPCImpl instantiated");
}
import org.opendaylight.mdsal.binding.api.RpcProviderService;
import org.opendaylight.transportpce.renderer.provisiondevice.DeviceRendererService;
import org.opendaylight.transportpce.renderer.provisiondevice.OtnDeviceRendererService;
-import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations;
import org.opendaylight.transportpce.renderer.rpcs.DeviceRendererRPCImpl;
import org.opendaylight.transportpce.renderer.rpcs.TransportPCEServicePathRPCImpl;
import org.opendaylight.transportpce.test.AbstractTest;
@Mock
OtnDeviceRendererService otnDeviceRendererService;
@Mock
- RendererServiceOperations rendererServiceOperations;
+ DeviceRendererRPCImpl deviceRendererRPCImpl;
+ @Mock
+ TransportPCEServicePathRPCImpl transportPCEServicePathRPCImpl;
@Test
void testInitMethodRegistersRendererToRpcService() {
- new RendererProvider(rpcProviderService, deviceRenderer, otnDeviceRendererService, rendererServiceOperations);
+ new RendererProvider(rpcProviderService, deviceRenderer, otnDeviceRendererService, deviceRendererRPCImpl,
+ transportPCEServicePathRPCImpl);
verify(rpcProviderService, times(1))
.registerRpcImplementation(any(), any(TransportPCEServicePathRPCImpl.class));