X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=servicehandler%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fservicehandler%2Fimpl%2FServicehandlerImpl.java;h=07b1bcd73513315bd15fbee79af93bd172600574;hb=2a29f9ab006d8806f77b1a1e073b478e5351cc5f;hp=debb648ee7bc5280ad0455a04683adac7701c66c;hpb=2b6f21e4c36be892feefea1071cd2f393ed967e9;p=transportpce.git diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImpl.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImpl.java index debb648ee..07b1bcd73 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImpl.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImpl.java @@ -8,71 +8,82 @@ package org.opendaylight.transportpce.servicehandler.impl; import com.google.common.util.concurrent.ListenableFuture; - import java.time.OffsetDateTime; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.util.Optional; - -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.transportpce.common.OperationResult; import org.opendaylight.transportpce.common.ResponseCodes; import org.opendaylight.transportpce.pce.service.PathComputationService; -import org.opendaylight.transportpce.renderer.NetworkModelWavelengthService; import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations; import org.opendaylight.transportpce.servicehandler.DowngradeConstraints; import org.opendaylight.transportpce.servicehandler.ModelMappingUtils; import org.opendaylight.transportpce.servicehandler.ServiceInput; +import org.opendaylight.transportpce.servicehandler.listeners.NetworkModelListenerImpl; import org.opendaylight.transportpce.servicehandler.listeners.PceListenerImpl; import org.opendaylight.transportpce.servicehandler.listeners.RendererListenerImpl; import org.opendaylight.transportpce.servicehandler.service.PCEServiceWrapper; import org.opendaylight.transportpce.servicehandler.service.RendererServiceWrapper; import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations; -import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperationsImpl; import org.opendaylight.transportpce.servicehandler.validation.ServiceCreateValidation; import org.opendaylight.transportpce.servicehandler.validation.checks.ComplianceCheckResult; -import org.opendaylight.transportpce.servicehandler.validation.checks.ServicehandlerCompliancyCheck; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev171017.PathComputationRequestOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.RpcActions; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.ServiceNotificationTypes; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.configuration.response.common.ConfigurationResponseCommon; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.sdnc.request.header.SdncRequestHeaderBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.RpcStatus; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.State; -import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev161014.routing.constraints.HardConstraints; -import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev161014.routing.constraints.SoftConstraints; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.EquipmentNotificationInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.EquipmentNotificationOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.NetworkReOptimizationInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.NetworkReOptimizationOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.OrgOpenroadmServiceService; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceCreateInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceCreateOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceDeleteInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceDeleteInputBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceDeleteOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceFeasibilityCheckInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceFeasibilityCheckOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceReconfigureInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceReconfigureOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceRerouteConfirmInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceRerouteConfirmOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceRerouteInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceRerouteOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceRestorationInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceRestorationOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceReversionInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceReversionOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceRollInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceRollOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.TempServiceCreateInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.TempServiceCreateOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.TempServiceDeleteInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.TempServiceDeleteOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.service.delete.input.ServiceDeleteReqInfo.TailRetention; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.service.delete.input.ServiceDeleteReqInfoBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.service.list.Services; +import org.opendaylight.transportpce.servicehandler.validation.checks.ServicehandlerComplianceCheck; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.PathComputationRequestOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.RpcActions; +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.rev190531.configuration.response.common.ConfigurationResponseCommon; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.sdnc.request.header.SdncRequestHeaderBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev181130.State; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev190531.RpcStatus; +import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.routing.constraints.HardConstraints; +import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.routing.constraints.SoftConstraints; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.EquipmentNotificationInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.EquipmentNotificationOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.NetworkReOptimizationInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.NetworkReOptimizationOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.OrgOpenroadmServiceService; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateComplexResultNotificationRequestInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateComplexResultNotificationRequestOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateResultNotificationRequestInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateResultNotificationRequestOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteComplexResultNotificationRequestInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteComplexResultNotificationRequestOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteResultNotificationRequestInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteResultNotificationRequestOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceFeasibilityCheckBulkInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceFeasibilityCheckBulkOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceFeasibilityCheckInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceFeasibilityCheckOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceReconfigureInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceReconfigureOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceRerouteConfirmInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceRerouteConfirmOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceRerouteInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceRerouteOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceRestorationInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceRestorationOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceReversionInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceReversionOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceRollInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceRollOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.TempServiceCreateInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.TempServiceCreateOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.TempServiceDeleteInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.TempServiceDeleteOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.delete.input.ServiceDeleteReqInfo.TailRetention; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.delete.input.ServiceDeleteReqInfoBuilder; +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.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime; import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; @@ -83,8 +94,14 @@ import org.slf4j.LoggerFactory; * Top level service interface providing main OpenROADM controller services. */ public class ServicehandlerImpl implements OrgOpenroadmServiceService { - private static final Logger LOG = LoggerFactory.getLogger(ServicehandlerImpl.class); + private static final String TEMP_SERVICE_CREATE_MSG = "tempServiceCreate: {}"; + private static final String TEMP_SERVICE_DELETE_MSG = "tempServiceDelete: {}"; + private static final String SERVICE_RESTORATION_MSG = "serviceRestoration: {}"; + private static final String SERVICE_RECONFIGURE_MSG = "serviceReconfigure: {}"; + private static final String SERVICE_FEASABILITY_CHECK_MSG = "serviceFeasabilityCheck: {}"; + private static final String SERVICE_DELETE_MSG = "serviceDelete: {}"; + private static final String SERVICE_CREATE_MSG = "serviceCreate: {}"; private DataBroker db; private ServiceDataStoreOperations serviceDataStoreOperations; @@ -92,32 +109,73 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { private RendererServiceWrapper rendererServiceWrapper; private PceListenerImpl pceListenerImpl; private RendererListenerImpl rendererListenerImpl; + private NetworkModelListenerImpl networkModelListenerImpl; + private NotificationPublishService notificationPublishService; + private final String topic; //TODO: remove private request fields as they are in global scope public ServicehandlerImpl(DataBroker databroker, PathComputationService pathComputationService, RendererServiceOperations rendererServiceOperations, NotificationPublishService notificationPublishService, PceListenerImpl pceListenerImpl, RendererListenerImpl rendererListenerImpl, - NetworkModelWavelengthService networkModelWavelengthService) { + NetworkModelListenerImpl networkModelListenerImpl, ServiceDataStoreOperations serviceDataStoreOperations, + String topic) { this.db = databroker; - this.serviceDataStoreOperations = new ServiceDataStoreOperationsImpl(this.db); - this.serviceDataStoreOperations.initialize(); + this.serviceDataStoreOperations = serviceDataStoreOperations; this.pceServiceWrapper = new PCEServiceWrapper(pathComputationService, notificationPublishService); this.rendererServiceWrapper = new RendererServiceWrapper(rendererServiceOperations, notificationPublishService); this.pceListenerImpl = pceListenerImpl; this.rendererListenerImpl = rendererListenerImpl; + this.networkModelListenerImpl = networkModelListenerImpl; + this.notificationPublishService = notificationPublishService; + this.topic = topic; + } + + + // This is class is public so that these messages can be accessed from Junit (avoid duplications). + public static final class LogMessages { + + public static final String PCE_CALLING; + public static final String ABORT_PCE_FAILED; + public static final String PCE_FAILED; + public static final String ABORT_SERVICE_NON_COMPLIANT; + public static final String SERVICE_NON_COMPLIANT; + public static final String RENDERER_DELETE_FAILED; + public static final String ABORT_VALID_FAILED; + + // Static blocks are generated once and spare memory. + static { + PCE_CALLING = "Calling PCE"; + ABORT_PCE_FAILED = "Aborting: PCE calculation failed "; + PCE_FAILED = "PCE calculation failed"; + ABORT_SERVICE_NON_COMPLIANT = "Aborting: non-compliant service "; + SERVICE_NON_COMPLIANT = "non-compliant service"; + RENDERER_DELETE_FAILED = "Renderer service delete failed"; + ABORT_VALID_FAILED = "Aborting: validation of service create request failed"; + } + + public static String serviceNotInDS(String serviceName) { + return "Service '" + serviceName + "' does not exist in datastore"; + } + + public static String serviceInService(String serviceName) { + return "Service '" + serviceName + "' is in 'inService' state"; + } + + private LogMessages() { + } } @Override public ListenableFuture> serviceCreate(ServiceCreateInput input) { - LOG.info("RPC service creation received"); + LOG.info("RPC serviceCreate received"); // Validation OperationResult validationResult = ServiceCreateValidation.validateServiceCreateRequest( new ServiceInput(input), RpcActions.ServiceCreate); if (! validationResult.isSuccess()) { - LOG.warn("Aborting service create because validation of service create request failed: {}", - validationResult.getResultMessage()); - return ModelMappingUtils.createCreateServiceReply(input, ResponseCodes.FINAL_ACK_YES, + LOG.warn(SERVICE_CREATE_MSG, LogMessages.ABORT_VALID_FAILED); + return ModelMappingUtils.createCreateServiceReply( + input, ResponseCodes.FINAL_ACK_YES, validationResult.getResultMessage(), ResponseCodes.RESPONSE_FAILED); } this.pceListenerImpl.setInput(new ServiceInput(input)); @@ -125,94 +183,109 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { this.pceListenerImpl.setserviceDataStoreOperations(this.serviceDataStoreOperations); this.rendererListenerImpl.setserviceDataStoreOperations(serviceDataStoreOperations); this.rendererListenerImpl.setServiceInput(new ServiceInput(input)); - LOG.info("Commencing PCE"); + this.networkModelListenerImpl.setserviceDataStoreOperations(serviceDataStoreOperations); + LOG.debug(SERVICE_CREATE_MSG, LogMessages.PCE_CALLING); PathComputationRequestOutput output = this.pceServiceWrapper.performPCE(input, true); - if (output != null) { - LOG.info("Service compliant, serviceCreate in progress..."); - ConfigurationResponseCommon common = output.getConfigurationResponseCommon(); - return ModelMappingUtils.createCreateServiceReply(input, common.getAckFinalIndicator(), - common.getResponseMessage(), common.getResponseCode()); - } else { + if (output == null) { + LOG.warn(SERVICE_CREATE_MSG, LogMessages.ABORT_PCE_FAILED); + sendNbiNotification(new PublishNotificationServiceBuilder() + .setServiceName(input.getServiceName()) + .setServiceAEnd(new ServiceAEndBuilder(input.getServiceAEnd()).build()) + .setServiceZEnd(new ServiceZEndBuilder(input.getServiceZEnd()).build()) + .setCommonId(input.getCommonId()).setConnectionType(input.getConnectionType()) + .setResponseFailed(LogMessages.ABORT_PCE_FAILED) + .setMessage("ServiceCreate request failed ...") + .setOperationalState(State.Degraded) + .build()); return ModelMappingUtils.createCreateServiceReply(input, ResponseCodes.FINAL_ACK_YES, - "PCE calculation failed", ResponseCodes.RESPONSE_FAILED); + LogMessages.PCE_FAILED, ResponseCodes.RESPONSE_FAILED); } + LOG.info("RPC serviceCreate in progress..."); + ConfigurationResponseCommon common = output.getConfigurationResponseCommon(); + return ModelMappingUtils.createCreateServiceReply( + input, common.getAckFinalIndicator(), + common.getResponseMessage(), common.getResponseCode()); } @Override public ListenableFuture> serviceDelete(ServiceDeleteInput input) { - LOG.info("RPC serviceDelete request received for {}", input.getServiceDeleteReqInfo().getServiceName()); - String message = ""; + String serviceName = input.getServiceDeleteReqInfo().getServiceName(); + LOG.info("RPC serviceDelete request received for {}", serviceName); /* * Upon receipt of service-deleteService RPC, service header and sdnc-request - * header compliancy are verified. + * header compliance are verified. */ - LOG.info("checking Service Compliancy ..."); - ComplianceCheckResult serviceHandlerCheckResult = ServicehandlerCompliancyCheck.check( + ComplianceCheckResult serviceHandlerCheckResult = + ServicehandlerComplianceCheck.check( input.getServiceDeleteReqInfo().getServiceName(), input.getSdncRequestHeader(), null, RpcActions.ServiceDelete, false, true); - if (serviceHandlerCheckResult.hasPassed()) { - LOG.info("Service compliant !"); - } else { - LOG.info("Service is not compliant !"); - return ModelMappingUtils - .createDeleteServiceReply(input, ResponseCodes.FINAL_ACK_YES, - "Service not compliant !", ResponseCodes.RESPONSE_FAILED); + if (!serviceHandlerCheckResult.hasPassed()) { + LOG.warn(SERVICE_DELETE_MSG, LogMessages.ABORT_SERVICE_NON_COMPLIANT); + return ModelMappingUtils.createDeleteServiceReply( + input, ResponseCodes.FINAL_ACK_YES, + LogMessages.SERVICE_NON_COMPLIANT, ResponseCodes.RESPONSE_FAILED); } //Check presence of service to be deleted - String serviceName = input.getServiceDeleteReqInfo().getServiceName(); - LOG.info("serviceName : {}", serviceName); - try { - Optional service = this.serviceDataStoreOperations.getService(serviceName); - if (!service.isPresent()) { - message = "Service '" + serviceName + "' does not exist in datastore"; - LOG.error(message); - return ModelMappingUtils.createDeleteServiceReply(input, ResponseCodes.FINAL_ACK_YES, - message, ResponseCodes.RESPONSE_FAILED); - } - } catch (NullPointerException e) { - LOG.error("failed to get service '{}' from datastore : ", serviceName, e); - message = "Service '" + serviceName + "' does not exist in datastore"; - LOG.error(message); - return ModelMappingUtils.createDeleteServiceReply(input, ResponseCodes.FINAL_ACK_YES, message, - ResponseCodes.RESPONSE_FAILED); + Optional serviceOpt = this.serviceDataStoreOperations.getService(serviceName); + Services service; + if (!serviceOpt.isPresent()) { + LOG.warn(SERVICE_DELETE_MSG, LogMessages.serviceNotInDS(serviceName)); + return ModelMappingUtils.createDeleteServiceReply( + input, ResponseCodes.FINAL_ACK_YES, + LogMessages.serviceNotInDS(serviceName), ResponseCodes.RESPONSE_FAILED); } - LOG.info("Service '{}' present in datastore !", serviceName); + service = serviceOpt.get(); + LOG.debug("serviceDelete: Service '{}' found in datastore", serviceName); this.pceListenerImpl.setInput(new ServiceInput(input)); this.pceListenerImpl.setServiceReconfigure(false); this.pceListenerImpl.setserviceDataStoreOperations(this.serviceDataStoreOperations); this.rendererListenerImpl.setserviceDataStoreOperations(serviceDataStoreOperations); this.rendererListenerImpl.setServiceInput(new ServiceInput(input)); - org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017 - .ServiceDeleteInput serviceDeleteInput = ModelMappingUtils.createServiceDeleteInput( - new ServiceInput(input)); - org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017.ServiceDeleteOutput output = - this.rendererServiceWrapper.performRenderer(serviceDeleteInput, - ServiceNotificationTypes.ServiceDeleteResult); - if (output != null) { - LOG.info("Service present in datastore, service-delete in progress..."); - ConfigurationResponseCommon common = output.getConfigurationResponseCommon(); - return ModelMappingUtils.createDeleteServiceReply(input, common.getAckFinalIndicator(), - common.getResponseMessage(), common.getResponseCode()); - } else { - return ModelMappingUtils.createDeleteServiceReply(input, ResponseCodes.FINAL_ACK_YES, - "Renderer service delete failed !", ResponseCodes.RESPONSE_FAILED); + this.networkModelListenerImpl.setserviceDataStoreOperations(serviceDataStoreOperations); + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev201125 + .ServiceDeleteInput serviceDeleteInput = + ModelMappingUtils.createServiceDeleteInput(new ServiceInput(input)); + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev201125.ServiceDeleteOutput output = + this.rendererServiceWrapper.performRenderer( + serviceDeleteInput, ServiceNotificationTypes.ServiceDeleteResult, service); + + if (output == null) { + LOG.error(SERVICE_DELETE_MSG, LogMessages.RENDERER_DELETE_FAILED); + sendNbiNotification(new PublishNotificationServiceBuilder() + .setServiceName(service.getServiceName()) + .setServiceAEnd(new ServiceAEndBuilder(service.getServiceAEnd()).build()) + .setServiceZEnd(new ServiceZEndBuilder(service.getServiceZEnd()).build()) + .setCommonId(service.getCommonId()).setConnectionType(service.getConnectionType()) + .setMessage("ServiceDelete request failed ...") + .setOperationalState(State.InService) + .setResponseFailed(LogMessages.RENDERER_DELETE_FAILED) + .build()); + return ModelMappingUtils.createDeleteServiceReply( + input, ResponseCodes.FINAL_ACK_YES, + LogMessages.RENDERER_DELETE_FAILED, ResponseCodes.RESPONSE_FAILED); } + + LOG.debug("RPC serviceDelete in progress..."); + ConfigurationResponseCommon common = output.getConfigurationResponseCommon(); + return ModelMappingUtils.createDeleteServiceReply( + input, common.getAckFinalIndicator(), + common.getResponseMessage(), common.getResponseCode()); } @Override public ListenableFuture> serviceFeasibilityCheck( ServiceFeasibilityCheckInput input) { - LOG.info("RPC service feasibility check received"); + LOG.info("RPC serviceFeasibilityCheck received"); // Validation ServiceInput serviceInput = new ServiceInput(input); OperationResult validationResult = ServiceCreateValidation.validateServiceCreateRequest(serviceInput, RpcActions.ServiceFeasibilityCheck); if (! validationResult.isSuccess()) { - LOG.warn("Aborting service feasibility check because validation of service create request failed: {}", - validationResult.getResultMessage()); - return ModelMappingUtils.createCreateServiceReply(input, ResponseCodes.FINAL_ACK_YES, + LOG.warn(SERVICE_FEASABILITY_CHECK_MSG, LogMessages.ABORT_VALID_FAILED); + return ModelMappingUtils.createCreateServiceReply( + input, ResponseCodes.FINAL_ACK_YES, validationResult.getResultMessage(), ResponseCodes.RESPONSE_FAILED); } this.pceListenerImpl.setInput(new ServiceInput(input)); @@ -221,134 +294,144 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { this.pceListenerImpl.setserviceDataStoreOperations(this.serviceDataStoreOperations); this.rendererListenerImpl.setserviceDataStoreOperations(serviceDataStoreOperations); this.rendererListenerImpl.setServiceInput(new ServiceInput(input)); - LOG.info("Commencing PCE"); + this.networkModelListenerImpl.setserviceDataStoreOperations(serviceDataStoreOperations); + LOG.debug(SERVICE_FEASABILITY_CHECK_MSG, LogMessages.PCE_CALLING); PathComputationRequestOutput output = this.pceServiceWrapper.performPCE(input, true); - if (output != null) { - LOG.info("Service compliant, serviceFeasibilityCheck in progress..."); - ConfigurationResponseCommon common = output.getConfigurationResponseCommon(); - return ModelMappingUtils.createCreateServiceReply(input, common.getAckFinalIndicator(), - common.getResponseMessage(), common.getResponseCode()); - } else { + if (output == null) { + LOG.warn(SERVICE_FEASABILITY_CHECK_MSG, LogMessages.ABORT_PCE_FAILED); return ModelMappingUtils.createCreateServiceReply(input, ResponseCodes.FINAL_ACK_YES, - "PCE calculation failed", ResponseCodes.RESPONSE_FAILED); + LogMessages.PCE_FAILED, ResponseCodes.RESPONSE_FAILED); } + LOG.info("RPC serviceFeasibilityCheck in progress..."); + ConfigurationResponseCommon common = output.getConfigurationResponseCommon(); + return ModelMappingUtils.createCreateServiceReply( + input, common.getAckFinalIndicator(), + common.getResponseMessage(), common.getResponseCode()); } @Override public ListenableFuture> serviceReconfigure(ServiceReconfigureInput input) { - LOG.info("RPC service reconfigure received"); - String message = ""; - Optional servicesObject = this.serviceDataStoreOperations.getService(input.getServiceName()); - if (servicesObject.isPresent()) { - LOG.info("Service '{}' is present", input.getServiceName()); - OperationResult validationResult = ServiceCreateValidation - .validateServiceCreateRequest(new ServiceInput(input), RpcActions.ServiceReconfigure); - if (!validationResult.isSuccess()) { - LOG.warn("Aborting service reconfigure because validation of service create request failed: {}", - validationResult.getResultMessage()); - return ModelMappingUtils.createCreateServiceReply(input, validationResult.getResultMessage(), - RpcStatus.Failed); - } - this.pceListenerImpl.setInput(new ServiceInput(input)); - this.pceListenerImpl.setServiceReconfigure(true); - this.pceListenerImpl.setserviceDataStoreOperations(this.serviceDataStoreOperations); - this.rendererListenerImpl.setserviceDataStoreOperations(serviceDataStoreOperations); - this.rendererListenerImpl.setServiceInput(new ServiceInput(input)); - org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017 - .ServiceDeleteInput serviceDeleteInput = - ModelMappingUtils.createServiceDeleteInput(new ServiceInput(input)); - org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017 - .ServiceDeleteOutput output = this.rendererServiceWrapper.performRenderer(serviceDeleteInput, - ServiceNotificationTypes.ServiceDeleteResult); - if (output != null) { - LOG.info("Service compliant, service reconfigure in progress..."); - ConfigurationResponseCommon common = output.getConfigurationResponseCommon(); - return ModelMappingUtils.createCreateServiceReply(input, common.getResponseMessage(), - RpcStatus.Successful); - } else { - return ModelMappingUtils.createCreateServiceReply(input, "Renderer service delete failed !", - RpcStatus.Successful); - } - } else { - LOG.error("Service '{}' is not present", input.getServiceName()); - message = "Service '" + input.getServiceName() + "' is not present"; - return ModelMappingUtils.createCreateServiceReply(input, message, RpcStatus.Failed); + String serviceName = input.getServiceName(); + LOG.info("RPC serviceReconfigure received for {}", serviceName); + Optional servicesObject = this.serviceDataStoreOperations.getService(serviceName); + if (!servicesObject.isPresent()) { + LOG.warn(SERVICE_RECONFIGURE_MSG, LogMessages.serviceNotInDS(serviceName)); + return ModelMappingUtils.createCreateServiceReply( + input, + LogMessages.serviceNotInDS(serviceName), RpcStatus.Failed); + } + LOG.debug("Service '{}' found in datastore", serviceName); + OperationResult validationResult = ServiceCreateValidation + .validateServiceCreateRequest(new ServiceInput(input), RpcActions.ServiceReconfigure); + if (!validationResult.isSuccess()) { + LOG.warn(SERVICE_RECONFIGURE_MSG, LogMessages.ABORT_VALID_FAILED); + return ModelMappingUtils.createCreateServiceReply( + input, + validationResult.getResultMessage(), RpcStatus.Failed); + } + this.pceListenerImpl.setInput(new ServiceInput(input)); + this.pceListenerImpl.setServiceReconfigure(true); + this.pceListenerImpl.setserviceDataStoreOperations(this.serviceDataStoreOperations); + this.rendererListenerImpl.setserviceDataStoreOperations(serviceDataStoreOperations); + this.rendererListenerImpl.setServiceInput(new ServiceInput(input)); + this.networkModelListenerImpl.setserviceDataStoreOperations(serviceDataStoreOperations); + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev201125 + .ServiceDeleteInput serviceDeleteInput = + ModelMappingUtils.createServiceDeleteInput(new ServiceInput(input)); + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev201125 + .ServiceDeleteOutput output = this.rendererServiceWrapper.performRenderer(serviceDeleteInput, + ServiceNotificationTypes.ServiceDeleteResult, null); + if (output == null) { + LOG.error(SERVICE_RECONFIGURE_MSG, LogMessages.RENDERER_DELETE_FAILED); + return ModelMappingUtils.createCreateServiceReply( + input, + LogMessages.RENDERER_DELETE_FAILED, RpcStatus.Successful); + //TODO check if RpcStatus.Successful is really expected here } + LOG.info("RPC serviceReconfigure in progress..."); + ConfigurationResponseCommon common = output.getConfigurationResponseCommon(); + return ModelMappingUtils.createCreateServiceReply( + input, + common.getResponseMessage(), RpcStatus.Successful); } @Override public ListenableFuture> serviceRestoration(ServiceRestorationInput input) { - LOG.info("RPC service restoration received"); - String message = ""; String serviceName = input.getServiceName(); + LOG.info("RPC serviceRestoration received for {}", serviceName); Optional servicesObject = this.serviceDataStoreOperations.getService(serviceName); - if (servicesObject.isPresent()) { - Services service = servicesObject.get(); - State state = service.getOperationalState(); - if (state != State.InService) { - ServiceDeleteInputBuilder deleteInputBldr = new ServiceDeleteInputBuilder(); - DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx"); - OffsetDateTime offsetDateTime = OffsetDateTime.now(ZoneOffset.UTC); - DateAndTime datetime = new DateAndTime(dtf.format(offsetDateTime)); - deleteInputBldr.setServiceDeleteReqInfo(new ServiceDeleteReqInfoBuilder() - .setServiceName(serviceName).setDueDate(datetime) - .setTailRetention(TailRetention.No).build()); - SdncRequestHeaderBuilder sdncBuilder = new SdncRequestHeaderBuilder(); - sdncBuilder.setNotificationUrl(service.getSdncRequestHeader().getNotificationUrl()); - sdncBuilder.setRequestId(service.getSdncRequestHeader().getRequestId()); - sdncBuilder.setRequestSystemId(service.getSdncRequestHeader().getRequestSystemId()); - sdncBuilder.setRpcAction(RpcActions.ServiceDelete); - deleteInputBldr.setSdncRequestHeader(sdncBuilder.build()); - ServiceInput serviceInput = new ServiceInput(deleteInputBldr.build()); - serviceInput.setServiceAEnd(service.getServiceAEnd()); - serviceInput.setServiceZEnd(service.getServiceZEnd()); - serviceInput.setConnectionType(service.getConnectionType()); - HardConstraints hardConstraints = service.getHardConstraints(); - if (hardConstraints != null) { - SoftConstraints softConstraints = service.getSoftConstraints(); - if (softConstraints != null) { - LOG.info("converting hard constraints to soft constraints ..."); - serviceInput.setSoftConstraints( - DowngradeConstraints.updateSoftConstraints(hardConstraints, softConstraints)); - serviceInput.setHardConstraints(DowngradeConstraints.downgradeHardConstraints(hardConstraints)); - } else { - LOG.warn("service '{}' SoftConstraints is not set !", serviceName); - serviceInput.setSoftConstraints(DowngradeConstraints.convertToSoftConstraints(hardConstraints)); - serviceInput.setHardConstraints(DowngradeConstraints.downgradeHardConstraints(hardConstraints)); - } - } else { - LOG.warn("service '{}' HardConstraints is not set !", serviceName); - } - this.pceListenerImpl.setInput(serviceInput); - this.pceListenerImpl.setServiceReconfigure(true); - this.pceListenerImpl.setserviceDataStoreOperations(this.serviceDataStoreOperations); - this.rendererListenerImpl.setServiceInput(serviceInput); - this.rendererListenerImpl.setserviceDataStoreOperations(this.serviceDataStoreOperations); - org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017 - .ServiceDeleteInput serviceDeleteInput = ModelMappingUtils.createServiceDeleteInput( - new ServiceInput(deleteInputBldr.build())); - org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017 - .ServiceDeleteOutput output = this.rendererServiceWrapper.performRenderer(serviceDeleteInput, - ServiceNotificationTypes.ServiceDeleteResult); - if (output != null) { - LOG.info("Service present in datastore, service-restore in progress..."); - ConfigurationResponseCommon common = output.getConfigurationResponseCommon(); - return ModelMappingUtils.createRestoreServiceReply(common.getResponseMessage(), - RpcStatus.Successful); - } else { - return ModelMappingUtils.createRestoreServiceReply("Renderer service delete failed !", - RpcStatus.Failed); - } + + if (!servicesObject.isPresent()) { + LOG.warn(SERVICE_RESTORATION_MSG, LogMessages.serviceNotInDS(serviceName)); + return ModelMappingUtils.createRestoreServiceReply( + LogMessages.serviceNotInDS(serviceName), RpcStatus.Failed); + } + + Services service = servicesObject.get(); + State state = service.getOperationalState(); + + if (state == State.InService) { + LOG.error(SERVICE_RESTORATION_MSG, LogMessages.serviceInService(serviceName)); + return ModelMappingUtils.createRestoreServiceReply( + LogMessages.serviceInService(serviceName), RpcStatus.Failed); + } + + DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx"); + OffsetDateTime offsetDateTime = OffsetDateTime.now(ZoneOffset.UTC); + DateAndTime datetime = new DateAndTime(dtf.format(offsetDateTime)); + SdncRequestHeaderBuilder sdncBuilder = new SdncRequestHeaderBuilder() + .setNotificationUrl(service.getSdncRequestHeader().getNotificationUrl()) + .setRequestId(service.getSdncRequestHeader().getRequestId()) + .setRequestSystemId(service.getSdncRequestHeader().getRequestSystemId()) + .setRpcAction(RpcActions.ServiceDelete); + ServiceDeleteInputBuilder deleteInputBldr = new ServiceDeleteInputBuilder() + .setServiceDeleteReqInfo(new ServiceDeleteReqInfoBuilder() + .setServiceName(serviceName) + .setDueDate(datetime) + .setTailRetention(TailRetention.No).build()) + .setSdncRequestHeader(sdncBuilder.build()); + ServiceInput serviceInput = new ServiceInput(deleteInputBldr.build()); + serviceInput.setServiceAEnd(service.getServiceAEnd()); + serviceInput.setServiceZEnd(service.getServiceZEnd()); + serviceInput.setConnectionType(service.getConnectionType()); + HardConstraints hardConstraints = service.getHardConstraints(); + if (hardConstraints == null) { + LOG.warn("service '{}' HardConstraints is not set !", serviceName); + } else { + SoftConstraints softConstraints = service.getSoftConstraints(); + if (softConstraints == null) { + LOG.warn("service '{}' SoftConstraints is not set !", serviceName); + serviceInput.setSoftConstraints(DowngradeConstraints.convertToSoftConstraints(hardConstraints)); + serviceInput.setHardConstraints(DowngradeConstraints.downgradeHardConstraints(hardConstraints)); } else { - LOG.error("Service '{}' is in 'inService' state", input.getServiceName()); - message = "Service '" + input.getServiceName() + "' is in 'inService' state"; - return ModelMappingUtils.createRestoreServiceReply(message, RpcStatus.Failed); + LOG.info("converting hard constraints to soft constraints ..."); + serviceInput.setSoftConstraints( + DowngradeConstraints.updateSoftConstraints(hardConstraints, softConstraints)); + serviceInput.setHardConstraints(DowngradeConstraints.downgradeHardConstraints(hardConstraints)); } - } else { - LOG.error("Service '{}' is not present", input.getServiceName()); - message = "Service '" + input.getServiceName() + "' is not present"; - return ModelMappingUtils.createRestoreServiceReply(message, RpcStatus.Failed); } + this.pceListenerImpl.setInput(serviceInput); + this.pceListenerImpl.setServiceReconfigure(true); + this.pceListenerImpl.setserviceDataStoreOperations(this.serviceDataStoreOperations); + this.rendererListenerImpl.setServiceInput(serviceInput); + this.rendererListenerImpl.setserviceDataStoreOperations(this.serviceDataStoreOperations); + this.networkModelListenerImpl.setserviceDataStoreOperations(serviceDataStoreOperations); + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev201125 + .ServiceDeleteInput serviceDeleteInput = ModelMappingUtils.createServiceDeleteInput( + new ServiceInput(deleteInputBldr.build())); + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev201125 + .ServiceDeleteOutput output = this.rendererServiceWrapper.performRenderer(serviceDeleteInput, + ServiceNotificationTypes.ServiceDeleteResult, null); + if (output == null) { + LOG.error(SERVICE_RESTORATION_MSG, LogMessages.RENDERER_DELETE_FAILED); + return ModelMappingUtils.createRestoreServiceReply( + LogMessages.RENDERER_DELETE_FAILED, RpcStatus.Failed); + } + LOG.info("RPC serviceRestore in progress..."); + ConfigurationResponseCommon common = output.getConfigurationResponseCommon(); + return ModelMappingUtils.createRestoreServiceReply( + common.getResponseMessage(), RpcStatus.Successful); + } @Override @@ -367,54 +450,56 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { @Override public ListenableFuture> serviceReroute(ServiceRerouteInput input) { - LOG.info("RPC service reroute received"); - String message = ""; - Optional servicesObject = this.serviceDataStoreOperations.getService(input.getServiceName()); - if (servicesObject.isPresent()) { - Services service = servicesObject.get(); - ServiceDeleteInputBuilder deleteInputBldr = new ServiceDeleteInputBuilder(); - DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx"); - OffsetDateTime offsetDateTime = OffsetDateTime.now(ZoneOffset.UTC); - DateAndTime datetime = new DateAndTime(dtf.format(offsetDateTime)); - deleteInputBldr.setServiceDeleteReqInfo(new ServiceDeleteReqInfoBuilder() - .setServiceName(input.getServiceName()).setDueDate(datetime) - .setTailRetention(TailRetention.No).build()); - SdncRequestHeaderBuilder sdncBuilder = new SdncRequestHeaderBuilder(); - sdncBuilder.setNotificationUrl(service.getSdncRequestHeader().getNotificationUrl()); - sdncBuilder.setRequestId(service.getSdncRequestHeader().getRequestId()); - sdncBuilder.setRequestSystemId(service.getSdncRequestHeader().getRequestSystemId()); - sdncBuilder.setRpcAction(RpcActions.ServiceDelete); - deleteInputBldr.setSdncRequestHeader(sdncBuilder.build()); - ServiceInput serviceInput = new ServiceInput(deleteInputBldr.build()); - serviceInput.setServiceAEnd(service.getServiceAEnd()); - serviceInput.setServiceZEnd(service.getServiceZEnd()); - serviceInput.setConnectionType(service.getConnectionType()); - this.pceListenerImpl.setInput(serviceInput); - this.pceListenerImpl.setServiceReconfigure(true); - this.pceListenerImpl.setserviceDataStoreOperations(this.serviceDataStoreOperations); - this.rendererListenerImpl.setServiceInput(serviceInput); - this.rendererListenerImpl.setserviceDataStoreOperations(this.serviceDataStoreOperations); - org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017 - .ServiceDeleteInput serviceDeleteInput = ModelMappingUtils.createServiceDeleteInput( - new ServiceInput(deleteInputBldr.build())); - org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017 - .ServiceDeleteOutput output = this.rendererServiceWrapper.performRenderer(serviceDeleteInput, - ServiceNotificationTypes.ServiceDeleteResult); - if (output != null) { - LOG.info("Service present in datastore, service-reroute in progress..."); - ConfigurationResponseCommon common = output.getConfigurationResponseCommon(); - return ModelMappingUtils.createRerouteServiceReply(input, common.getAckFinalIndicator(), - common.getResponseMessage(), RpcStatus.Successful); - } else { - return ModelMappingUtils.createRerouteServiceReply(input, ResponseCodes.FINAL_ACK_YES, - "Renderer service delete failed !", RpcStatus.Failed); - } - } else { - LOG.error("Service '{}' is not present", input.getServiceName()); - message = "Service '" + input.getServiceName() + "' is not present"; - return ModelMappingUtils.createRerouteServiceReply(input, ResponseCodes.FINAL_ACK_NO, message, - RpcStatus.Failed); + String serviceName = input.getServiceName(); + LOG.info("RPC serviceReroute received for {}", serviceName); + Optional servicesObject = this.serviceDataStoreOperations.getService(serviceName); + if (!servicesObject.isPresent()) { + LOG.warn("serviceReroute: {}", LogMessages.serviceNotInDS(serviceName)); + return ModelMappingUtils.createRerouteServiceReply( + input, ResponseCodes.FINAL_ACK_NO, + LogMessages.serviceNotInDS(serviceName), RpcStatus.Failed); + } + Services service = servicesObject.get(); + DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx"); + OffsetDateTime offsetDateTime = OffsetDateTime.now(ZoneOffset.UTC); + DateAndTime datetime = new DateAndTime(dtf.format(offsetDateTime)); + SdncRequestHeaderBuilder sdncBuilder = new SdncRequestHeaderBuilder() + .setNotificationUrl(service.getSdncRequestHeader().getNotificationUrl()) + .setRequestId(service.getSdncRequestHeader().getRequestId()) + .setRequestSystemId(service.getSdncRequestHeader().getRequestSystemId()) + .setRpcAction(RpcActions.ServiceDelete); + ServiceDeleteInputBuilder deleteInputBldr = new ServiceDeleteInputBuilder() + .setServiceDeleteReqInfo(new ServiceDeleteReqInfoBuilder() + .setServiceName(serviceName).setDueDate(datetime) + .setTailRetention(TailRetention.No).build()) + .setSdncRequestHeader(sdncBuilder.build()); + ServiceInput serviceInput = new ServiceInput(deleteInputBldr.build()); + serviceInput.setServiceAEnd(service.getServiceAEnd()); + serviceInput.setServiceZEnd(service.getServiceZEnd()); + serviceInput.setConnectionType(service.getConnectionType()); + this.pceListenerImpl.setInput(serviceInput); + this.pceListenerImpl.setServiceReconfigure(true); + this.pceListenerImpl.setserviceDataStoreOperations(this.serviceDataStoreOperations); + this.rendererListenerImpl.setServiceInput(serviceInput); + this.rendererListenerImpl.setserviceDataStoreOperations(this.serviceDataStoreOperations); + this.networkModelListenerImpl.setserviceDataStoreOperations(serviceDataStoreOperations); + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev201125 + .ServiceDeleteInput serviceDeleteInput = ModelMappingUtils.createServiceDeleteInput( + new ServiceInput(deleteInputBldr.build())); + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev201125 + .ServiceDeleteOutput output = this.rendererServiceWrapper.performRenderer(serviceDeleteInput, + ServiceNotificationTypes.ServiceDeleteResult, null); + if (output == null) { + LOG.error("serviceReroute: {}", LogMessages.RENDERER_DELETE_FAILED); + return ModelMappingUtils.createRerouteServiceReply( + input, ResponseCodes.FINAL_ACK_YES, + LogMessages.RENDERER_DELETE_FAILED, RpcStatus.Failed); } + LOG.info("RPC ServiceReroute in progress..."); + ConfigurationResponseCommon common = output.getConfigurationResponseCommon(); + return ModelMappingUtils.createRerouteServiceReply( + input, common.getAckFinalIndicator(), + common.getResponseMessage(), RpcStatus.Successful); } @Override @@ -438,38 +523,34 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { @Override public ListenableFuture> tempServiceDelete(TempServiceDeleteInput input) { - LOG.info("RPC temp serviceDelete request received for {}", input.getCommonId()); - String message = ""; + String commonId = input.getCommonId(); + LOG.info("RPC temp serviceDelete request received for {}", commonId); /* * Upon receipt of service-deleteService RPC, service header and sdnc-request * header compliancy are verified. */ - LOG.info("checking Service Compliancy ..."); - ComplianceCheckResult serviceHandlerCheckResult = ServicehandlerCompliancyCheck.check(input.getCommonId(), - null, null, RpcActions.ServiceDelete, false, false); - if (serviceHandlerCheckResult.hasPassed()) { - LOG.info("Service compliant !"); - } else { - LOG.info("Service is not compliant !"); - return ModelMappingUtils.createDeleteServiceReply(input, ResponseCodes.FINAL_ACK_YES, - "Service not compliant !", ResponseCodes.RESPONSE_FAILED); + LOG.debug("checking Service Compliance ..."); + ComplianceCheckResult serviceHandlerCheckResult = ServicehandlerComplianceCheck.check( + commonId, null, null, RpcActions.ServiceDelete, false, false + ); + if (!serviceHandlerCheckResult.hasPassed()) { + LOG.warn(TEMP_SERVICE_DELETE_MSG, LogMessages.ABORT_SERVICE_NON_COMPLIANT); + return ModelMappingUtils.createDeleteServiceReply( + input, ResponseCodes.FINAL_ACK_YES, + LogMessages.SERVICE_NON_COMPLIANT, ResponseCodes.RESPONSE_FAILED); } //Check presence of service to be deleted - String commonId = input.getCommonId(); - LOG.info("service common-id : {}", commonId); - try { - Optional service = this.serviceDataStoreOperations.getTempService(commonId); - if (!service.isPresent()) { - message = "Service '" + commonId + "' does not exist in datastore"; - LOG.error(message); - return ModelMappingUtils.createDeleteServiceReply(input, ResponseCodes.FINAL_ACK_YES, - message, ResponseCodes.RESPONSE_FAILED); - } - } catch (NullPointerException e) { - LOG.info("failed to get service '{}' from datastore : ", commonId, e); + LOG.debug("service common-id '{}' is compliant", commonId); + Optional + service = + this.serviceDataStoreOperations.getTempService(commonId); + if (!service.isPresent()) { + LOG.error(TEMP_SERVICE_DELETE_MSG, LogMessages.serviceNotInDS(commonId)); + return ModelMappingUtils.createDeleteServiceReply( + input, ResponseCodes.FINAL_ACK_YES, + LogMessages.serviceNotInDS(commonId), ResponseCodes.RESPONSE_FAILED); } LOG.info("Service '{}' present in datastore !", commonId); @@ -479,34 +560,37 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { this.rendererListenerImpl.setserviceDataStoreOperations(this.serviceDataStoreOperations); this.rendererListenerImpl.setServiceInput(new ServiceInput(input)); this.rendererListenerImpl.setTempService(true); - org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017.ServiceDeleteOutput output = + this.networkModelListenerImpl.setserviceDataStoreOperations(serviceDataStoreOperations); + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev201125.ServiceDeleteOutput output = this.rendererServiceWrapper.performRenderer(input, ServiceNotificationTypes.ServiceDeleteResult); - if (output != null) { - LOG.info("Temp Service present in datastore, service-delete in progress..."); - ConfigurationResponseCommon common = output.getConfigurationResponseCommon(); - return ModelMappingUtils.createDeleteServiceReply(input, common.getAckFinalIndicator(), - common.getResponseMessage(), common.getResponseCode()); - } else { - return ModelMappingUtils.createDeleteServiceReply(input, ResponseCodes.FINAL_ACK_YES, - "Renderer service delete failed !", ResponseCodes.RESPONSE_FAILED); + if (output == null) { + LOG.error(TEMP_SERVICE_DELETE_MSG, LogMessages.RENDERER_DELETE_FAILED); + return ModelMappingUtils.createDeleteServiceReply( + input, ResponseCodes.FINAL_ACK_YES, + LogMessages.RENDERER_DELETE_FAILED, ResponseCodes.RESPONSE_FAILED); } + LOG.info("RPC tempServiceDelete in progress..."); + ConfigurationResponseCommon common = output.getConfigurationResponseCommon(); + return ModelMappingUtils.createDeleteServiceReply( + input, common.getAckFinalIndicator(), + common.getResponseMessage(), common.getResponseCode()); } @Override public ListenableFuture> tempServiceCreate(TempServiceCreateInput input) { - LOG.info("RPC temp service creation received"); + LOG.info("RPC tempServiceCreate received"); // Validation OperationResult validationResult = ServiceCreateValidation.validateServiceCreateRequest( new ServiceInput(input), RpcActions.TempServiceCreate); if (! validationResult.isSuccess()) { - LOG.warn("Aborting service create because validation of service create request failed: {}", - validationResult.getResultMessage()); - return ModelMappingUtils.createCreateServiceReply(input, ResponseCodes.FINAL_ACK_YES, + LOG.warn(TEMP_SERVICE_CREATE_MSG, LogMessages.ABORT_VALID_FAILED); + return ModelMappingUtils.createCreateServiceReply( + input, ResponseCodes.FINAL_ACK_YES, validationResult.getResultMessage(), ResponseCodes.RESPONSE_FAILED); } // Starting service create operation - LOG.info("Commencing PCE"); + LOG.debug(TEMP_SERVICE_CREATE_MSG, LogMessages.PCE_CALLING); this.pceListenerImpl.setInput(new ServiceInput(input)); this.pceListenerImpl.setServiceReconfigure(false); this.pceListenerImpl.setserviceDataStoreOperations(this.serviceDataStoreOperations); @@ -514,17 +598,70 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { this.rendererListenerImpl.setserviceDataStoreOperations(serviceDataStoreOperations); this.rendererListenerImpl.setServiceInput(new ServiceInput(input)); this.rendererListenerImpl.setTempService(true); - this.pceServiceWrapper.performPCE(input, true); + this.networkModelListenerImpl.setserviceDataStoreOperations(serviceDataStoreOperations); PathComputationRequestOutput output = this.pceServiceWrapper.performPCE(input, true); - if (output != null) { - LOG.info("Service compliant, temp serviceCreate in progress..."); - ConfigurationResponseCommon common = output.getConfigurationResponseCommon(); - return ModelMappingUtils.createCreateServiceReply(input, common.getAckFinalIndicator(), - common.getResponseMessage(), common.getResponseCode()); - } else { - return ModelMappingUtils.createCreateServiceReply(input, ResponseCodes.FINAL_ACK_YES, - "PCE calculation failed", ResponseCodes.RESPONSE_FAILED); + if (output == null) { + LOG.warn(TEMP_SERVICE_CREATE_MSG, LogMessages.ABORT_PCE_FAILED); + return ModelMappingUtils.createCreateServiceReply( + input, ResponseCodes.FINAL_ACK_YES, + LogMessages.PCE_FAILED, ResponseCodes.RESPONSE_FAILED); } + LOG.info("RPC tempServiceCreate in progress..."); + ConfigurationResponseCommon common = output.getConfigurationResponseCommon(); + return ModelMappingUtils.createCreateServiceReply( + input, common.getAckFinalIndicator(), + common.getResponseMessage(), common.getResponseCode()); + } + + @Override + public ListenableFuture> serviceDeleteComplexResultNotificationRequest( + ServiceDeleteComplexResultNotificationRequestInput input) { + // TODO Auto-generated method stub + return null; + } + + @Override + public ListenableFuture> serviceCreateResultNotificationRequest( + ServiceCreateResultNotificationRequestInput input) { + // TODO Auto-generated method stub + return null; + } + + @Override + public ListenableFuture> serviceDeleteResultNotificationRequest( + ServiceDeleteResultNotificationRequestInput input) { + // TODO Auto-generated method stub + return null; } + @Override + public ListenableFuture> serviceCreateComplexResultNotificationRequest( + ServiceCreateComplexResultNotificationRequestInput input) { + // TODO Auto-generated method stub + return null; + } + + @Override + public ListenableFuture> serviceFeasibilityCheckBulk( + ServiceFeasibilityCheckBulkInput input) { + // TODO Auto-generated method stub + return null; + } + + /** + * Send notification to NBI notification in order to publish message. + * @param service PublishNotificationService + */ + private void sendNbiNotification(PublishNotificationService service) { + try { + notificationPublishService.putNotification(service); + } catch (InterruptedException e) { + LOG.warn("Cannot send notification to nbi", e); + Thread.currentThread().interrupt(); + } + } }