X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=renderer%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Frenderer%2Fprovisiondevice%2FRendererServiceOperationsImpl.java;h=a449876a3aa12bd3d7457041756b63c7a03c06ac;hb=b1b3bafd549bb501937cea5c976d5344608b6ed3;hp=b051192ad21e54bcef1920f024a38ab371cdcda0;hpb=c16c716c06381a8bc52859550b02f9e084fea79a;p=transportpce.git diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java index b051192ad..a449876a3 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java @@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; import org.opendaylight.mdsal.binding.api.DataBroker; -import org.opendaylight.mdsal.binding.api.NotificationPublishService; +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; @@ -33,25 +33,29 @@ import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.common.service.ServiceTypes; import org.opendaylight.transportpce.renderer.ModelMappingUtils; import org.opendaylight.transportpce.renderer.ServicePathInputData; +import org.opendaylight.transportpce.renderer.provisiondevice.notification.Notification; import org.opendaylight.transportpce.renderer.provisiondevice.servicepath.ServicePathDirection; import org.opendaylight.transportpce.renderer.provisiondevice.tasks.DeviceRenderingRollbackTask; import org.opendaylight.transportpce.renderer.provisiondevice.tasks.DeviceRenderingTask; +import org.opendaylight.transportpce.renderer.provisiondevice.tasks.NetworkDeviceRenderingRollbackTask; import org.opendaylight.transportpce.renderer.provisiondevice.tasks.OlmPowerSetupRollbackTask; import org.opendaylight.transportpce.renderer.provisiondevice.tasks.OlmPowerSetupTask; +import org.opendaylight.transportpce.renderer.provisiondevice.tasks.OlmPowerTurnDownTask; import org.opendaylight.transportpce.renderer.provisiondevice.tasks.OtnDeviceRenderingTask; import org.opendaylight.transportpce.renderer.provisiondevice.tasks.RollbackProcessor; +import org.opendaylight.transportpce.renderer.provisiondevice.tasks.RollbackResultMessage; +import org.opendaylight.transportpce.renderer.provisiondevice.transaction.history.History; +import org.opendaylight.transportpce.renderer.provisiondevice.transaction.history.TransactionHistory; 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.ServicePowerTurndownInputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerTurndownOutput; -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.RendererRpcResultSp; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.RendererRpcResultSpBuilder; 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; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceImplementationRequestInput; @@ -75,7 +79,6 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926 import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.olm.get.pm.input.ResourceIdentifierBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.optical.renderer.nodes.Nodes; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.Notification; import org.opendaylight.yangtools.yang.common.Uint32; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; @@ -94,33 +97,33 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations "OLM power setup was not successful! Rendering and OLM will be rolled back."; private static final String RENDERING_DEVICES_A_Z_MSG = "Rendering devices A-Z"; private static final String RENDERING_DEVICES_Z_A_MSG = "Rendering device Z-A"; - private static final String TURNING_DOWN_POWER_ON_A_TO_Z_PATH_MSG = "Turning down power on A-to-Z path"; - private static final String FAILED = "Failed"; + private static final String ATOZPATH = "A-to-Z"; + private static final String ZTOAPATH = "Z-to-A"; private static final String OPERATION_FAILED = "Operation Failed"; private static final String OPERATION_SUCCESSFUL = "Operation Successful"; private static final int NUMBER_OF_THREADS = 4; private final DeviceRendererService deviceRenderer; private final OtnDeviceRendererService otnDeviceRenderer; - private final TransportpceOlmService olmService; private final DataBroker dataBroker; - private final NotificationPublishService notificationPublishService; + 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 NotificationPublishService notificationPublishService, - @Reference PortMapping portMapping) { + @Reference Notification notification, + @Reference PortMapping portMapping, + @Reference RpcService rpcService) { this.deviceRenderer = deviceRenderer; this.otnDeviceRenderer = otnDeviceRenderer; - this.olmService = olmService; this.dataBroker = dataBroker; - this.notificationPublishService = notificationPublishService; + this.notification = notification; this.portMapping = portMapping; + this.rpcService = rpcService; this.executor = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(NUMBER_OF_THREADS)); LOG.debug("RendererServiceOperationsImpl instantiated"); } @@ -318,19 +321,6 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations .get(serviceName); } - @SuppressFBWarnings( - value = "UPM_UNCALLED_PRIVATE_METHOD", - justification = "call in call() method") - private ServicePowerTurndownOutput olmPowerTurndown(ServicePathInputData servicePathInputData) - throws InterruptedException, ExecutionException, TimeoutException { - LOG.debug(TURNING_DOWN_POWER_ON_A_TO_Z_PATH_MSG); - return this.olmService - .servicePowerTurndown( - new ServicePowerTurndownInputBuilder(servicePathInputData.getServicePathInput()).build()) - .get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS) - .getResult(); - } - @SuppressFBWarnings( value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "call in call() method") @@ -370,9 +360,12 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations servicePathDataAtoZ.getServicePathInput().getServiceName(), RpcStatusEx.Pending, RENDERING_DEVICES_A_Z_MSG); + + History transactionHistory = new TransactionHistory(); ListenableFuture atozrenderingFuture = this.executor.submit( - new DeviceRenderingTask(this.deviceRenderer, servicePathDataAtoZ, ServicePathDirection.A_TO_Z)); + new DeviceRenderingTask(this.deviceRenderer, servicePathDataAtoZ, ServicePathDirection.A_TO_Z, + transactionHistory)); LOG.info(RENDERING_DEVICES_Z_A_MSG); sendNotifications( @@ -382,7 +375,8 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations RENDERING_DEVICES_Z_A_MSG); ListenableFuture ztoarenderingFuture = this.executor.submit( - new DeviceRenderingTask(this.deviceRenderer, servicePathDataZtoA, ServicePathDirection.Z_TO_A)); + new DeviceRenderingTask(this.deviceRenderer, servicePathDataZtoA, ServicePathDirection.Z_TO_A, + transactionHistory)); ListenableFuture> renderingCombinedFuture = Futures.allAsList(atozrenderingFuture, ztoarenderingFuture); @@ -403,16 +397,15 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations } rollbackProcessor.addTask( - new DeviceRenderingRollbackTask( - "AtoZDeviceTask", - ! renderingResults.get(0).isSuccess(), - renderingResults.get(0).getRenderedNodeInterfaces(), - this.deviceRenderer)); - rollbackProcessor.addTask( - new DeviceRenderingRollbackTask("ZtoADeviceTask", - ! renderingResults.get(1).isSuccess(), - renderingResults.get(1).getRenderedNodeInterfaces(), - this.deviceRenderer)); + new NetworkDeviceRenderingRollbackTask( + "RollbackTransactionHistoryTask", + transactionHistory, + ! (renderingResults.get(0).isSuccess() && renderingResults.get(1).isSuccess()), + deviceRenderer, + new RollbackResultMessage() + ) + ); + return renderingResults; } @@ -497,7 +490,8 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations RpcStatusEx.Pending, "Olm power setup A-Z"); ListenableFuture 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( @@ -506,7 +500,8 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations RpcStatusEx.Pending, "Olm power setup Z-A"); ListenableFuture olmPowerSetupFutureZtoA = - this.executor.submit(new OlmPowerSetupTask(this.olmService, powerSetupInputZtoA)); + this.executor.submit( + new OlmPowerSetupTask(rpcService.getRpc(ServicePowerSetup.class), powerSetupInputZtoA)); ListenableFuture> olmFutures = Futures.allAsList(olmPowerSetupFutureAtoZ, olmPowerSetupFutureZtoA); @@ -522,23 +517,19 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations 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( @@ -567,9 +558,7 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations private List 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) @@ -713,48 +702,32 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations ModelMappingUtils.rendererCreateServiceInputAToZ(serviceName, pathDescription, Action.Delete); ServicePathInputData servicePathInputDataZtoA = ModelMappingUtils.rendererCreateServiceInputZToA(serviceName, pathDescription, Action.Delete); + + ListenableFuture olmPowerTurnDownFutureAtoZ = this.executor.submit( + new OlmPowerTurnDownTask(serviceName, ATOZPATH, servicePathInputDataAtoZ, notification, rpcService)); + + ListenableFuture olmPowerTurnDownFutureZtoA = this.executor.submit( + new OlmPowerTurnDownTask(serviceName, ZTOAPATH, servicePathInputDataZtoA, notification, rpcService)); + + ListenableFuture> olmPowerTurnDownFutures = + Futures.allAsList(olmPowerTurnDownFutureAtoZ, olmPowerTurnDownFutureZtoA); + + List olmRenderingResults; // OLM turn down power try { - LOG.debug(TURNING_DOWN_POWER_ON_A_TO_Z_PATH_MSG); - sendNotifications( - ServicePathNotificationTypes.ServiceDelete, - serviceName, - RpcStatusEx.Pending, - TURNING_DOWN_POWER_ON_A_TO_Z_PATH_MSG); - // TODO add some flag rather than string - if (FAILED.equals( - olmPowerTurndown(servicePathInputDataAtoZ) - .getResult())) { - LOG.error("Service power turndown failed on A-to-Z path for service {}!", serviceName); - sendNotifications( - ServicePathNotificationTypes.ServiceDelete, - serviceName, - RpcStatusEx.Failed, - "Service power turndown failed on A-to-Z path for service"); - return false; - } - LOG.debug("Turning down power on Z-to-A path"); - sendNotifications( - ServicePathNotificationTypes.ServiceDelete, - serviceName, - RpcStatusEx.Pending, - "Turning down power on Z-to-A path"); - // TODO add some flag rather than string - if (FAILED.equals( - olmPowerTurndown(servicePathInputDataZtoA) - .getResult())) { - LOG.error("Service power turndown failed on Z-to-A path for service {}!", serviceName); - sendNotifications( - ServicePathNotificationTypes.ServiceDelete, - serviceName, - RpcStatusEx.Failed, - "Service power turndown failed on Z-to-A path for service"); - return false; - } + LOG.info("Waiting for A-Z and Z-A OLM power turn down ..."); + olmRenderingResults = olmPowerTurnDownFutures.get( + Timeouts.OLM_TIMEOUT, TimeUnit.MILLISECONDS + ); } catch (InterruptedException | ExecutionException | TimeoutException e) { LOG.error("Error while turning down power!", e); return false; } + if (!olmRenderingResults.get(0).isSuccess() || !olmRenderingResults.get(1).isSuccess()) { + LOG.error("Error while turning down power!"); + return false; + } + LOG.info("OLM power successfully turned down!"); // delete service path with renderer LOG.info("Deleting service path via renderer"); sendNotifications( @@ -902,9 +875,13 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations String serviceName, RpcStatusEx rpcStatusEx, String message) { - send( - buildNotification(servicePathNotificationTypes, serviceName, rpcStatusEx, message, - null, null, null, null)); + + notification.send( + servicePathNotificationTypes, + serviceName, + rpcStatusEx, + message + ); } /** @@ -924,60 +901,19 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations Link notifLink, Set supportedLinks, String serviceType) { - send( - buildNotification(servicePathNotificationTypes, serviceName, rpcStatusEx, message, - pathDescription, notifLink, supportedLinks, serviceType)); - } - - /** - * Build notification containing path description information. - * @param servicePathNotificationTypes ServicePathNotificationTypes - * @param serviceName String - * @param rpcStatusEx RpcStatusEx - * @param message String - * @param pathDescription PathDescription - * @return notification with RendererRpcResultSp type. - */ - private RendererRpcResultSp buildNotification( - ServicePathNotificationTypes servicePathNotificationTypes, - String serviceName, - RpcStatusEx rpcStatusEx, - String message, - PathDescription pathDescription, - Link notifLink, - Set supportedLinks, - String serviceType) { - RendererRpcResultSpBuilder builder = - new RendererRpcResultSpBuilder() - .setNotificationType(servicePathNotificationTypes).setServiceName(serviceName).setStatus(rpcStatusEx) - .setStatusMessage(message) - .setServiceType(serviceType); - if (pathDescription != null) { - builder - .setAToZDirection(pathDescription.getAToZDirection()) - .setZToADirection(pathDescription.getZToADirection()); - } - if (notifLink != null) { - builder.setLink(notifLink); - } - if (supportedLinks != null) { - builder.setLinkId(supportedLinks); - } - return builder.build(); - } - /** - * Send renderer notification. - * @param notification Notification - */ - private void send(Notification notification) { - try { - LOG.info("Sending notification {}", notification); - notificationPublishService.putNotification(notification); - } catch (InterruptedException e) { - LOG.info("notification offer rejected: ", e); - Thread.currentThread().interrupt(); - } + notification.send( + notification.buildNotification( + servicePathNotificationTypes, + serviceName, + rpcStatusEx, + message, + pathDescription, + notifLink, + supportedLinks, + serviceType + ) + ); } private Link createLinkForNotif(List otnLinkTerminationPoints) {