X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=ric-plt%2Fresource-status-manager.git;a=blobdiff_plain;f=RSM%2Fhandlers%2Frmrmsghandlers%2Fresource_status_failure_handler.go;fp=RSM%2Fhandlers%2Frmrmsghandlers%2Fresource_status_failure_handler.go;h=1a035a3f8cc481db80aa41dd41c1b5bc3d0a5a00;hp=5f31c6d8b54b01ca2ed2eae6039efd67dd1e7566;hb=60652d98d51ee23c1eaca2e8bc2bf19c74c57658;hpb=b8d3ff3abf409da49ecab244cd6d2c2124dbce7c diff --git a/RSM/handlers/rmrmsghandlers/resource_status_failure_handler.go b/RSM/handlers/rmrmsghandlers/resource_status_failure_handler.go index 5f31c6d..1a035a3 100644 --- a/RSM/handlers/rmrmsghandlers/resource_status_failure_handler.go +++ b/RSM/handlers/rmrmsghandlers/resource_status_failure_handler.go @@ -28,25 +28,46 @@ import ( ) type ResourceStatusFailureHandler struct { - logger *logger.Logger - unpacker converters.Asn1PduUnpacker + logger *logger.Logger + converter converters.IResourceStatusResponseConverter } -func NewResourceStatusFailureHandler(logger *logger.Logger, unpacker converters.Asn1PduUnpacker) ResourceStatusFailureHandler { +func NewResourceStatusFailureHandler(logger *logger.Logger, converter converters.IResourceStatusResponseConverter) ResourceStatusFailureHandler { return ResourceStatusFailureHandler{ - logger:logger, - unpacker: unpacker, + logger: logger, + converter: converter, } } func (h ResourceStatusFailureHandler) Handle(request *models.RmrRequest) { h.logger.Infof("#ResourceStatusFailureHandler.Handle - RAN name: %s - Received resource status failure notification", request.RanName) - pduAsString, err := h.unpacker.UnpackX2apPduAsString(request.Len, request.Payload, e2pdus.MaxAsn1CodecMessageBufferSize) - if err != nil { - h.logger.Errorf("#ResourceStatusFailureHandler.Handle - unpack failed. Error: %v", err) - } else { - h.logger.Infof("#ResourceStatusFailureHandler.Handle - RAN name: %s - message: %s", request.RanName, pduAsString) + if h.logger.DebugEnabled() { + pduAsString, err := h.converter.UnpackX2apPduAsString(request.Payload, e2pdus.MaxAsn1CodecMessageBufferSize) + if err != nil { + h.logger.Errorf("#ResourceStatusFailureHandler.Handle - RAN name: %s - unpack failed. Error: %v", request.RanName, err) + return + } + h.logger.Debugf("#ResourceStatusFailureHandler.Handle - RAN name: %s - message: %s", request.RanName, pduAsString) } + //response, err := h.converter.Convert(request.Payload) + //if err != nil { + // h.logger.Errorf("#ResourceStatusFailureHandler.Handle - RAN name: %s - unpack failed. Error: %v", request.RanName, err) + // return + //} + // + ///*The RSM creates one measurement per cell*/ + // + //if response.MeasurementInitiationResults == nil { + // h.logger.Infof("#ResourceStatusFailureHandler.Handle - RAN name: %s - ENB1_Measurement_ID: %d, ENB2_Measurement_ID: %d", + // request.RanName, + // response.ENB1_Measurement_ID, + // response.ENB2_Measurement_ID) + //} else { + // h.logger.Infof("#ResourceStatusFailureHandler.Handle - RAN name: %s - ENB1_Measurement_ID: %d, ENB2_Measurement_ID: %d, CellId: %s, FailedReportCharacteristics: %x", + // request.RanName, + // response.ENB1_Measurement_ID, + // response.ENB2_Measurement_ID, + // response.MeasurementInitiationResults[0].CellId, + // response.MeasurementInitiationResults[0].MeasurementFailureCauses[0].MeasurementFailedReportCharacteristics) + //} } - -