X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=servicehandler%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fservicehandler%2Flisteners%2FRendererListenerImpl.java;h=0c76eb001ad3b5dd55864861fa79f94b32e49711;hb=73478a3a5354a2a557520fec6314532bf0ad6a29;hp=38a054917d87801f1532290d3a528d71c88a0885;hpb=28f2a7aea63e35dd31dd883aa796d11838959324;p=transportpce.git diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/RendererListenerImpl.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/RendererListenerImpl.java index 38a054917..0c76eb001 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/RendererListenerImpl.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/RendererListenerImpl.java @@ -10,22 +10,27 @@ package org.opendaylight.transportpce.servicehandler.listeners; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.transportpce.common.OperationResult; +import org.opendaylight.transportpce.common.StringConstants; +import org.opendaylight.transportpce.networkmodel.service.NetworkModelService; import org.opendaylight.transportpce.pce.service.PathComputationService; 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.renderer.rev201125.RendererRpcResultSp; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev201125.TransportpceRendererListener; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210618.RendererRpcResultSp; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210618.TransportpceRendererListener; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210618.renderer.rpc.result.sp.Link; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.servicehandler.rev201125.ServiceRpcResultSh; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.servicehandler.rev201125.ServiceRpcResultShBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.ServiceNotificationTypes; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev181130.State; -import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev181130.AdminStates; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State; +import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.list.Services; +import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev210511.OtnLinkType; 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.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,13 +50,16 @@ public class RendererListenerImpl implements TransportpceRendererListener { private PCEServiceWrapper pceServiceWrapper; private Boolean tempService; private NotificationPublishService notificationPublishService; + private final NetworkModelService networkModelService; + public RendererListenerImpl(PathComputationService pathComputationService, - NotificationPublishService notificationPublishService) { + NotificationPublishService notificationPublishService, NetworkModelService networkModelService) { this.pceServiceWrapper = new PCEServiceWrapper(pathComputationService, notificationPublishService); setServiceInput(null); setTempService(false); this.notificationPublishService = notificationPublishService; + this.networkModelService = networkModelService; } @Override @@ -66,11 +74,11 @@ public class RendererListenerImpl implements TransportpceRendererListener { notification); switch (notifType) { /* service-implementation-request. */ - case 3 : + case 3: onServiceImplementationResult(notification); break; /* service-delete. */ - case 4 : + case 4: onServiceDeleteResult(notification); break; default: @@ -86,37 +94,57 @@ public class RendererListenerImpl implements TransportpceRendererListener { switch (serviceRpcResultSp.getStatus()) { case Successful: LOG.info("Service '{}' deleted !", notification.getServiceName()); + String serviceType = notification.getServiceType(); + switch (serviceType) { + case StringConstants.SERVICE_TYPE_1GE: + case StringConstants.SERVICE_TYPE_10GE: + case StringConstants.SERVICE_TYPE_100GE_M: + Short tribPort = Short.valueOf(notification.getAToZDirection().getMinTribSlot().getValue() + .split("\\.")[0]); + Short minTribSlot = Short.valueOf(notification.getAToZDirection().getMinTribSlot().getValue() + .split("\\.")[1]); + updateOtnTopology(notification.getLink(), true, notification.getServiceType(), + notification.getAToZDirection().getRate(), tribPort, minTribSlot); + break; + case StringConstants.SERVICE_TYPE_OTU4: + case StringConstants.SERVICE_TYPE_OTUC4: + case StringConstants.SERVICE_TYPE_ODU4: + case StringConstants.SERVICE_TYPE_ODUC4: + updateOtnTopology(notification.getLink(), true, notification.getServiceType(), null, null, + null); + break; + default: + break; + } break; case Failed: LOG.error("Renderer service delete failed !"); + Services service = serviceDataStoreOperations.getService(input.getServiceName()).get(); + sendNbiNotification(new PublishNotificationServiceBuilder() + .setServiceName(service.getServiceName()) + .setServiceAEnd(new ServiceAEndBuilder(service.getServiceAEnd()).build()) + .setServiceZEnd(new ServiceZEndBuilder(service.getServiceZEnd()).build()) + .setCommonId(service.getCommonId()) + .setConnectionType(service.getConnectionType()) + .setResponseFailed("Renderer service delete failed !") + .setMessage("ServiceDelete request failed ...") + .setOperationalState(service.getOperationalState()) + .setTopic(TOPIC) + .build()); return; - case Pending: - LOG.warn("Renderer service delete returned a Penging RpcStatusEx code!"); + case Pending: + LOG.warn("Renderer service delete returned a Pending RpcStatusEx code!"); return; default: LOG.error("Renderer service delete returned an unknown RpcStatusEx code!"); return; } - Services service = serviceDataStoreOperations.getService(notification.getServiceName()).get(); - PublishNotificationService nbiNotification = new PublishNotificationServiceBuilder() - .setServiceName(service.getServiceName()) - .setServiceAEnd(new ServiceAEndBuilder(service.getServiceAEnd()).build()) - .setServiceZEnd(new ServiceZEndBuilder(service.getServiceZEnd()).build()) - .setCommonId(service.getCommonId()) - .setConnectionType(service.getConnectionType()) - .setResponseFailed("") - .setMessage("Service deleted !") - .setOperationalState(org.opendaylight.yang.gen.v1.http - .org.openroadm.common.state.types.rev181130.State.Degraded) - .setTopic(TOPIC) - .build(); - sendNbiNotification(nbiNotification); LOG.info("Service '{}' deleted !", notification.getServiceName()); if (this.input == null) { LOG.error("ServiceInput parameter is null !"); return; } - LOG.info("sending PCE cancel resource reserve for '{}'", this.input.getServiceName()); + LOG.info("sending PCE cancel resource reserve for '{}'", this.input.getServiceName()); this.pceServiceWrapper.cancelPCEResource(this.input.getServiceName(), ServiceNotificationTypes.ServiceDeleteResult); sendServiceHandlerNotification(notification, ServiceNotificationTypes.ServiceDeleteResult); @@ -134,7 +162,7 @@ public class RendererListenerImpl implements TransportpceRendererListener { case Failed: onFailedServiceImplementation(notification.getServiceName()); break; - case Pending: + case Pending: LOG.warn("Service Implementation still pending according to RpcStatusEx"); break; default: @@ -149,37 +177,65 @@ public class RendererListenerImpl implements TransportpceRendererListener { */ private void onSuccededServiceImplementation(RendererRpcResultSp notification) { LOG.info("Service implemented !"); - PublishNotificationService nbiNotification = new PublishNotificationServiceBuilder() - .setServiceName(input.getServiceName()) - .setServiceAEnd(new ServiceAEndBuilder(input.getServiceAEnd()).build()) - .setServiceZEnd(new ServiceZEndBuilder(input.getServiceZEnd()).build()) - .setCommonId(input.getCommonId()).setConnectionType(input.getConnectionType()) - .setResponseFailed("") - .setMessage("Service implemented !") - .setOperationalState(org.opendaylight.yang.gen.v1.http - .org.openroadm.common.state.types.rev181130.State.InService) - .setTopic(TOPIC) - .build(); - sendNbiNotification(nbiNotification); if (serviceDataStoreOperations == null) { LOG.debug("serviceDataStoreOperations is null"); return; } - OperationResult operationResult = null; + String serviceType = notification.getServiceType(); + switch (serviceType) { + case StringConstants.SERVICE_TYPE_1GE: + case StringConstants.SERVICE_TYPE_10GE: + case StringConstants.SERVICE_TYPE_100GE_M: + Short tribPort = Short.valueOf(notification.getAToZDirection().getMinTribSlot().getValue() + .split("\\.")[0]); + Short minTribSlot = Short.valueOf(notification.getAToZDirection().getMinTribSlot().getValue() + .split("\\.")[1]); + updateOtnTopology(notification.getLink(), false, notification.getServiceType(), + notification.getAToZDirection().getRate(), tribPort, minTribSlot); + break; + case StringConstants.SERVICE_TYPE_OTU4: + case StringConstants.SERVICE_TYPE_OTUC4: + case StringConstants.SERVICE_TYPE_ODU4: + case StringConstants.SERVICE_TYPE_ODUC4: + updateOtnTopology(notification.getLink(), false, notification.getServiceType(), null, null, null); + break; + default: + break; + } + PublishNotificationServiceBuilder nbiNotificationBuilder = new PublishNotificationServiceBuilder() + .setServiceName(input.getServiceName()) + .setServiceAEnd(new ServiceAEndBuilder(input.getServiceAEnd()).build()) + .setServiceZEnd(new ServiceZEndBuilder(input.getServiceZEnd()).build()) + .setCommonId(input.getCommonId()).setConnectionType(input.getConnectionType()) + .setTopic(TOPIC); + OperationResult operationResult; + String serviceTemp = ""; if (tempService) { operationResult = this.serviceDataStoreOperations.modifyTempService( serviceRpcResultSp.getServiceName(), State.InService, AdminStates.InService); - if (!operationResult.isSuccess()) { - LOG.warn("Temp Service status not updated in datastore !"); - } + serviceTemp = "Temp "; } else { operationResult = this.serviceDataStoreOperations.modifyService( serviceRpcResultSp.getServiceName(), State.InService, AdminStates.InService); - if (!operationResult.isSuccess()) { - LOG.warn("Service status not updated in datastore !"); - } else { + } + if (operationResult.isSuccess()) { + sendNbiNotification(nbiNotificationBuilder + .setResponseFailed("") + .setMessage("Service implemented !") + .setOperationalState(org.opendaylight.yang.gen.v1.http + .org.openroadm.common.state.types.rev181130.State.InService) + .build()); + if (!tempService) { sendServiceHandlerNotification(notification, ServiceNotificationTypes.ServiceCreateResult); } + } else { + LOG.warn("{}Service status not updated in datastore !", serviceTemp); + sendNbiNotification(nbiNotificationBuilder + .setResponseFailed(serviceTemp + "Service status not updated in datastore !") + .setMessage("ServiceCreate request failed ...") + .setOperationalState(org.opendaylight.yang.gen.v1.http + .org.openroadm.common.state.types.rev181130.State.OutOfService) + .build()); } } @@ -202,7 +258,7 @@ public class RendererListenerImpl implements TransportpceRendererListener { notificationPublishService.putNotification( serviceHandlerNotification); } catch (InterruptedException e) { - LOG.warn("Something went wrong while sending notification for sevice {}", + LOG.warn("Something went wrong while sending notification for service {}", serviceRpcResultSp.getServiceName(), e); Thread.currentThread().interrupt(); } @@ -214,23 +270,33 @@ public class RendererListenerImpl implements TransportpceRendererListener { */ private void onFailedServiceImplementation(String serviceName) { LOG.error("Renderer implementation failed !"); + Services service = serviceDataStoreOperations.getService(input.getServiceName()).get(); + sendNbiNotification(new PublishNotificationServiceBuilder() + .setServiceName(service.getServiceName()) + .setServiceAEnd(new ServiceAEndBuilder(service.getServiceAEnd()).build()) + .setServiceZEnd(new ServiceZEndBuilder(service.getServiceZEnd()).build()) + .setCommonId(service.getCommonId()) + .setConnectionType(service.getConnectionType()) + .setResponseFailed("Renderer implementation failed !") + .setMessage("ServiceCreate request failed ...") + .setOperationalState(service.getOperationalState()) + .setTopic(TOPIC) + .build()); OperationResult deleteServicePathOperationResult = this.serviceDataStoreOperations.deleteServicePath(serviceName); if (!deleteServicePathOperationResult.isSuccess()) { LOG.warn("Service path was not removed from datastore!"); } + OperationResult deleteServiceOperationResult; + String serviceType = ""; if (tempService) { - OperationResult deleteServiceOperationResult = - this.serviceDataStoreOperations.deleteTempService(serviceName); - if (!deleteServiceOperationResult.isSuccess()) { - LOG.warn("Temp Service was not removed from datastore!"); - } + deleteServiceOperationResult = this.serviceDataStoreOperations.deleteTempService(serviceName); + serviceType = "Temp "; } else { - OperationResult deleteServiceOperationResult = - this.serviceDataStoreOperations.deleteService(serviceName); - if (!deleteServiceOperationResult.isSuccess()) { - LOG.warn("Service was not removed from datastore!"); - } + deleteServiceOperationResult = this.serviceDataStoreOperations.deleteService(serviceName); + } + if (deleteServiceOperationResult.isSuccess()) { + LOG.warn("{}Service was not removed from datastore!", serviceType); } } @@ -280,4 +346,57 @@ public class RendererListenerImpl implements TransportpceRendererListener { Thread.currentThread().interrupt(); } } + + private void updateOtnTopology(Link link, boolean isDeletion, String serviceType, Uint32 rate, Short portNb, + Short slotNb) { + if (link == null) { + return; + } + OtnLinkType otnLinkType; + switch (serviceType) { + case StringConstants.SERVICE_TYPE_OTU4: + otnLinkType = OtnLinkType.OTU4; + break; + case StringConstants.SERVICE_TYPE_OTUC4: + otnLinkType = OtnLinkType.OTUC4; + break; + case StringConstants.SERVICE_TYPE_ODU4: + otnLinkType = OtnLinkType.ODTU4; + break; + case StringConstants.SERVICE_TYPE_ODUC4: + otnLinkType = OtnLinkType.ODUC4; + break; + default: + otnLinkType = null; + LOG.warn("No otn-link-type corresponds to service-type {}", serviceType); + break; + } + switch (serviceType) { + case StringConstants.SERVICE_TYPE_OTU4: + case StringConstants.SERVICE_TYPE_OTUC4: + case StringConstants.SERVICE_TYPE_ODU4: + case StringConstants.SERVICE_TYPE_ODUC4: + if (isDeletion) { + LOG.info("updating otn-topology removing links"); + this.networkModelService.deleteOtnLinks(link.getATermination().getNodeId(), + link.getATermination().getTpId(), link.getZTermination().getNodeId(), + link.getZTermination().getTpId(), otnLinkType); + } else { + LOG.info("updating otn-topology adding links"); + this.networkModelService.createOtnLinks(link.getATermination().getNodeId(), + link.getATermination().getTpId(), link.getZTermination().getNodeId(), + link.getZTermination().getTpId(), otnLinkType); + } + break; + case StringConstants.SERVICE_TYPE_1GE: + case StringConstants.SERVICE_TYPE_10GE: + case StringConstants.SERVICE_TYPE_100GE_M: + LOG.info("updating otn-topology node tps -tps and tpn pools"); + this.networkModelService.updateOtnLinks(link, rate, portNb, slotNb, isDeletion); + break; + default: + break; + } + } + }