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.rev220118.PathComputationRequestOutput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220118.PathComputationRequestOutputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220118.ServicePathRpcResult;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220118.TransportpcePceListener;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220118.service.path.rpc.result.PathDescription;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220118.service.path.rpc.result.PathDescriptionBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.PathComputationRequestOutputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.ServicePathRpcResult;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.TransportpcePceListener;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.service.path.rpc.result.PathDescription;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.service.path.rpc.result.PathDescriptionBuilder;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceImplementationRequestInput;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State;
import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.list.Services;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.RpcStatusEx;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.response.parameters.sp.ResponseParameters;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.response.parameters.sp.ResponseParametersBuilder;
-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.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.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class PceListenerImpl implements TransportpcePceListener {
+@Component
+public class PceListenerImpl implements TransportpcePceListener, PceListener {
private static final Logger LOG = LoggerFactory.getLogger(PceListenerImpl.class);
private static final String PUBLISHER = "PceListener";
private Boolean serviceFeasiblity;
private NotificationPublishService notificationPublishService;
- public PceListenerImpl(RendererServiceOperations rendererServiceOperations,
- PathComputationService pathComputationService, NotificationPublishService notificationPublishService,
- ServiceDataStoreOperations serviceDataStoreOperations) {
+ @Activate
+ public PceListenerImpl(
+ @Reference RendererServiceOperations rendererServiceOperations,
+ @Reference PathComputationService pathComputationService,
+ @Reference NotificationPublishService notificationPublishService,
+ @Reference ServiceDataStoreOperations serviceDataStoreOperations) {
this.rendererServiceOperations = rendererServiceOperations;
this.pceServiceWrapper = new PCEServiceWrapper(pathComputationService, notificationPublishService);
this.serviceDataStoreOperations = serviceDataStoreOperations;
private void onPathComputationResult(ServicePathRpcResult notification) {
LOG.info("PCE '{}' Notification received : {}", servicePathRpcResult.getNotificationType().getName(),
notification);
+
if (!checkStatus(notification)) {
return;
}
LOG.error("'PathDescription' parameter is null ");
return;
}
- PathDescription pathDescription = new PathDescriptionBuilder()
+ PathDescription pathDescription =
+ new PathDescriptionBuilder()
.setAToZDirection(servicePathRpcResult.getPathDescription().getAToZDirection())
.setZToADirection(servicePathRpcResult.getPathDescription().getZToADirection())
.build();
}
OperationResult operationResult = null;
if (tempService) {
- operationResult = this.serviceDataStoreOperations.createTempService(input.getTempServiceCreateInput());
+ operationResult =
+ this.serviceDataStoreOperations.createTempService(
+ input.getTempServiceCreateInput(), pathDescription);
if (!operationResult.isSuccess()) {
LOG.error("Temp Service not created in datastore !");
}
LOG.error("Service not created in datastore !");
}
}
- ResponseParameters responseParameters = new ResponseParametersBuilder()
- .setPathDescription(new org.opendaylight.yang.gen.v1.http
- .org.transportpce.b.c._interface.service.types.rev220118
- .response.parameters.sp.response.parameters.PathDescriptionBuilder(pathDescription).build())
- .build();
- PathComputationRequestOutput pceResponse = new PathComputationRequestOutputBuilder()
- .setResponseParameters(responseParameters).build();
- OperationResult operationServicePathSaveResult = this.serviceDataStoreOperations
- .createServicePath(input, pceResponse);
- if (!operationServicePathSaveResult.isSuccess()) {
+ if (!this.serviceDataStoreOperations
+ .createServicePath(
+ input,
+ //pceResponse
+ new PathComputationRequestOutputBuilder()
+ .setResponseParameters(
+ new ResponseParametersBuilder()
+ .setPathDescription(
+ new org.opendaylight.yang.gen.v1
+ .http.org.transportpce.b.c._interface.service.types.rev220118
+ .response.parameters.sp.response.parameters
+ .PathDescriptionBuilder(pathDescription)
+ .build())
+ .build())
+ .build())
+ .isSuccess()) {
LOG.error("Service Path not created in datastore !");
}
- ServiceImplementationRequestInput serviceImplementationRequest = ModelMappingUtils
- .createServiceImplementationRequest(input, pathDescription);
+ ServiceImplementationRequestInput serviceImplementationRequest =
+ ModelMappingUtils.createServiceImplementationRequest(input, pathDescription);
LOG.info("Sending serviceImplementation request : {}", serviceImplementationRequest);
this.rendererServiceOperations.serviceImplementation(serviceImplementationRequest);
}
PublishNotificationProcessService nbiNotification = getPublishNotificationProcessService(notification);
PublishNotificationProcessServiceBuilder publishNotificationProcessServiceBuilder =
new PublishNotificationProcessServiceBuilder(nbiNotification);
+ //TODO is it worth to instantiate the 2 variables above if status is 'Pending' or 'Successful' ?
switch (servicePathRpcResult.getStatus()) {
case Failed:
LOG.error("PCE path computation failed !");
}
private PublishNotificationProcessService getPublishNotificationProcessService(ServicePathRpcResult notification) {
- PublishNotificationProcessServiceBuilder nbiNotificationBuilder =
- new PublishNotificationProcessServiceBuilder();
- 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());
+ if (input == null) {
+ return new PublishNotificationProcessServiceBuilder()
+ .setServiceName(notification.getServiceName())
+ .setPublisherName(PUBLISHER)
+ .build();
}
- nbiNotificationBuilder.setPublisherName(PUBLISHER);
- return nbiNotificationBuilder.build();
+ return 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)
+ .build();
}
/**
LOG.error("PCE cancel returned an unknown RpcStatusEx code !");
return;
}
- Services service = serviceDataStoreOperations.getService(input.getServiceName()).get();
- PublishNotificationProcessServiceBuilder nbiNotificationBuilder = new PublishNotificationProcessServiceBuilder()
+ Services service = serviceDataStoreOperations.getService(input.getServiceName()).orElseThrow();
+ PublishNotificationProcessServiceBuilder nbiNotificationBuilder =
+ new PublishNotificationProcessServiceBuilder()
.setServiceName(service.getServiceName())
.setServiceAEnd(new ServiceAEndBuilder(service.getServiceAEnd()).build())
.setServiceZEnd(new ServiceZEndBuilder(service.getServiceZEnd()).build())
.setPublisherName(PUBLISHER);
if (servicePathRpcResult.getStatus() == RpcStatusEx.Failed) {
LOG.info("PCE cancel resource failed !");
- sendNbiNotification(nbiNotificationBuilder
+ sendNbiNotification(
+ nbiNotificationBuilder
.setResponseFailed("PCE cancel resource failed !")
.setMessage("ServiceDelete request failed ...")
.setOperationalState(service.getOperationalState())
deleteServiceOperationResult = this.serviceDataStoreOperations.deleteService(input.getServiceName());
}
if (deleteServiceOperationResult.isSuccess()) {
- sendNbiNotification(nbiNotificationBuilder
+ sendNbiNotification(
+ nbiNotificationBuilder
.setResponseFailed("")
.setMessage("Service deleted !")
.setOperationalState(State.Degraded)
.build());
} else {
LOG.warn("{}Service was not removed from datastore !", serviceType);
- sendNbiNotification(nbiNotificationBuilder
+ sendNbiNotification(
+ nbiNotificationBuilder
.setResponseFailed(serviceType + "Service was not removed from datastore !")
.setMessage("ServiceDelete request failed ...")
.setOperationalState(service.getOperationalState())
return true;
}
+ @Override
public void setInput(ServiceInput serviceInput) {
this.input = serviceInput;
}
+ @Override
public void setServiceReconfigure(Boolean serv) {
this.serviceReconfigure = serv;
}
+ @Override
public void setserviceDataStoreOperations(ServiceDataStoreOperations serviceData) {
this.serviceDataStoreOperations = serviceData;
}
+ @Override
public void setTempService(Boolean tempService) {
this.tempService = tempService;
}
+ @Override
public void setServiceFeasiblity(Boolean serviceFeasiblity) {
this.serviceFeasiblity = serviceFeasiblity;
}
Code Review / transportpce.git / blobdiff