package org.opendaylight.transportpce.servicehandler.listeners;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
import org.opendaylight.mdsal.binding.api.NotificationPublishService;
import org.opendaylight.transportpce.common.OperationResult;
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.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.networkutils.rev220630.OtnLinkType;
+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.TransportpceRendererListener;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.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.service.types.rev211210.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.http.transportpce.topology.rev210511.OtnLinkType;
-import org.opendaylight.yang.gen.v1.nbi.notifications.rev210628.PublishNotificationService;
-import org.opendaylight.yang.gen.v1.nbi.notifications.rev210628.PublishNotificationServiceBuilder;
-import org.opendaylight.yang.gen.v1.nbi.notifications.rev210628.notification.service.ServiceAEndBuilder;
-import org.opendaylight.yang.gen.v1.nbi.notifications.rev210628.notification.service.ServiceZEndBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.list.Services;
+import org.opendaylight.yang.gen.v1.nbi.notifications.rev211013.PublishNotificationProcessService;
+import org.opendaylight.yang.gen.v1.nbi.notifications.rev211013.PublishNotificationProcessServiceBuilder;
+import org.opendaylight.yang.gen.v1.nbi.notifications.rev211013.notification.process.service.ServiceAEndBuilder;
+import org.opendaylight.yang.gen.v1.nbi.notifications.rev211013.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;
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())
.setResponseFailed("Renderer service delete failed !")
.setMessage("ServiceDelete request failed ...")
.setOperationalState(service.getOperationalState())
- .setTopic(TOPIC)
+ .setPublisherName(PUBLISHER)
.build());
return;
case Pending:
updateOtnTopology(notification, false);
- PublishNotificationServiceBuilder nbiNotificationBuilder = new PublishNotificationServiceBuilder()
+ 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 serviceTemp = "";
if (tempService) {
sendNbiNotification(nbiNotificationBuilder
.setResponseFailed("")
.setMessage("Service implemented !")
- .setOperationalState(org.opendaylight.yang.gen.v1.http
- .org.openroadm.common.state.types.rev181130.State.InService)
+ .setOperationalState(State.InService)
.build());
if (!tempService) {
sendServiceHandlerNotification(notification, ServiceNotificationTypes.ServiceCreateResult);
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)
+ .setOperationalState(State.OutOfService)
.build());
}
}
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())
.setResponseFailed("Renderer implementation failed !")
.setMessage("ServiceCreate request failed ...")
.setOperationalState(service.getOperationalState())
- .setTopic(TOPIC)
+ .setPublisherName(PUBLISHER)
.build());
OperationResult deleteServicePathOperationResult =
this.serviceDataStoreOperations.deleteServicePath(serviceName);
* 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) {
private void updateOtnTopology(RendererRpcResultSp notification, boolean isDeletion) {
Link link = notification.getLink();
- if (link == null) {
+ if (link == null && notification.getLinkId() == null) {
return;
}
-
+ List<String> supportedLinkIds = null;
+ if (notification.getLinkId() != null) {
+ supportedLinkIds = new ArrayList<>(notification.getLinkId());
+ }
String serviceType = notification.getServiceType();
switch (serviceType) {
case StringConstants.SERVICE_TYPE_OTU4:
+ case StringConstants.SERVICE_TYPE_OTUC2:
+ case StringConstants.SERVICE_TYPE_OTUC3:
case StringConstants.SERVICE_TYPE_OTUC4:
case StringConstants.SERVICE_TYPE_ODU4:
+ case StringConstants.SERVICE_TYPE_ODUC2:
+ case StringConstants.SERVICE_TYPE_ODUC3:
case StringConstants.SERVICE_TYPE_ODUC4:
Map<String, OtnLinkType> otnLinkTypeMap = Map.of(
StringConstants.SERVICE_TYPE_OTU4, OtnLinkType.OTU4,
+ // TODO: need to change it when OtnLinkType is updated with enum
+ StringConstants.SERVICE_TYPE_OTUC2, OtnLinkType.OTUC4,
+ StringConstants.SERVICE_TYPE_OTUC3, OtnLinkType.OTUC4,
StringConstants.SERVICE_TYPE_OTUC4, OtnLinkType.OTUC4,
StringConstants.SERVICE_TYPE_ODU4, OtnLinkType.ODTU4,
+ // TODO: need to change it when OtnLinkType is updated with enum
+ StringConstants.SERVICE_TYPE_ODUC2, OtnLinkType.ODUC4,
+ StringConstants.SERVICE_TYPE_ODUC3, OtnLinkType.ODUC4,
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));
+ this.networkModelService.deleteOtnLinks(link, supportedLinkIds, 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));
+ this.networkModelService.createOtnLinks(link, supportedLinkIds, otnLinkTypeMap.get(serviceType));
}
break;
case StringConstants.SERVICE_TYPE_1GE:
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);
+ this.networkModelService.updateOtnLinks(link, supportedLinkIds,
+ notification.getAToZDirection().getRate(), tribPort, minTribSlot, maxTribSlot, isDeletion);
+ break;
+ case StringConstants.SERVICE_TYPE_100GE_S:
+ this.networkModelService.updateOtnLinks(supportedLinkIds, isDeletion);
break;
default:
+ LOG.warn("service-type {} not managed yet", serviceType);
break;
}
}