import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.RpcService;
import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.transportpce.common.ResponseCodes;
import org.opendaylight.transportpce.common.StringConstants;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.Action;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.OtnServicePathInput;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.OtnLinkType;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.GetPm;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.GetPmInputBuilder;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.GetPmOutput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerSetup;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerSetupInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.TransportpceOlmService;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerTurndown;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.get.pm.output.Measurements;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceDeleteInput;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceDeleteOutput;
private final DeviceRendererService deviceRenderer;
private final OtnDeviceRendererService otnDeviceRenderer;
- private final TransportpceOlmService olmService;
private final DataBroker dataBroker;
private final Notification notification;
private final PortMapping portMapping;
+ private final RpcService rpcService;
private ListeningExecutorService executor;
@Activate
public RendererServiceOperationsImpl(@Reference DeviceRendererService deviceRenderer,
@Reference OtnDeviceRendererService otnDeviceRenderer,
- @Reference TransportpceOlmService olmService,
@Reference DataBroker dataBroker,
@Reference Notification notification,
- @Reference PortMapping portMapping) {
+ @Reference PortMapping portMapping,
+ @Reference RpcService rpcService) {
this.deviceRenderer = deviceRenderer;
this.otnDeviceRenderer = otnDeviceRenderer;
- this.olmService = olmService;
this.dataBroker = dataBroker;
this.notification = notification;
this.portMapping = portMapping;
+ this.rpcService = rpcService;
this.executor = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(NUMBER_OF_THREADS));
LOG.debug("RendererServiceOperationsImpl instantiated");
}
RpcStatusEx.Pending,
"Olm power setup A-Z");
ListenableFuture<OLMRenderingResult> olmPowerSetupFutureAtoZ =
- this.executor.submit(new OlmPowerSetupTask(this.olmService, powerSetupInputAtoZ));
+ this.executor.submit(
+ new OlmPowerSetupTask(rpcService.getRpc(ServicePowerSetup.class), powerSetupInputAtoZ));
LOG.info("OLM power setup Z-A");
sendNotifications(
RpcStatusEx.Pending,
"Olm power setup Z-A");
ListenableFuture<OLMRenderingResult> olmPowerSetupFutureZtoA =
- this.executor.submit(new OlmPowerSetupTask(this.olmService, powerSetupInputZtoA));
+ this.executor.submit(
+ new OlmPowerSetupTask(rpcService.getRpc(ServicePowerSetup.class), powerSetupInputZtoA));
ListenableFuture<List<OLMRenderingResult>> olmFutures =
Futures.allAsList(olmPowerSetupFutureAtoZ, olmPowerSetupFutureZtoA);
RpcStatusEx.Pending,
OLM_ROLL_BACK_MSG);
rollbackProcessor.addTask(
- new OlmPowerSetupRollbackTask("AtoZOLMTask", true, this.olmService, powerSetupInputAtoZ));
+ new OlmPowerSetupRollbackTask("AtoZOLMTask", true, rpcService.getRpc(ServicePowerTurndown.class),
+ powerSetupInputAtoZ));
rollbackProcessor.addTask(
- new OlmPowerSetupRollbackTask("ZtoAOLMTask", true, this.olmService, powerSetupInputZtoA));
+ new OlmPowerSetupRollbackTask("ZtoAOLMTask", true, rpcService.getRpc(ServicePowerTurndown.class),
+ powerSetupInputZtoA));
return;
}
- rollbackProcessor.addTask(
- new OlmPowerSetupRollbackTask(
- "AtoZOLMTask",
- !olmResults.get(0).isSuccess(),
- this.olmService,
- powerSetupInputAtoZ));
- rollbackProcessor.addTask(
- new OlmPowerSetupRollbackTask(
- "ZtoAOLMTask",
- !olmResults.get(1).isSuccess(),
- this.olmService,
- powerSetupInputZtoA));
+ rollbackProcessor.addTask(new OlmPowerSetupRollbackTask(
+ "AtoZOLMTask", !olmResults.get(0).isSuccess(), rpcService.getRpc(ServicePowerTurndown.class),
+ powerSetupInputAtoZ));
+ rollbackProcessor.addTask(new OlmPowerSetupRollbackTask(
+ "ZtoAOLMTask", !olmResults.get(1).isSuccess(), rpcService.getRpc(ServicePowerTurndown.class),
+ powerSetupInputZtoA));
}
@SuppressFBWarnings(
private List<Measurements> getMeasurements(String nodeId, String tp) {
try {
- GetPmOutput getPmOutput =
- this.olmService
- .getPm(
+ GetPmOutput getPmOutput = rpcService.getRpc(GetPm.class).invoke(
new GetPmInputBuilder()
.setNodeId(nodeId)
.setGranularity(PmGranularity._15min)
ServicePathInputData servicePathInputDataZtoA =
ModelMappingUtils.rendererCreateServiceInputZToA(serviceName, pathDescription, Action.Delete);
- ListenableFuture<OLMRenderingResult> olmPowerTurnDownFutureAtoZ =
- this.executor.submit(
- new OlmPowerTurnDownTask(
- serviceName,
- ATOZPATH,
- olmService,
- servicePathInputDataAtoZ,
- notification
- )
- );
+ ListenableFuture<OLMRenderingResult> olmPowerTurnDownFutureAtoZ = this.executor.submit(
+ new OlmPowerTurnDownTask(serviceName, ATOZPATH, servicePathInputDataAtoZ, notification, rpcService));
- ListenableFuture<OLMRenderingResult> olmPowerTurnDownFutureZtoA =
- this.executor.submit(
- new OlmPowerTurnDownTask(
- serviceName,
- ZTOAPATH,
- olmService,
- servicePathInputDataZtoA,
- notification
- )
- );
+ ListenableFuture<OLMRenderingResult> olmPowerTurnDownFutureZtoA = this.executor.submit(
+ new OlmPowerTurnDownTask(serviceName, ZTOAPATH, servicePathInputDataZtoA, notification, rpcService));
ListenableFuture<List<OLMRenderingResult>> olmPowerTurnDownFutures =
Futures.allAsList(olmPowerTurnDownFutureAtoZ, olmPowerTurnDownFutureZtoA);