X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhandlers%2Frmrmsghandlers%2Fx2_reset_request_notification_handler.go;h=1da87589fdef513fd0e451e444ae6a1bc758b793;hb=7000880c4031e607a2fe36046fd097f486476a84;hp=e1f6841cf4319a374b4d7cd519002872d060ad24;hpb=ffd085dd7f0654b84b163a7bfedd3fa89e7b8a71;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/handlers/rmrmsghandlers/x2_reset_request_notification_handler.go b/E2Manager/handlers/rmrmsghandlers/x2_reset_request_notification_handler.go index e1f6841..1da8758 100644 --- a/E2Manager/handlers/rmrmsghandlers/x2_reset_request_notification_handler.go +++ b/E2Manager/handlers/rmrmsghandlers/x2_reset_request_notification_handler.go @@ -13,79 +13,77 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// + +// This source code is part of the near-RT RIC (RAN Intelligent Controller) +// platform project (RICP). + package rmrmsghandlers -// #cgo CFLAGS: -I../../asn1codec/inc/ -I../../asn1codec/e2ap_engine/ -// #cgo LDFLAGS: -L ../../asn1codec/lib/ -L../../asn1codec/e2ap_engine/ -le2ap_codec -lasncodec +// #cgo CFLAGS: -I../../3rdparty/asn1codec/inc/ -I../../3rdparty/asn1codec/e2ap_engine/ +// #cgo LDFLAGS: -L ../../3rdparty/asn1codec/lib/ -L../../3rdparty/asn1codec/e2ap_engine/ -le2ap_codec -lasncodec // #include // #include import "C" import ( "e2mgr/e2pdus" + "e2mgr/enums" "e2mgr/logger" + "e2mgr/managers" "e2mgr/models" "e2mgr/rmrCgo" + "e2mgr/services" + "e2mgr/services/rmrsender" + "e2mgr/utils" "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities" - "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader" - "unsafe" ) +const ResetRequesLogInfoElapsedTime = "#X2ResetRequestNotificationHandler.Handle - Summary: elapsed time for receiving and handling reset request message from E2 terminator: %f ms" + type X2ResetRequestNotificationHandler struct { - rnibReaderProvider func() reader.RNibReader + logger *logger.Logger + rnibDataService services.RNibDataService + ranStatusChangeManager managers.IRanStatusChangeManager + rmrSender *rmrsender.RmrSender } -func NewX2ResetRequestNotificationHandler(rnibReaderProvider func() reader.RNibReader) X2ResetRequestNotificationHandler { +func NewX2ResetRequestNotificationHandler(logger *logger.Logger, rnibDataService services.RNibDataService, ranStatusChangeManager managers.IRanStatusChangeManager, rmrSender *rmrsender.RmrSender) X2ResetRequestNotificationHandler { return X2ResetRequestNotificationHandler{ - rnibReaderProvider: rnibReaderProvider, + logger: logger, + rnibDataService: rnibDataService, + ranStatusChangeManager: ranStatusChangeManager, + rmrSender: rmrSender, } } -func (src X2ResetRequestNotificationHandler) Handle(logger *logger.Logger, request *models.NotificationRequest, messageChannel chan<- *models.NotificationResponse) { +func (h X2ResetRequestNotificationHandler) Handle(request *models.NotificationRequest) { - logger.Debugf("#X2ResetRequestNotificationHandler.Handle - Ran name: %s", request.RanName) + h.logger.Infof("#X2ResetRequestNotificationHandler.Handle - Ran name: %s", request.RanName) - nb, rNibErr := src.rnibReaderProvider().GetNodeb(request.RanName) + nb, rNibErr := h.rnibDataService.GetNodeb(request.RanName) if rNibErr != nil { - logger.Errorf("#X2ResetRequestNotificationHandler.Handle - failed to retrieve nodeB entity. RanName: %s. Error: %s", request.RanName, rNibErr.Error()) - printHandlingSetupResponseElapsedTimeInMs(logger, "#X2ResetRequestNotificationHandler.Handle - Summary: Elapsed time for receiving and handling reset request message from E2 terminator", request.StartTime) - + h.logger.Errorf("#X2ResetRequestNotificationHandler.Handle - failed to retrieve nodeB entity. RanName: %s. Error: %s", request.RanName, rNibErr.Error()) + h.logger.Infof(ResetRequesLogInfoElapsedTime, utils.ElapsedTime(request.StartTime)) return } - logger.Debugf("#X2ResetRequestNotificationHandler.Handle - nodeB entity retrieved. RanName %s, ConnectionStatus %s", nb.RanName, nb.ConnectionStatus) - if nb.ConnectionStatus == entities.ConnectionStatus_SHUTTING_DOWN { - logger.Warnf("#X2ResetRequestNotificationHandler.Handle - nodeB entity in incorrect state. RanName %s, ConnectionStatus %s", nb.RanName, nb.ConnectionStatus) - printHandlingSetupResponseElapsedTimeInMs(logger, "#X2ResetRequestNotificationHandler.Handle - Summary: Elapsed time for receiving and handling reset request message from E2 terminator", request.StartTime) + h.logger.Debugf("#X2ResetRequestNotificationHandler.Handle - nodeB entity retrieved. RanName %s, ConnectionStatus %s", nb.RanName, nb.ConnectionStatus) + if nb.ConnectionStatus == entities.ConnectionStatus_SHUTTING_DOWN { + h.logger.Warnf("#X2ResetRequestNotificationHandler.Handle - nodeB entity in incorrect state. RanName %s, ConnectionStatus %s", nb.RanName, nb.ConnectionStatus) + h.logger.Infof(ResetRequesLogInfoElapsedTime, utils.ElapsedTime(request.StartTime)) return } if nb.ConnectionStatus != entities.ConnectionStatus_CONNECTED { - logger.Errorf("#X2ResetRequestNotificationHandler.Handle - nodeB entity in incorrect state. RanName %s, ConnectionStatus %s", nb.RanName, nb.ConnectionStatus) - printHandlingSetupResponseElapsedTimeInMs(logger, "#X2ResetRequestNotificationHandler.Handle - Summary: Elapsed time for receiving and handling reset request message from E2 terminator", request.StartTime) - + h.logger.Errorf("#X2ResetRequestNotificationHandler.Handle - nodeB entity in incorrect state. RanName %s, ConnectionStatus %s", nb.RanName, nb.ConnectionStatus) + h.logger.Infof(ResetRequesLogInfoElapsedTime, utils.ElapsedTime(request.StartTime)) return } - src.createAndAddToChannel(logger, request, messageChannel) - - //TODO change name of printHandlingSetupResponseElapsedTimeInMs (remove setup response) and move to utils? - printHandlingSetupResponseElapsedTimeInMs(logger, "#X2ResetRequestNotificationHandler.Handle - Summary: Elapsed time for receiving and handling reset request message from E2 terminator", request.StartTime) -} - -func (src X2ResetRequestNotificationHandler) createAndAddToChannel(logger *logger.Logger, request *models.NotificationRequest, messageChannel chan<- *models.NotificationResponse) { - packedBuffer := make([]C.uchar, e2pdus.MaxAsn1PackedBufferSize) - errorBuffer := make([]C.char, e2pdus.MaxAsn1CodecMessageBufferSize) - var payloadSize = C.ulong(e2pdus.MaxAsn1PackedBufferSize) - - if status := C.build_pack_x2reset_response(&payloadSize, &packedBuffer[0], C.ulong(e2pdus.MaxAsn1CodecMessageBufferSize), &errorBuffer[0]); !status { - logger.Errorf("#X2ResetRequestNotificationHandler.createAndAddToChannel - failed to build and pack the reset response message %s ", C.GoString(&errorBuffer[0])) - return - } - payload := C.GoBytes(unsafe.Pointer(&packedBuffer[0]), C.int(payloadSize)) - response := models.NotificationResponse{RanName: request.RanName, Payload: payload, MgsType: rmrCgo.RIC_X2_RESET_RESP} + msg := models.NewRmrMessage(rmrCgo.RIC_X2_RESET_RESP, request.RanName, e2pdus.PackedX2ResetResponse, request.TransactionId, request.GetMsgSrc()) - messageChannel <- &response + _ = h.rmrSender.Send(msg) + h.logger.Infof(ResetRequesLogInfoElapsedTime, utils.ElapsedTime(request.StartTime)) + _ = h.ranStatusChangeManager.Execute(rmrCgo.RAN_RESTARTED, enums.RAN_TO_RIC, nb) }