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.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.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;
*/
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;
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
notification);
switch (notifType) {
/* service-implementation-request. */
- case 3 :
+ case 3:
onServiceImplementationResult(notification);
break;
/* service-delete. */
- case 4 :
+ case 4:
onServiceDeleteResult(notification);
break;
default:
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 PublishNotificationProcessServiceBuilder()
+ .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())
+ .setPublisherName(PUBLISHER)
+ .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);
case Failed:
onFailedServiceImplementation(notification.getServiceName());
break;
- case Pending:
+ case Pending:
LOG.warn("Service Implementation still pending according to RpcStatusEx");
break;
default:
*/
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;
+
+ 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())
+ .setPublisherName(PUBLISHER);
+ 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());
}
}
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();
}
*/
private void onFailedServiceImplementation(String serviceName) {
LOG.error("Renderer implementation failed !");
+ Services service = serviceDataStoreOperations.getService(input.getServiceName()).get();
+ sendNbiNotification(new PublishNotificationProcessServiceBuilder()
+ .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())
+ .setPublisherName(PUBLISHER)
+ .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);
}
}
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;
* 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) {
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<String, OtnLinkType> 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;
+ }
+ }
+
}
Code Review / transportpce.git / blobdiff