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=a5674cde5a8e549dbb97e590199789de9dd656ed;hb=27070ce7114dcdb1da7203c54724fa3fe59e7cc3;hp=d71da9f17723d1bf91463716f1af2b2048dfaeb0;hpb=7edbe15f880b5dac740ff19098abf51890011216;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 d71da9f17..a5674cde5 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 @@ -7,6 +7,7 @@ */ package org.opendaylight.transportpce.servicehandler.impl; +import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.common.util.concurrent.ListenableFuture; import java.time.OffsetDateTime; import java.time.ZoneOffset; @@ -14,6 +15,7 @@ import java.time.format.DateTimeFormatter; import java.util.Map; import java.util.Optional; import org.opendaylight.mdsal.binding.api.NotificationPublishService; +import org.opendaylight.mdsal.binding.api.RpcProviderService; import org.opendaylight.transportpce.common.OperationResult; import org.opendaylight.transportpce.common.ResponseCodes; import org.opendaylight.transportpce.pce.service.PathComputationService; @@ -37,82 +39,125 @@ import org.opendaylight.transportpce.servicehandler.validation.checks.Servicehan import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.PathComputationRequestOutput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.PathComputationRerouteRequestOutput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.path.computation.reroute.request.input.EndpointsBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.RpcActions; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.ServiceNotificationTypes; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.configuration.response.common.ConfigurationResponseCommon; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.sdnc.request.header.SdncRequestHeaderBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev230526.RpcActions; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev230526.ServiceNotificationTypes; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev230526.configuration.response.common.ConfigurationResponseCommon; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev230526.sdnc.request.header.SdncRequestHeaderBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State; -import org.opendaylight.yang.gen.v1.http.org.openroadm.operational.mode.catalog.rev211210.operational.mode.catalog.OpenroadmOperationalModes; -import org.opendaylight.yang.gen.v1.http.org.openroadm.operational.mode.catalog.rev211210.operational.mode.catalog.SpecificOperationalModes; -import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.routing.constraints.HardConstraints; -import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.routing.constraints.SoftConstraints; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.AddOpenroadmOperationalModesToCatalogInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.AddOpenroadmOperationalModesToCatalogOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.AddSpecificOperationalModesToCatalogInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.AddSpecificOperationalModesToCatalogOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.EquipmentNotificationInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.EquipmentNotificationOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.NetworkReOptimizationInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.NetworkReOptimizationOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.OpticalTunnelCreateInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.OpticalTunnelCreateOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.OpticalTunnelRequestCancelInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.OpticalTunnelRequestCancelOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.OrgOpenroadmServiceService; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceCreateBulkInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceCreateBulkOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceCreateComplexResultNotificationRequestInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceCreateComplexResultNotificationRequestOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceCreateInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceCreateOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceCreateResultNotificationRequestInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceCreateResultNotificationRequestOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceDeleteComplexResultNotificationRequestInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceDeleteComplexResultNotificationRequestOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceDeleteInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceDeleteInputBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceDeleteOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceDeleteResultNotificationRequestInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceDeleteResultNotificationRequestOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceFeasibilityCheckBulkInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceFeasibilityCheckBulkOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceFeasibilityCheckInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceFeasibilityCheckOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceReconfigureBulkInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceReconfigureBulkOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceReconfigureInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceReconfigureOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceReconfigureResultNotificationRequestInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceReconfigureResultNotificationRequestOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRerouteConfirmInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRerouteConfirmOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRerouteConfirmResultNotificationRequestInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRerouteConfirmResultNotificationRequestOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRerouteInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRerouteOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRestorationInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRestorationOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRestorationResultNotificationRequestInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRestorationResultNotificationRequestOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceReversionInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceReversionOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceReversionResultNotificationRequestInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceReversionResultNotificationRequestOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRollInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRollOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRollResultNotificationRequestInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceRollResultNotificationRequestOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceSrlgGetInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceSrlgGetOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.TempServiceCreateBulkInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.TempServiceCreateBulkOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.TempServiceCreateInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.TempServiceCreateOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.TempServiceDeleteInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.TempServiceDeleteOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.delete.input.ServiceDeleteReqInfo.TailRetention; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.delete.input.ServiceDeleteReqInfoBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.list.Services; +import org.opendaylight.yang.gen.v1.http.org.openroadm.operational.mode.catalog.rev230526.operational.mode.catalog.OpenroadmOperationalModes; +import org.opendaylight.yang.gen.v1.http.org.openroadm.operational.mode.catalog.rev230526.operational.mode.catalog.SpecificOperationalModes; +import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev221209.routing.constraints.HardConstraints; +import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev221209.routing.constraints.SoftConstraints; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.AddOpenroadmOperationalModesToCatalog; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.AddOpenroadmOperationalModesToCatalogInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.AddOpenroadmOperationalModesToCatalogOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.AddSpecificOperationalModesToCatalog; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.AddSpecificOperationalModesToCatalogInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.AddSpecificOperationalModesToCatalogOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.EndTerminalActivationRequest; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.EndTerminalActivationRequestInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.EndTerminalActivationRequestOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.EndTerminalDeactivationRequest; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.EndTerminalDeactivationRequestInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.EndTerminalDeactivationRequestOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.EndTerminalPerformanceInfoRequest; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.EndTerminalPerformanceInfoRequestInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.EndTerminalPerformanceInfoRequestOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.EndTerminalPowerControl; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.EndTerminalPowerControlInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.EndTerminalPowerControlOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.EquipmentNotification; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.EquipmentNotificationInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.EquipmentNotificationOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.NetworkReOptimization; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.NetworkReOptimizationInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.NetworkReOptimizationOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.OpticalTunnelCreate; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.OpticalTunnelCreateInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.OpticalTunnelCreateOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.OpticalTunnelRequestCancel; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.OpticalTunnelRequestCancelInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.OpticalTunnelRequestCancelOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.OrgOpenroadmServiceService; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceCreate; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceCreateBulk; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceCreateBulkInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceCreateBulkOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceCreateComplexResultNotificationRequest; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceCreateComplexResultNotificationRequestInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceCreateComplexResultNotificationRequestOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceCreateInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceCreateOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceCreateResultNotificationRequest; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceCreateResultNotificationRequestInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceCreateResultNotificationRequestOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceDelete; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceDeleteComplexResultNotificationRequest; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceDeleteComplexResultNotificationRequestInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceDeleteComplexResultNotificationRequestOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceDeleteInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceDeleteInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceDeleteOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceDeleteResultNotificationRequest; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceDeleteResultNotificationRequestInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceDeleteResultNotificationRequestOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceFeasibilityCheck; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceFeasibilityCheckBulk; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceFeasibilityCheckBulkInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceFeasibilityCheckBulkOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceFeasibilityCheckInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceFeasibilityCheckOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceReconfigure; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceReconfigureBulk; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceReconfigureBulkInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceReconfigureBulkOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceReconfigureInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceReconfigureOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceReconfigureResultNotificationRequest; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceReconfigureResultNotificationRequestInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceReconfigureResultNotificationRequestOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceReroute; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRerouteConfirm; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRerouteConfirmInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRerouteConfirmOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRerouteConfirmResultNotificationRequest; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRerouteConfirmResultNotificationRequestInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRerouteConfirmResultNotificationRequestOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRerouteInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRerouteOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRestoration; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRestorationInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRestorationOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRestorationResultNotificationRequest; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRestorationResultNotificationRequestInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRestorationResultNotificationRequestOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceReversion; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceReversionInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceReversionOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceReversionResultNotificationRequest; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceReversionResultNotificationRequestInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceReversionResultNotificationRequestOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRoll; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRollInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRollOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRollResultNotificationRequest; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRollResultNotificationRequestInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceRollResultNotificationRequestOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceSrlgGet; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceSrlgGetInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceSrlgGetOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.TempServiceCreate; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.TempServiceCreateBulk; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.TempServiceCreateBulkInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.TempServiceCreateBulkOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.TempServiceCreateInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.TempServiceCreateOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.TempServiceDelete; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.TempServiceDeleteInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.TempServiceDeleteOutput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.delete.input.ServiceDeleteReqInfo.TailRetention; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.delete.input.ServiceDeleteReqInfoBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.list.Services; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev230501.path.description.atoz.direction.AToZ; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev230501.path.description.atoz.direction.AToZKey; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev230501.pce.resource.resource.resource.TerminationPoint; @@ -122,9 +167,12 @@ import org.opendaylight.yang.gen.v1.nbi.notifications.rev211013.PublishNotificat 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.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime; +import org.opendaylight.yangtools.concepts.Registration; +import org.opendaylight.yangtools.yang.binding.Rpc; import org.opendaylight.yangtools.yang.common.RpcResult; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Deactivate; import org.osgi.service.component.annotations.Reference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -155,9 +203,11 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { private NetworkListener networkModelListenerImpl; private NotificationPublishService notificationPublishService; private CatalogDataStoreOperations catalogDataStoreOperations; + private Registration reg; @Activate - public ServicehandlerImpl(@Reference PathComputationService pathComputationService, + public ServicehandlerImpl(@Reference RpcProviderService rpcProviderService, + @Reference PathComputationService pathComputationService, @Reference RendererServiceOperations rendererServiceOperations, @Reference NotificationPublishService notificationPublishService, @Reference PceListener pceListenerImpl, @@ -173,9 +223,16 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { this.pceListenerImpl = pceListenerImpl; this.rendererListenerImpl = rendererListenerImpl; this.networkModelListenerImpl = networkModelListenerImpl; + this.reg = rpcProviderService.registerRpcImplementations(registerRPCs()); LOG.info("ServicehandlerImpl Initiated"); } + @Deactivate + public void close() { + this.reg.close(); + LOG.info("ServicehandlerImpl Closed"); + } + // This is class is public so that these messages can be accessed from Junit (avoid duplications). public static final class LogMessages { @@ -224,7 +281,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { } @Override - public ListenableFuture> serviceCreate(ServiceCreateInput input) { + public final ListenableFuture> serviceCreate(ServiceCreateInput input) { LOG.info("RPC serviceCreate received"); // Validation OperationResult validationResult = ServiceCreateValidation.validateServiceCreateRequest( @@ -280,7 +337,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { } @Override - public ListenableFuture> serviceDelete(ServiceDeleteInput input) { + public final ListenableFuture> serviceDelete(ServiceDeleteInput input) { String serviceName = input.getServiceDeleteReqInfo().getServiceName(); LOG.info("RPC serviceDelete request received for {}", serviceName); @@ -312,7 +369,9 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { LOG.debug("serviceDelete: Service '{}' found in datastore", serviceName); this.pceListenerImpl.setInput(new ServiceInput(input)); this.pceListenerImpl.setServiceReconfigure(false); + this.pceListenerImpl.setTempService(false); this.pceListenerImpl.setserviceDataStoreOperations(this.serviceDataStoreOperations); + this.rendererListenerImpl.setTempService(false); this.rendererListenerImpl.setserviceDataStoreOperations(serviceDataStoreOperations); this.rendererListenerImpl.setServiceInput(new ServiceInput(input)); this.networkModelListenerImpl.setserviceDataStoreOperations(serviceDataStoreOperations); @@ -348,7 +407,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { } @Override - public ListenableFuture> serviceFeasibilityCheck( + public final ListenableFuture> serviceFeasibilityCheck( ServiceFeasibilityCheckInput input) { LOG.info("RPC serviceFeasibilityCheck received"); // Validation @@ -383,7 +442,8 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { } @Override - public ListenableFuture> serviceReconfigure(ServiceReconfigureInput input) { + public final ListenableFuture> serviceReconfigure(ServiceReconfigureInput input) { String serviceName = input.getServiceName(); LOG.info("RPC serviceReconfigure received for {}", serviceName); Optional servicesObject = this.serviceDataStoreOperations.getService(serviceName); @@ -429,7 +489,8 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { } @Override - public ListenableFuture> serviceRestoration(ServiceRestorationInput input) { + public final ListenableFuture> serviceRestoration(ServiceRestorationInput input) { String serviceName = input.getServiceName(); LOG.info("RPC serviceRestoration received for {}", serviceName); Optional servicesObject = this.serviceDataStoreOperations.getService(serviceName); @@ -505,21 +566,21 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { } @Override - public ListenableFuture> + public final ListenableFuture> equipmentNotification(EquipmentNotificationInput input) { // TODO Auto-generated method stub return null; } @Override - public ListenableFuture> + public final ListenableFuture> serviceRerouteConfirm(ServiceRerouteConfirmInput input) { // TODO Auto-generated method stub return null; } @Override - public ListenableFuture> serviceReroute(ServiceRerouteInput input) { + public final ListenableFuture> serviceReroute(ServiceRerouteInput input) { String serviceName = input.getServiceName(); LOG.info("RPC serviceReroute received for {}", serviceName); Optional servicesObject = this.serviceDataStoreOperations.getService(serviceName); @@ -580,26 +641,26 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { } @Override - public ListenableFuture> serviceReversion(ServiceReversionInput input) { + public final ListenableFuture> serviceReversion(ServiceReversionInput input) { // TODO Auto-generated method stub return null; } @Override - public ListenableFuture> serviceRoll(ServiceRollInput input) { + public final ListenableFuture> serviceRoll(ServiceRollInput input) { // TODO Auto-generated method stub return null; } @Override - public ListenableFuture> + public final ListenableFuture> networkReOptimization(NetworkReOptimizationInput input) { // TODO Auto-generated method stub return null; } @Override - public ListenableFuture> tempServiceDelete(TempServiceDeleteInput input) { + public final ListenableFuture> tempServiceDelete(TempServiceDeleteInput input) { String commonId = input.getCommonId(); LOG.info("RPC temp serviceDelete request received for {}", commonId); @@ -620,26 +681,29 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { //Check presence of service to be deleted LOG.debug("service common-id '{}' is compliant", commonId); - Optional - service = + Optional + serviceOpt = this.serviceDataStoreOperations.getTempService(commonId); - if (service.isEmpty()) { + if (serviceOpt.isEmpty()) { 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); this.pceListenerImpl.setInput(new ServiceInput(input)); this.pceListenerImpl.setServiceReconfigure(false); + this.pceListenerImpl.setTempService(true); this.pceListenerImpl.setserviceDataStoreOperations(this.serviceDataStoreOperations); this.rendererListenerImpl.setserviceDataStoreOperations(this.serviceDataStoreOperations); this.rendererListenerImpl.setServiceInput(new ServiceInput(input)); this.rendererListenerImpl.setTempService(true); this.networkModelListenerImpl.setserviceDataStoreOperations(serviceDataStoreOperations); + org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526 + .temp.service.list.Services service = serviceOpt.orElseThrow(); org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceDeleteOutput output = - this.rendererServiceWrapper.performRenderer(input, ServiceNotificationTypes.ServiceDeleteResult); + this.rendererServiceWrapper.performRenderer(input, ServiceNotificationTypes.ServiceDeleteResult, + service); if (output == null) { LOG.error(TEMP_SERVICE_DELETE_MSG, LogMessages.RENDERER_DELETE_FAILED); return ModelMappingUtils.createDeleteServiceReply( @@ -654,7 +718,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { } @Override - public ListenableFuture> tempServiceCreate(TempServiceCreateInput input) { + public final ListenableFuture> tempServiceCreate(TempServiceCreateInput input) { LOG.info("RPC tempServiceCreate received"); // Validation OperationResult validationResult = ServiceCreateValidation.validateServiceCreateRequest( @@ -666,6 +730,14 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { validationResult.getResultMessage(), ResponseCodes.RESPONSE_FAILED); } + //Check any presence of temp-service with the same commonId + String commonId = input.getCommonId(); + if (this.serviceDataStoreOperations.getTempService(commonId).isPresent()) { + LOG.warn(TEMP_SERVICE_CREATE_MSG, LogMessages.serviceInDS("Temp (" + commonId + ")")); + return ModelMappingUtils.createCreateServiceReply(input, ResponseCodes.FINAL_ACK_YES, + LogMessages.serviceInDS("Temp (" + commonId + ")"), ResponseCodes.RESPONSE_FAILED); + } + // Starting service create operation LOG.debug(TEMP_SERVICE_CREATE_MSG, LogMessages.PCE_CALLING); this.pceListenerImpl.setInput(new ServiceInput(input)); @@ -691,7 +763,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { } @Override - public ListenableFuture> serviceDeleteComplexResultNotificationRequest( ServiceDeleteComplexResultNotificationRequestInput input) { // TODO Auto-generated method stub @@ -699,7 +771,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { } @Override - public ListenableFuture> serviceCreateResultNotificationRequest( ServiceCreateResultNotificationRequestInput input) { // TODO Auto-generated method stub @@ -707,7 +779,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { } @Override - public ListenableFuture> serviceDeleteResultNotificationRequest( ServiceDeleteResultNotificationRequestInput input) { // TODO Auto-generated method stub @@ -715,7 +787,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { } @Override - public ListenableFuture> serviceCreateComplexResultNotificationRequest( ServiceCreateComplexResultNotificationRequestInput input) { // TODO Auto-generated method stub @@ -723,89 +795,77 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { } @Override - public ListenableFuture> serviceFeasibilityCheckBulk( + public final 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(PublishNotificationProcessService service) { - try { - notificationPublishService.putNotification(service); - } catch (InterruptedException e) { - LOG.warn("Cannot send notification to nbi", e); - Thread.currentThread().interrupt(); - } - } - - @Override - public ListenableFuture> serviceCreateBulk(ServiceCreateBulkInput input) { + public final ListenableFuture> serviceCreateBulk(ServiceCreateBulkInput input) { // TODO Auto-generated method stub return null; } @Override - public ListenableFuture> tempServiceCreateBulk( + public final ListenableFuture> tempServiceCreateBulk( TempServiceCreateBulkInput input) { // TODO Auto-generated method stub return null; } @Override - public ListenableFuture> serviceRollResultNotificationRequest( - ServiceRollResultNotificationRequestInput input) { + public final ListenableFuture> serviceRollResultNotificationRequest( + ServiceRollResultNotificationRequestInput input) { // TODO Auto-generated method stub return null; } @Override - public ListenableFuture> serviceReconfigureBulk( + public final ListenableFuture> serviceReconfigureBulk( ServiceReconfigureBulkInput input) { // TODO Auto-generated method stub return null; } @Override - public ListenableFuture> + public final ListenableFuture> serviceReconfigureResultNotificationRequest(ServiceReconfigureResultNotificationRequestInput input) { // TODO Auto-generated method stub return null; } @Override - public ListenableFuture> + public final ListenableFuture> serviceRestorationResultNotificationRequest(ServiceRestorationResultNotificationRequestInput input) { // TODO Auto-generated method stub return null; } @Override - public ListenableFuture> + public final ListenableFuture> serviceReversionResultNotificationRequest(ServiceReversionResultNotificationRequestInput input) { // TODO Auto-generated method stub return null; } @Override - public ListenableFuture> + public final ListenableFuture> serviceRerouteConfirmResultNotificationRequest(ServiceRerouteConfirmResultNotificationRequestInput input) { // TODO Auto-generated method stub return null; } @Override - public ListenableFuture> opticalTunnelCreate(OpticalTunnelCreateInput input) { + public final ListenableFuture> opticalTunnelCreate(OpticalTunnelCreateInput input) { // TODO Auto-generated method stub return null; } @Override - public ListenableFuture> opticalTunnelRequestCancel( + public final ListenableFuture> opticalTunnelRequestCancel( OpticalTunnelRequestCancelInput input) { // TODO Auto-generated method stub return null; @@ -821,7 +881,7 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { * @param input AddOpenroadmOperationalModesToCatalogInput to be added to Catalog * @return Result of the request */ - public ListenableFuture> + public final ListenableFuture> addOpenroadmOperationalModesToCatalog(AddOpenroadmOperationalModesToCatalogInput input) { LOG.info("RPC addOpenroadmOperationalModesToCatalog in progress"); @@ -855,8 +915,8 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { * @param input AddSpecificOperationalModesToCatalogInput to be added to Catalog * @return Result of the request */ - public ListenableFuture> addSpecificOperationalModesToCatalog( - AddSpecificOperationalModesToCatalogInput input) { + public final ListenableFuture> + addSpecificOperationalModesToCatalog(AddSpecificOperationalModesToCatalogInput input) { LOG.info("RPC addSpecificOperationalModesToCatalog in progress"); LOG.debug(" Input openSpecificRoadm {}", input); @@ -880,9 +940,97 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { } @Override - public ListenableFuture> serviceSrlgGet(ServiceSrlgGetInput input) { + public final ListenableFuture> serviceSrlgGet(ServiceSrlgGetInput input) { + // TODO Auto-generated method stub + return null; + } + + @Override + public final ListenableFuture> endTerminalPerformanceInfoRequest( + EndTerminalPerformanceInfoRequestInput input) { + // TODO Auto-generated method stub + return null; + } + + @Override + public final ListenableFuture> endTerminalActivationRequest( + EndTerminalActivationRequestInput input) { + // TODO Auto-generated method stub + return null; + } + + @Override + public final ListenableFuture> endTerminalDeactivationRequest( + EndTerminalDeactivationRequestInput input) { + // TODO Auto-generated method stub + return null; + } + + @Override + public final ListenableFuture> endTerminalPowerControl( + EndTerminalPowerControlInput input) { // TODO Auto-generated method stub return null; } + + public Registration getRegisteredRpc() { + return reg; + } + + /** + * Send notification to NBI notification in order to publish message. + * @param service PublishNotificationService + */ + private void sendNbiNotification(PublishNotificationProcessService service) { + try { + notificationPublishService.putNotification(service); + } catch (InterruptedException e) { + LOG.warn("Cannot send notification to nbi", e); + Thread.currentThread().interrupt(); + } + } + + private ImmutableClassToInstanceMap> registerRPCs() { + return ImmutableClassToInstanceMap.>builder() + .put(ServiceCreate.class, this::serviceCreate) + .put(ServiceDelete.class, this::serviceDelete) + .put(ServiceFeasibilityCheck.class, this::serviceFeasibilityCheck) + .put(ServiceReconfigure.class, this::serviceReconfigure) + .put(ServiceRestoration.class, this::serviceRestoration) + .put(EquipmentNotification.class, this::equipmentNotification) + .put(ServiceRerouteConfirm.class, this::serviceRerouteConfirm) + .put(ServiceReroute.class, this::serviceReroute) + .put(ServiceReversion.class, this::serviceReversion) + .put(ServiceRoll.class, this::serviceRoll) + .put(NetworkReOptimization.class, this::networkReOptimization) + .put(TempServiceDelete.class, this::tempServiceDelete) + .put(TempServiceCreate.class, this::tempServiceCreate) + .put(ServiceDeleteComplexResultNotificationRequest.class, + this::serviceDeleteComplexResultNotificationRequest) + .put(ServiceCreateResultNotificationRequest.class, this::serviceCreateResultNotificationRequest) + .put(ServiceDeleteResultNotificationRequest.class, this::serviceDeleteResultNotificationRequest) + .put(ServiceCreateComplexResultNotificationRequest.class, + this::serviceCreateComplexResultNotificationRequest) + .put(ServiceFeasibilityCheckBulk.class, this::serviceFeasibilityCheckBulk) + .put(ServiceCreateBulk.class, this::serviceCreateBulk) + .put(TempServiceCreateBulk.class, this::tempServiceCreateBulk) + .put(ServiceRollResultNotificationRequest.class, this::serviceRollResultNotificationRequest) + .put(ServiceReconfigureBulk.class, this::serviceReconfigureBulk) + .put(ServiceReconfigureResultNotificationRequest.class, this::serviceReconfigureResultNotificationRequest) + .put(ServiceRestorationResultNotificationRequest.class, this::serviceRestorationResultNotificationRequest) + .put(ServiceReversionResultNotificationRequest.class, this::serviceReversionResultNotificationRequest) + .put(ServiceRerouteConfirmResultNotificationRequest.class, + this::serviceRerouteConfirmResultNotificationRequest) + .put(OpticalTunnelCreate.class, this::opticalTunnelCreate) + .put(OpticalTunnelRequestCancel.class, this::opticalTunnelRequestCancel) + .put(AddOpenroadmOperationalModesToCatalog.class, this::addOpenroadmOperationalModesToCatalog) + .put(AddSpecificOperationalModesToCatalog.class, this::addSpecificOperationalModesToCatalog) + .put(ServiceSrlgGet.class, this::serviceSrlgGet) + .put(EndTerminalPerformanceInfoRequest.class, this::endTerminalPerformanceInfoRequest) + .put(EndTerminalActivationRequest.class, this::endTerminalActivationRequest) + .put(EndTerminalDeactivationRequest.class, this::endTerminalDeactivationRequest) + .put(EndTerminalPowerControl.class, this::endTerminalPowerControl) + .build(); + } }