X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=pkg%2Frmr%2Frmr.go;h=d9ec0f08b33201f6300598e124efbb388ab0ceb0;hb=refs%2Fchanges%2F56%2F11056%2F4;hp=c0366af02a79280e0876b7be93121b71f81ca80e;hpb=b7a743adb64d9a737e505d54fbdbe46777551d06;p=ric-plt%2Fa1.git

diff --git a/pkg/rmr/rmr.go b/pkg/rmr/rmr.go
index c0366af..d9ec0f0 100644
--- a/pkg/rmr/rmr.go
+++ b/pkg/rmr/rmr.go
@@ -29,6 +29,7 @@ import (
 	"net/http"
 	"strconv"
 
+	"gerrit.o-ran-sc.org/r/ric-plt/a1/config"
 	"gerrit.o-ran-sc.org/r/ric-plt/a1/pkg/a1"
 	"gerrit.o-ran-sc.org/r/ric-plt/a1/pkg/models"
 	"gerrit.o-ran-sc.org/r/ric-plt/a1/pkg/policy"
@@ -44,6 +45,7 @@ const (
 	a1EiQueryAllResp  = 20014
 	a1EiCreateJobResp = 20016
 	jobCreationData   = `{"ei_job_id": %s.}`
+	DefaultSubId      = -1
 )
 
 type RmrSender struct {
@@ -52,21 +54,22 @@ type RmrSender struct {
 }
 
 type IRmrSender interface {
-	RmrSendToXapp(httpBodyString string, messagetype int) bool
+	RmrSendToXapp(httpBodyString string, messagetype int, subid int) bool
 }
 
 func NewRMRSender(policyManager *policy.PolicyManager) IRmrSender {
+	config := config.ParseConfiguration()
 	RMRclient := xapp.NewRMRClientWithParams(&xapp.RMRClientParams{
 		StatDesc: "",
 		RmrData: xapp.PortData{
-			//TODO: Read configuration from config file
-			Name:              "",
-			MaxSize:           65534,
-			ThreadType:        0,
-			LowLatency:        false,
-			FastAck:           false,
-			MaxRetryOnFailure: 1,
-			Port:              4561,
+
+			Name:              config.Name,
+			MaxSize:           config.MaxSize,
+			ThreadType:        config.ThreadType,
+			LowLatency:        config.LowLatency,
+			FastAck:           config.FastAck,
+			MaxRetryOnFailure: config.MaxRetryOnFailure,
+			Port:              config.Port,
 		},
 	})
 
@@ -99,11 +102,11 @@ func (rmr *RmrSender) GetRicMessageName(id int) (s string) {
 	return
 }
 
-func (rmr *RmrSender) RmrSendToXapp(httpBodyString string, messagetype int) bool {
+func (rmr *RmrSender) RmrSendToXapp(httpBodyString string, messagetype int, subid int) bool {
 
 	params := &xapp.RMRParams{}
 	params.Mtype = messagetype
-	params.SubId = -1
+	params.SubId = subid
 	params.Xid = ""
 	params.Meid = &xapp.RMRMeid{}
 	params.Src = a1SourceName
@@ -164,7 +167,7 @@ func (rmr *RmrSender) Consume(msg *xapp.RMRParams) (err error) {
 				return err1
 			}
 			a1.Logger.Debug("rmrMessage ", rmrMessage)
-			isSent := rmr.RmrSendToXapp(rmrMessage, a1PolicyRequest)
+			isSent := rmr.RmrSendToXapp(rmrMessage, a1PolicyRequest, int(policytypeid))
 			if isSent {
 				a1.Logger.Debug("rmrSendToXapp : message sent")
 			} else {
@@ -192,7 +195,7 @@ func (rmr *RmrSender) Consume(msg *xapp.RMRParams) (err error) {
 
 		a1.Logger.Debug("response : %+v", string(respByte))
 
-		isSent := rmr.RmrSendToXapp(string(respByte), a1EiQueryAllResp)
+		isSent := rmr.RmrSendToXapp(string(respByte), a1EiQueryAllResp, DefaultSubId)
 		if isSent {
 			a1.Logger.Debug("rmrSendToXapp : message sent")
 		} else {
@@ -241,7 +244,7 @@ func (rmr *RmrSender) Consume(msg *xapp.RMRParams) (err error) {
 			rmrData := fmt.Sprintf(jobCreationData, jobIdStr)
 			a1.Logger.Debug("rmr_Data to send: ", rmrData)
 
-			isSent := rmr.RmrSendToXapp(rmrData, a1EiCreateJobResp)
+			isSent := rmr.RmrSendToXapp(rmrData, a1EiCreateJobResp, DefaultSubId)
 			if isSent {
 				a1.Logger.Debug("rmrSendToXapp : message sent")
 			} else {