X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=servicehandler%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fservicehandler%2Flisteners%2FPceListenerImpl.java;h=287b386f713a8f924884cd0c131f410e12331b9f;hb=2a29f9ab006d8806f77b1a1e073b478e5351cc5f;hp=1f147942cb6ca1d872b14720ccb087855efb8f35;hpb=1620eec79d1e278f9b6ba0bd9c2c23cce359864e;p=transportpce.git diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/PceListenerImpl.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/PceListenerImpl.java index 1f147942c..287b386f7 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/PceListenerImpl.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/PceListenerImpl.java @@ -16,22 +16,29 @@ import org.opendaylight.transportpce.servicehandler.ModelMappingUtils; import org.opendaylight.transportpce.servicehandler.ServiceInput; import org.opendaylight.transportpce.servicehandler.service.PCEServiceWrapper; import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.ServicePathRpcResult; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.TransportpcePceListener; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.service.path.rpc.result.PathDescription; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.service.path.rpc.result.PathDescriptionBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.PathComputationRequestOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.PathComputationRequestOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.ServicePathRpcResult; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.TransportpcePceListener; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.service.path.rpc.result.PathDescription; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.service.path.rpc.result.PathDescriptionBuilder; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev201125.ServiceImplementationRequestInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev181130.State; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.list.Services; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.RpcStatusEx; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.response.parameters.sp.ResponseParameters; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.response.parameters.sp.ResponseParametersBuilder; +import org.opendaylight.yang.gen.v1.nbi.notifications.rev201130.PublishNotificationService; +import org.opendaylight.yang.gen.v1.nbi.notifications.rev201130.PublishNotificationServiceBuilder; +import org.opendaylight.yang.gen.v1.nbi.notifications.rev201130.notification.service.ServiceAEndBuilder; +import org.opendaylight.yang.gen.v1.nbi.notifications.rev201130.notification.service.ServiceZEndBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class PceListenerImpl implements TransportpcePceListener { private static final Logger LOG = LoggerFactory.getLogger(PceListenerImpl.class); + private static final String TOPIC = "PceListener"; private ServicePathRpcResult servicePathRpcResult; private RendererServiceOperations rendererServiceOperations; @@ -41,6 +48,7 @@ public class PceListenerImpl implements TransportpcePceListener { private Boolean serviceReconfigure; private Boolean tempService; private Boolean serviceFeasiblity; + private NotificationPublishService notificationPublishService; public PceListenerImpl(RendererServiceOperations rendererServiceOperations, PathComputationService pathComputationService, NotificationPublishService notificationPublishService, @@ -52,26 +60,27 @@ public class PceListenerImpl implements TransportpcePceListener { setInput(null); setTempService(false); setServiceFeasiblity(false); + this.notificationPublishService = notificationPublishService; } @Override public void onServicePathRpcResult(ServicePathRpcResult notification) { - if (!compareServicePathRpcResult(notification)) { - servicePathRpcResult = notification; - switch (servicePathRpcResult.getNotificationType().getIntValue()) { - /* path-computation-request. */ - case 1: - onPathComputationResult(notification); - break; - /* cancel-resource-reserve. */ - case 2: - onCancelResourceResult(); - break; - default: - break; - } - } else { + if (compareServicePathRpcResult(notification)) { LOG.warn("ServicePathRpcResult already wired !"); + return; + } + servicePathRpcResult = notification; + switch (servicePathRpcResult.getNotificationType().getIntValue()) { + /* path-computation-request. */ + case 1: + onPathComputationResult(notification); + break; + /* cancel-resource-reserve. */ + case 2: + onCancelResourceResult(); + break; + default: + break; } } @@ -80,20 +89,11 @@ public class PceListenerImpl implements TransportpcePceListener { * @param notification the result notification. */ private void onPathComputationResult(ServicePathRpcResult notification) { - LOG.info("PCE '{}' Notification received : {}",servicePathRpcResult.getNotificationType().getName(), + LOG.info("PCE '{}' Notification received : {}", servicePathRpcResult.getNotificationType().getName(), notification); - if (servicePathRpcResult.getStatus() == RpcStatusEx.Failed) { - LOG.error("PCE path computation failed !"); - return; - } else if (servicePathRpcResult.getStatus() == RpcStatusEx.Pending) { - LOG.warn("PCE path computation returned a Penging RpcStatusEx code!"); - return; - } else if (servicePathRpcResult.getStatus() != RpcStatusEx.Successful) { - LOG.error("PCE path computation returned an unknown RpcStatusEx code!"); + if (!checkStatus(notification)) { return; } - - LOG.info("PCE calculation done OK !"); if (servicePathRpcResult.getPathDescription() == null) { LOG.error("'PathDescription' parameter is null "); return; @@ -124,10 +124,9 @@ public class PceListenerImpl implements TransportpcePceListener { } } ResponseParameters responseParameters = new ResponseParametersBuilder() - .setPathDescription(new org.opendaylight.yang.gen.v1.http.org - .transportpce.b.c._interface.service.types.rev200128 - .response.parameters.sp.response.parameters - .PathDescriptionBuilder(pathDescription).build()) + .setPathDescription(new org.opendaylight.yang.gen.v1.http + .org.transportpce.b.c._interface.service.types.rev200128 + .response.parameters.sp.response.parameters.PathDescriptionBuilder(pathDescription).build()) .build(); PathComputationRequestOutput pceResponse = new PathComputationRequestOutputBuilder() .setResponseParameters(responseParameters).build(); @@ -142,39 +141,110 @@ public class PceListenerImpl implements TransportpcePceListener { this.rendererServiceOperations.serviceImplementation(serviceImplementationRequest); } + /** + * Check status of notification and send nbi notification. + * @param notification ServicePathRpcResult the notification to check. + * @return true is status is Successful, false otherwise. + */ + private boolean checkStatus(ServicePathRpcResult notification) { + PublishNotificationService nbiNotification = getPublishNotificationService(notification); + PublishNotificationServiceBuilder publishNotificationServiceBuilder = new PublishNotificationServiceBuilder( + nbiNotification); + switch (servicePathRpcResult.getStatus()) { + case Failed: + LOG.error("PCE path computation failed !"); + nbiNotification = publishNotificationServiceBuilder.setMessage("ServiceCreate request failed ...") + .setResponseFailed("PCE path computation failed !") + .setOperationalState(State.Degraded).build(); + sendNbiNotification(nbiNotification); + return false; + case Pending: + LOG.warn("PCE path computation returned a Pending RpcStatusEx code!"); + return false; + case Successful: + LOG.info("PCE calculation done OK !"); + return true; + default: + LOG.error("PCE path computation returned an unknown RpcStatusEx code {}", + servicePathRpcResult.getStatus()); + nbiNotification = publishNotificationServiceBuilder.setMessage("ServiceCreate request failed ...") + .setResponseFailed("PCE path computation returned an unknown RpcStatusEx code!") + .setOperationalState(State.Degraded).build(); + sendNbiNotification(nbiNotification); + return false; + } + } + + private PublishNotificationService getPublishNotificationService(ServicePathRpcResult notification) { + PublishNotificationServiceBuilder nbiNotificationBuilder = new PublishNotificationServiceBuilder(); + if (input != null) { + nbiNotificationBuilder.setServiceName(input.getServiceName()) + .setServiceAEnd(new ServiceAEndBuilder(input.getServiceAEnd()).build()) + .setServiceZEnd(new ServiceZEndBuilder(input.getServiceZEnd()).build()) + .setCommonId(input.getCommonId()).setConnectionType(input.getConnectionType()); + } else { + nbiNotificationBuilder.setServiceName(notification.getServiceName()); + } + nbiNotificationBuilder.setTopic(TOPIC); + return nbiNotificationBuilder.build(); + } + /** * Process cancel resource result. */ private void onCancelResourceResult() { - if (servicePathRpcResult.getStatus() == RpcStatusEx.Failed) { - LOG.info("PCE cancel resource failed !"); + if (servicePathRpcResult.getStatus() == RpcStatusEx.Pending) { + LOG.warn("PCE cancel returned a Pending RpcStatusEx code !"); return; - } else if (servicePathRpcResult.getStatus() == RpcStatusEx.Pending) { - LOG.warn("PCE cancel returned a Penging RpcStatusEx code!"); + } else if (servicePathRpcResult.getStatus() != RpcStatusEx.Successful + && servicePathRpcResult.getStatus() != RpcStatusEx.Failed) { + LOG.error("PCE cancel returned an unknown RpcStatusEx code !"); return; - } else if (servicePathRpcResult.getStatus() != RpcStatusEx.Successful) { - LOG.error("PCE cancel returned an unknown RpcStatusEx code!"); + } + Services service = serviceDataStoreOperations.getService(input.getServiceName()).get(); + PublishNotificationServiceBuilder nbiNotificationBuilder = new PublishNotificationServiceBuilder() + .setServiceName(service.getServiceName()) + .setServiceAEnd(new ServiceAEndBuilder(service.getServiceAEnd()).build()) + .setServiceZEnd(new ServiceZEndBuilder(service.getServiceZEnd()).build()) + .setCommonId(service.getCommonId()) + .setConnectionType(service.getConnectionType()) + .setTopic(TOPIC); + if (servicePathRpcResult.getStatus() == RpcStatusEx.Failed) { + LOG.info("PCE cancel resource failed !"); + sendNbiNotification(nbiNotificationBuilder + .setResponseFailed("PCE cancel resource failed !") + .setMessage("ServiceDelete request failed ...") + .setOperationalState(service.getOperationalState()) + .build()); return; } LOG.info("PCE cancel resource done OK !"); OperationResult deleteServicePathOperationResult = this.serviceDataStoreOperations.deleteServicePath(input.getServiceName()); if (!deleteServicePathOperationResult.isSuccess()) { - LOG.warn("Service path was not removed from datastore!"); + LOG.warn("Service path was not removed from datastore !"); } - OperationResult deleteServiceOperationResult = null; + OperationResult deleteServiceOperationResult; + String serviceType = ""; if (tempService) { - deleteServiceOperationResult = - this.serviceDataStoreOperations.deleteTempService(input.getServiceName()); - if (!deleteServiceOperationResult.isSuccess()) { - LOG.warn("Temp Service was not removed from datastore!"); - } + deleteServiceOperationResult = this.serviceDataStoreOperations.deleteTempService(input.getServiceName()); + serviceType = "Temp "; } else { - deleteServiceOperationResult = - this.serviceDataStoreOperations.deleteService(input.getServiceName()); - if (!deleteServiceOperationResult.isSuccess()) { - LOG.warn("Service was not removed from datastore!"); - } + deleteServiceOperationResult = this.serviceDataStoreOperations.deleteService(input.getServiceName()); + } + if (deleteServiceOperationResult.isSuccess()) { + sendNbiNotification(nbiNotificationBuilder + .setResponseFailed("") + .setMessage("Service deleted !") + .setOperationalState(State.Degraded) + .build()); + } else { + LOG.warn("{}Service was not removed from datastore !", serviceType); + sendNbiNotification(nbiNotificationBuilder + .setResponseFailed(serviceType + "Service was not removed from datastore !") + .setMessage("ServiceDelete request failed ...") + .setOperationalState(service.getOperationalState()) + .build()); } /** * if it was an RPC serviceReconfigure, re-launch PCR. @@ -228,4 +298,16 @@ public class PceListenerImpl implements TransportpcePceListener { this.serviceFeasiblity = serviceFeasiblity; } + /** + * Send notification to NBI notification in order to publish message. + * @param service PublishNotificationService + */ + private void sendNbiNotification(PublishNotificationService service) { + try { + notificationPublishService.putNotification(service); + } catch (InterruptedException e) { + LOG.warn("Cannot send notification to nbi", e); + Thread.currentThread().interrupt(); + } + } }