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=0a6e6f1e6862469b09f2e7d26183f4aac4cc6a80;hb=274148a8d813140f86e1f9770ba992b072c1a5cd;hp=f09e852e8241af29ff02686275006a3b9a8f46ce;hpb=ffb5a8b2f12b498f367562c06d926e0dd059fb68;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 f09e852e8..0a6e6f1e6 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 @@ -8,24 +8,29 @@ package org.opendaylight.transportpce.servicehandler.listeners; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import java.util.Map; 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.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.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.yang.gen.v1.http.transportpce.topology.rev210511.OtnLinkType; +import org.opendaylight.yang.gen.v1.nbi.notifications.rev210813.PublishNotificationProcessService; +import org.opendaylight.yang.gen.v1.nbi.notifications.rev210813.PublishNotificationProcessServiceBuilder; +import org.opendaylight.yang.gen.v1.nbi.notifications.rev210813.notification.process.service.ServiceAEndBuilder; +import org.opendaylight.yang.gen.v1.nbi.notifications.rev210813.notification.process.service.ServiceZEndBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +42,7 @@ import org.slf4j.LoggerFactory; */ public class RendererListenerImpl implements TransportpceRendererListener { - private static final String TOPIC = "RendererListener"; + private static final String PUBLISHER = "RendererListener"; private static final Logger LOG = LoggerFactory.getLogger(RendererListenerImpl.class); private RendererRpcResultSp serviceRpcResultSp; private ServiceDataStoreOperations serviceDataStoreOperations; @@ -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 @@ -85,12 +93,12 @@ public class RendererListenerImpl implements TransportpceRendererListener { private void onServiceDeleteResult(RendererRpcResultSp notification) { switch (serviceRpcResultSp.getStatus()) { case Successful: - LOG.info("Service '{}' deleted !", notification.getServiceName()); + updateOtnTopology(notification, true); break; case Failed: LOG.error("Renderer service delete failed !"); Services service = serviceDataStoreOperations.getService(input.getServiceName()).get(); - sendNbiNotification(new PublishNotificationServiceBuilder() + sendNbiNotification(new PublishNotificationProcessServiceBuilder() .setServiceName(service.getServiceName()) .setServiceAEnd(new ServiceAEndBuilder(service.getServiceAEnd()).build()) .setServiceZEnd(new ServiceZEndBuilder(service.getServiceZEnd()).build()) @@ -99,7 +107,7 @@ public class RendererListenerImpl implements TransportpceRendererListener { .setResponseFailed("Renderer service delete failed !") .setMessage("ServiceDelete request failed ...") .setOperationalState(service.getOperationalState()) - .setTopic(TOPIC) + .setPublisherName(PUBLISHER) .build()); return; case Pending: @@ -151,18 +159,21 @@ public class RendererListenerImpl implements TransportpceRendererListener { LOG.debug("serviceDataStoreOperations is null"); return; } - PublishNotificationServiceBuilder nbiNotificationBuilder = new PublishNotificationServiceBuilder() + + updateOtnTopology(notification, false); + + PublishNotificationProcessServiceBuilder nbiNotificationBuilder = new PublishNotificationProcessServiceBuilder() .setServiceName(input.getServiceName()) .setServiceAEnd(new ServiceAEndBuilder(input.getServiceAEnd()).build()) .setServiceZEnd(new ServiceZEndBuilder(input.getServiceZEnd()).build()) .setCommonId(input.getCommonId()).setConnectionType(input.getConnectionType()) - .setTopic(TOPIC); + .setPublisherName(PUBLISHER); OperationResult operationResult; - String serviceType = ""; + String serviceTemp = ""; if (tempService) { operationResult = this.serviceDataStoreOperations.modifyTempService( serviceRpcResultSp.getServiceName(), State.InService, AdminStates.InService); - serviceType = "Temp "; + serviceTemp = "Temp "; } else { operationResult = this.serviceDataStoreOperations.modifyService( serviceRpcResultSp.getServiceName(), State.InService, AdminStates.InService); @@ -178,9 +189,9 @@ public class RendererListenerImpl implements TransportpceRendererListener { sendServiceHandlerNotification(notification, ServiceNotificationTypes.ServiceCreateResult); } } else { - LOG.warn("{}Service status not updated in datastore !", serviceType); + LOG.warn("{}Service status not updated in datastore !", serviceTemp); sendNbiNotification(nbiNotificationBuilder - .setResponseFailed(serviceType + "Service status not updated in datastore !") + .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) @@ -220,7 +231,7 @@ 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() + sendNbiNotification(new PublishNotificationProcessServiceBuilder() .setServiceName(service.getServiceName()) .setServiceAEnd(new ServiceAEndBuilder(service.getServiceAEnd()).build()) .setServiceZEnd(new ServiceZEndBuilder(service.getServiceZEnd()).build()) @@ -229,7 +240,7 @@ public class RendererListenerImpl implements TransportpceRendererListener { .setResponseFailed("Renderer implementation failed !") .setMessage("ServiceCreate request failed ...") .setOperationalState(service.getOperationalState()) - .setTopic(TOPIC) + .setPublisherName(PUBLISHER) .build()); OperationResult deleteServicePathOperationResult = this.serviceDataStoreOperations.deleteServicePath(serviceName); @@ -253,19 +264,11 @@ public class RendererListenerImpl implements TransportpceRendererListener { value = "ES_COMPARING_STRINGS_WITH_EQ", justification = "false positives, not strings but real object references comparisons") private Boolean compareServiceRpcResultSp(RendererRpcResultSp notification) { - if (serviceRpcResultSp == null) { - return false; - } - if (serviceRpcResultSp.getNotificationType() != notification.getNotificationType()) { - return false; - } - if (serviceRpcResultSp.getServiceName() != notification.getServiceName()) { - return false; - } - if (serviceRpcResultSp.getStatus() != notification.getStatus()) { - return false; - } - if (serviceRpcResultSp.getStatusMessage() != notification.getStatusMessage()) { + if (serviceRpcResultSp == null + || serviceRpcResultSp.getNotificationType() != notification.getNotificationType() + || serviceRpcResultSp.getServiceName() != notification.getServiceName() + || serviceRpcResultSp.getStatus() != notification.getStatus() + || serviceRpcResultSp.getStatusMessage() != notification.getStatusMessage()) { return false; } return true; @@ -287,7 +290,7 @@ public class RendererListenerImpl implements TransportpceRendererListener { * Send notification to NBI notification in order to publish message. * @param service PublishNotificationService */ - private void sendNbiNotification(PublishNotificationService service) { + private void sendNbiNotification(PublishNotificationProcessService service) { try { notificationPublishService.putNotification(service); } catch (InterruptedException e) { @@ -295,4 +298,53 @@ public class RendererListenerImpl implements TransportpceRendererListener { Thread.currentThread().interrupt(); } } + + + private void updateOtnTopology(RendererRpcResultSp notification, boolean isDeletion) { + Link link = notification.getLink(); + if (link == null) { + return; + } + + String serviceType = notification.getServiceType(); + switch (serviceType) { + case StringConstants.SERVICE_TYPE_OTU4: + case StringConstants.SERVICE_TYPE_OTUC4: + case StringConstants.SERVICE_TYPE_ODU4: + case StringConstants.SERVICE_TYPE_ODUC4: + Map otnLinkTypeMap = Map.of( + StringConstants.SERVICE_TYPE_OTU4, OtnLinkType.OTU4, + StringConstants.SERVICE_TYPE_OTUC4, OtnLinkType.OTUC4, + StringConstants.SERVICE_TYPE_ODU4, OtnLinkType.ODTU4, + StringConstants.SERVICE_TYPE_ODUC4, OtnLinkType.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(), otnLinkTypeMap.get(serviceType)); + } else { + LOG.info("updating otn-topology adding links"); + this.networkModelService.createOtnLinks(link.getATermination().getNodeId(), + link.getATermination().getTpId(), link.getZTermination().getNodeId(), + link.getZTermination().getTpId(), otnLinkTypeMap.get(serviceType)); + } + break; + 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]); + Short maxTribSlot = Short.valueOf(notification.getAToZDirection().getMaxTribSlot().getValue() + .split("\\.")[1]); + LOG.info("updating otn-topology node tps -tps and tpn pools"); + this.networkModelService.updateOtnLinks(link, notification.getAToZDirection().getRate(), + tribPort, minTribSlot, maxTribSlot, isDeletion); + break; + default: + break; + } + } + }