RIC-194 Setup from RAN: On Routing Manager Failure, return Setup Failure

[ric-plt/e2mgr.git] / E2Manager / services / rmrsender / rmr_sender.go

diff --git a/E2Manager/services/rmrsender/rmr_sender.go b/E2Manager/services/rmrsender/rmr_sender.go
index 10e6a42..5df261d 100644 (file)
--- a/E2Manager/services/rmrsender/rmr_sender.go
+++ b/E2Manager/services/rmrsender/rmr_sender.go
@@ -38,8 +38,22 @@ func NewRmrSender(logger *logger.Logger, messenger rmrCgo.RmrMessenger) *RmrSend
        }
 }
 
+func (r *RmrSender) WhSend(rmrMessage *models.RmrMessage) error {
+       msg := rmrCgo.NewMBuf(rmrMessage.MsgType, len(rmrMessage.Payload), rmrMessage.RanName, &rmrMessage.Payload, &rmrMessage.XAction, rmrMessage.GetMsgSrc())
+
+       _, err := r.messenger.WhSendMsg(msg, true)
+
+       if err != nil {
+               r.logger.Errorf("#RmrSender.WhSend - RAN name: %s , Message type: %d - Failed sending message. Error: %v", rmrMessage.RanName, rmrMessage.MsgType, err)
+               return err
+       }
+
+       r.logger.Infof("#RmrSender.WhSend - RAN name: %s , Message type: %d - Successfully sent RMR message", rmrMessage.RanName, rmrMessage.MsgType)
+       return nil
+}
+
 func (r *RmrSender) Send(rmrMessage *models.RmrMessage) error {
-       msg := rmrCgo.NewMBuf(rmrMessage.MsgType, len(rmrMessage.Payload), rmrMessage.RanName, &rmrMessage.Payload, &rmrMessage.XAction)
+       msg := rmrCgo.NewMBuf(rmrMessage.MsgType, len(rmrMessage.Payload), rmrMessage.RanName, &rmrMessage.Payload, &rmrMessage.XAction, rmrMessage.GetMsgSrc())
 
        _, err := r.messenger.SendMsg(msg, true)
 
@@ -53,7 +67,7 @@ func (r *RmrSender) Send(rmrMessage *models.RmrMessage) error {
 }
 
 func (r *RmrSender) SendWithoutLogs(rmrMessage *models.RmrMessage) error {
-       msg := rmrCgo.NewMBuf(rmrMessage.MsgType, len(rmrMessage.Payload), rmrMessage.RanName, &rmrMessage.Payload, &rmrMessage.XAction)
+       msg := rmrCgo.NewMBuf(rmrMessage.MsgType, len(rmrMessage.Payload), rmrMessage.RanName, &rmrMessage.Payload, &rmrMessage.XAction, rmrMessage.GetMsgSrc())
 
        _, err := r.messenger.SendMsg(msg, false)