X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fteststub%2FcontrolRmr.go;h=41a6606f04380fc039b5d1da74b499d5d372f0d5;hb=7348625b9ef03d41dd5a0ca0f6c508376259717e;hp=06c434bab106d82fa72f4ee676595823c3dd69c6;hpb=ad41feaeb9dde8ccd6b8b508eb3df8df5d207134;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/teststub/controlRmr.go b/pkg/teststub/controlRmr.go
index 06c434b..41a6606 100644
--- a/pkg/teststub/controlRmr.go
+++ b/pkg/teststub/controlRmr.go
@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 	"os"
+	"strconv"
 	"testing"
 )
 
@@ -30,7 +31,9 @@ import (
 //-----------------------------------------------------------------------------
 type RmrControl struct {
 	TestWrapper
-	syncChan chan struct{}
+	syncChan  chan struct{}
+	DataPort  uint16
+	RoutePort uint16
 }
 
 func (tc *RmrControl) ReadyCB(data interface{}) {
@@ -42,14 +45,20 @@ func (tc *RmrControl) WaitCB() {
 	<-tc.syncChan
 }
 
-func (tc *RmrControl) Init(desc string, rtfile string, port string) {
+func (tc *RmrControl) Init(desc string, rtfile string, port uint16, rtport uint16) {
 	tc.TestWrapper.Init(desc)
+	tc.DataPort = port
+	tc.RoutePort = rtport
 	os.Setenv("RMR_SEED_RT", rtfile)
-	os.Setenv("RMR_SRC_ID", "localhost:"+port)
-	//os.Setenv("RMR_RTG_SVC", "localhost:"+rtport)
 	xapp.Logger.Info("Using rt file %s", os.Getenv("RMR_SEED_RT"))
-	xapp.Logger.Info("Using src id  %s", os.Getenv("RMR_SRC_ID"))
-	//xapp.Logger.Info("Using rtg svc  %s", os.Getenv("RMR_RTG_SVC"))
+	if tc.DataPort > 0 {
+		os.Setenv("RMR_SRC_ID", "localhost:"+strconv.FormatUint(uint64(tc.DataPort), 10))
+		xapp.Logger.Info("Using src id  %s", os.Getenv("RMR_SRC_ID"))
+	}
+	if tc.RoutePort > 0 {
+		os.Setenv("RMR_RTG_SVC", "localhost:"+strconv.FormatUint(uint64(tc.RoutePort), 10))
+		xapp.Logger.Info("Using rtg svc  %s", os.Getenv("RMR_RTG_SVC"))
+	}
 	tc.syncChan = make(chan struct{})
 }