X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fteststub%2FcontrolRmrStub.go;h=0f207e833cb0c05e65b1cd81635fa3fcb2471ffa;hb=cd78aeeae3212fa722be4ba9768cac711305badf;hp=a8c861f6c1e3cace3bc5edef7fe261363716ce53;hpb=5f8ffa07163f52d65092d63f5d173149cd5c46ad;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/teststub/controlRmrStub.go b/pkg/teststub/controlRmrStub.go
index a8c861f..0f207e8 100644
--- a/pkg/teststub/controlRmrStub.go
+++ b/pkg/teststub/controlRmrStub.go
@@ -21,6 +21,7 @@ package teststub
 import (
 	"gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/xapptweaks"
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
+	"strconv"
 	"strings"
 	"testing"
 	"time"
@@ -67,14 +68,14 @@ func (tc *RmrStubControl) TestMsgChanEmpty(t *testing.T) {
 	}
 }
 
-func (tc *RmrStubControl) Init(desc string, rtfile string, port string, stat string, initMsg int) {
+func (tc *RmrStubControl) Init(desc string, srcId RmrSrcId, rtgSvc RmrRtgSvc, stat string, initMsg int) {
 	tc.InitMsg = initMsg
 	tc.Active = false
 	tc.RecvChan = make(chan *xapptweaks.RMRParams)
-	tc.RmrControl.Init(desc, rtfile, port)
+	tc.RmrControl.Init(desc, srcId, rtgSvc)
 	tc.RmrWrapper.Init()
 
-	tc.Rmr = xapp.NewRMRClientWithParams("tcp:"+port, 4096, 1, stat)
+	tc.Rmr = xapp.NewRMRClientWithParams("tcp:"+strconv.FormatUint(uint64(srcId.Port), 10), 65534, 1, 0, stat)
 	tc.Rmr.SetReadyCB(tc.ReadyCB, nil)
 	go tc.Rmr.Start(tc)
 
@@ -147,12 +148,16 @@ func RmrStubControlWaitAlive(seconds int, mtype int, rmr xapptweaks.XAppWrapperI
 	params.Xid = "TESTPING"
 	params.Mbuf = nil
 
+	if len(allRmrStubs) == 0 {
+		rmr.GetLogger().Info("No rmr stubs so no need to wait those to be alive")
+		return true
+	}
 	status := false
 	i := 1
 	for ; i <= seconds*2 && status == false; i++ {
 
 		rmr.GetLogger().Info("SEND TESTPING: %s", params.String())
-		rmr.RmrSend(params)
+		rmr.RmrSend(params, 0)
 
 		status = true
 		for _, val := range allRmrStubs {