Change version after creation of r2 branch

[ric-plt/e2mgr.git] / E2Manager / handlers / rmrmsghandlers / x2enb_configuration_update_handler.go

diff --git a/E2Manager/handlers/rmrmsghandlers/x2enb_configuration_update_handler.go b/E2Manager/handlers/rmrmsghandlers/x2enb_configuration_update_handler.go
index 152f00a..77a09b3 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/x2enb_configuration_update_handler.go
+++ b/E2Manager/handlers/rmrmsghandlers/x2enb_configuration_update_handler.go
@@ -28,45 +28,58 @@ import (
        "e2mgr/logger"
        "e2mgr/models"
        "e2mgr/rmrCgo"
-       "e2mgr/sessions"
+       "e2mgr/services/rmrsender"
        "unsafe"
 )
 
-type X2EnbConfigurationUpdateHandler struct{}
+type X2EnbConfigurationUpdateHandler struct {
+       logger    *logger.Logger
+       rmrSender *rmrsender.RmrSender
+}
+
+func NewX2EnbConfigurationUpdateHandler(logger *logger.Logger, rmrSender *rmrsender.RmrSender) X2EnbConfigurationUpdateHandler {
+       return X2EnbConfigurationUpdateHandler{
+               logger:    logger,
+               rmrSender: rmrSender,
+       }
+}
 
-func (src X2EnbConfigurationUpdateHandler) Handle(logger *logger.Logger, e2Sessions sessions.E2Sessions, request *models.NotificationRequest,
-       messageChannel chan<- *models.NotificationResponse) {
+func (h X2EnbConfigurationUpdateHandler) Handle(request *models.NotificationRequest) {
 
        var payloadSize C.ulong
        payloadSize = e2pdus.MaxAsn1PackedBufferSize
        packedBuffer := [e2pdus.MaxAsn1PackedBufferSize]C.uchar{}
        errorBuffer := [e2pdus.MaxAsn1PackedBufferSize]C.char{}
-       refinedMessage, err := converters.UnpackX2apPduAndRefine(logger, e2pdus.MaxAsn1CodecAllocationBufferSize , request.Len, request.Payload, e2pdus.MaxAsn1CodecMessageBufferSize )
-       if err != nil {
-               status :=  C.build_pack_x2enb_configuration_update_failure( &payloadSize, &packedBuffer[0], e2pdus.MaxAsn1PackedBufferSize, &errorBuffer[0])
-               if status{
-                       payload := (*[1<<30]byte)(unsafe.Pointer(&packedBuffer))[:payloadSize:payloadSize]
-                       logger.Debugf("#x2enb_configuration_update_handler.Handle - Enb configuration update negative ack message payload: (%d) %02x", len(payload), payload)
-                       response := models.NotificationResponse{RanName:request.RanName, Payload:payload, MgsType: rmrCgo.RIC_ENB_CONFIGURATION_UPDATE_FAILURE}
-                       messageChannel<- &response
-               } else {
-                       logger.Errorf("#x2enb_configuration_update_handler.Handle - failed to build and pack Enb configuration update unsuccessful outcome message. Error: %v", errorBuffer)
-               }
-               logger.Errorf("#x2enb_configuration_update_handler.Handle - unpack failed. Error: %v", err)
-       } else {
-               logger.Infof("#x2enb_configuration_update_handler.Handle - Enb configuration update initiating message received")
-               logger.Debugf("#x2enb_configuration_update_handler.Handle - Enb configuration update initiating message payload: %s", refinedMessage.PduPrint)
 
-               status := C.build_pack_x2enb_configuration_update_ack( &payloadSize, &packedBuffer[0], e2pdus.MaxAsn1PackedBufferSize, &errorBuffer[0])
+       refinedMessage, err := converters.UnpackX2apPduAndRefine(h.logger, e2pdus.MaxAsn1CodecAllocationBufferSize, request.Len, request.Payload, e2pdus.MaxAsn1CodecMessageBufferSize)
+
+       if err != nil {
+               status := C.build_pack_x2enb_configuration_update_failure(&payloadSize, &packedBuffer[0], e2pdus.MaxAsn1PackedBufferSize, &errorBuffer[0])
                if status {
                        payload := (*[1 << 30]byte)(unsafe.Pointer(&packedBuffer))[:payloadSize:payloadSize]
-                       logger.Debugf("#x2enb_configuration_update_handler.Handle - Enb configuration update positive ack message payload: (%d) %02x", len(payload), payload)
-                       response := models.NotificationResponse{RanName: request.RanName, Payload: payload, MgsType: rmrCgo.RIC_ENB_CONFIGURATION_UPDATE_ACK}
-                       messageChannel<- &response
+                       h.logger.Debugf("#x2enb_configuration_update_handler.Handle - Enb configuration update negative ack message payload: (%d) %02x", len(payload), payload)
+                       msg := models.NewRmrMessage(rmrCgo.RIC_ENB_CONFIGURATION_UPDATE_FAILURE, request.RanName, payload)
+                       _ = h.rmrSender.Send(msg)
                } else {
-                       logger.Errorf("#x2enb_configuration_update_handler.Handle - failed to build and pack enb configuration update successful outcome message. Error: %v", errorBuffer)
+                       h.logger.Errorf("#x2enb_configuration_update_handler.Handle - failed to build and pack Enb configuration update unsuccessful outcome message. Error: %v", errorBuffer)
                }
+               h.logger.Errorf("#x2enb_configuration_update_handler.Handle - unpack failed. Error: %v", err)
+
+               printHandlingSetupResponseElapsedTimeInMs(h.logger, "#x2enb_configuration_update_handler.Handle - Summary: Elapsed time for receiving and handling enb configuration update initiating message from E2 terminator", request.StartTime)
+               return
        }
-       printHandlingSetupResponseElapsedTimeInMs(logger, "#x2enb_configuration_update_handler.Handle - Summary: Elapsed time for receiving and handling enb configuration update initiating message from E2 terminator", request.StartTime)
-}
 
+       h.logger.Infof("#x2enb_configuration_update_handler.Handle - Enb configuration update initiating message received")
+       h.logger.Debugf("#x2enb_configuration_update_handler.Handle - Enb configuration update initiating message payload: %s", refinedMessage.PduPrint)
+
+       status := C.build_pack_x2enb_configuration_update_ack(&payloadSize, &packedBuffer[0], e2pdus.MaxAsn1PackedBufferSize, &errorBuffer[0])
+       if status {
+               payload := (*[1 << 30]byte)(unsafe.Pointer(&packedBuffer))[:payloadSize:payloadSize]
+               h.logger.Debugf("#x2enb_configuration_update_handler.Handle - Enb configuration update positive ack message payload: (%d) %02x", len(payload), payload)
+               msg := models.NewRmrMessage(rmrCgo.RIC_ENB_CONFIGURATION_UPDATE_ACK, request.RanName, payload)
+               _ = h.rmrSender.Send(msg)
+       } else {
+               h.logger.Errorf("#x2enb_configuration_update_handler.Handle - failed to build and pack enb configuration update successful outcome message. Error: %v", errorBuffer)
+       }
+       printHandlingSetupResponseElapsedTimeInMs(h.logger, "#x2enb_configuration_update_handler.Handle - Summary: Elapsed time for receiving and handling enb configuration update initiating message from E2 terminator", request.StartTime)
+}