X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=E2Manager%2Fservices%2Frmrsender%2Frmr_sender.go;h=10e6a4276b33a9acac0368ee563f09b92633c9d8;hb=efcb4528362460aa2249d319c9752b63bb720fe2;hp=1d832d9bcc5baf639371e9c954b2144cfb569f03;hpb=2c9d450c93e4f0b312a68d39429efb685ec02022;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/services/rmrsender/rmr_sender.go b/E2Manager/services/rmrsender/rmr_sender.go index 1d832d9..10e6a42 100644 --- a/E2Manager/services/rmrsender/rmr_sender.go +++ b/E2Manager/services/rmrsender/rmr_sender.go @@ -28,10 +28,10 @@ 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, @@ -39,10 +39,9 @@ func NewRmrSender(logger *logger.Logger, messenger *rmrCgo.RmrMessenger) *RmrSen } 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) - _, 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 +51,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) + + _, 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 +}