X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=E2Manager%2Fservices%2Frmrsender%2Frmr_sender.go;h=5df261d4dea14672b3081e5eb0ea126a9d5f2320;hb=b3805a9d29e2c7f6f14e3fedfa1ba504f734eea9;hp=1d832d9bcc5baf639371e9c954b2144cfb569f03;hpb=15d3982b5eda43a5b5b9054d7ecb026448c6ca16;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/services/rmrsender/rmr_sender.go b/E2Manager/services/rmrsender/rmr_sender.go
index 1d832d9..5df261d 100644
--- a/E2Manager/services/rmrsender/rmr_sender.go
+++ b/E2Manager/services/rmrsender/rmr_sender.go
@@ -28,21 +28,34 @@ import (
 
 type RmrSender struct {
 	logger    *logger.Logger
-	messenger *rmrCgo.RmrMessenger
+	messenger rmrCgo.RmrMessenger
 }
 
-func NewRmrSender(logger *logger.Logger, messenger *rmrCgo.RmrMessenger) *RmrSender {
+func NewRmrSender(logger *logger.Logger, messenger rmrCgo.RmrMessenger) *RmrSender {
 	return &RmrSender{
 		logger:    logger,
 		messenger: messenger,
 	}
 }
 
+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 {
-	transactionIdByteArr := []byte(rmrMessage.RanName)
-	msg := rmrCgo.NewMBuf(rmrMessage.MsgType, len(rmrMessage.Payload), rmrMessage.RanName, &rmrMessage.Payload, &transactionIdByteArr)
+	msg := rmrCgo.NewMBuf(rmrMessage.MsgType, len(rmrMessage.Payload), rmrMessage.RanName, &rmrMessage.Payload, &rmrMessage.XAction, rmrMessage.GetMsgSrc())
 
-	_, err := (*r.messenger).SendMsg(msg)
+	_, err := r.messenger.SendMsg(msg, true)
 
 	if err != nil {
 		r.logger.Errorf("#RmrSender.Send - RAN name: %s , Message type: %d - Failed sending message. Error: %v", rmrMessage.RanName, rmrMessage.MsgType, err)
@@ -52,3 +65,16 @@ func (r *RmrSender) Send(rmrMessage *models.RmrMessage) error {
 	r.logger.Infof("#RmrSender.Send - RAN name: %s , Message type: %d - Successfully sent RMR message", rmrMessage.RanName, rmrMessage.MsgType)
 	return nil
 }
+
+func (r *RmrSender) SendWithoutLogs(rmrMessage *models.RmrMessage) error {
+	msg := rmrCgo.NewMBuf(rmrMessage.MsgType, len(rmrMessage.Payload), rmrMessage.RanName, &rmrMessage.Payload, &rmrMessage.XAction, rmrMessage.GetMsgSrc())
+
+	_, err := r.messenger.SendMsg(msg, false)
+
+	if err != nil {
+		r.logger.Errorf("#RmrSender.Send - RAN name: %s , Message type: %d - Failed sending message. Error: %v", rmrMessage.RanName, rmrMessage.MsgType, err)
+		return err
+	}
+
+	return nil
+}