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

diff --git a/pkg/teststub/controlRmr.go b/pkg/teststub/controlRmr.go
index 06c434b..71d66fe 100644
--- a/pkg/teststub/controlRmr.go
+++ b/pkg/teststub/controlRmr.go
@@ -20,8 +20,6 @@ package teststub
 
 import (
 	"fmt"
-	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
-	"os"
 	"testing"
 )
 
@@ -30,6 +28,8 @@ import (
 //-----------------------------------------------------------------------------
 type RmrControl struct {
 	TestWrapper
+	RmrSrcId
+	RmrRtgSvc
 	syncChan chan struct{}
 }
 
@@ -42,23 +42,24 @@ func (tc *RmrControl) WaitCB() {
 	<-tc.syncChan
 }
 
-func (tc *RmrControl) Init(desc string, rtfile string, port string) {
+func (tc *RmrControl) Init(desc string, srcId RmrSrcId, rtgSvc RmrRtgSvc) {
 	tc.TestWrapper.Init(desc)
-	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"))
+
+	tc.RmrSrcId = srcId
+	tc.RmrSrcId.Enable()
+
+	tc.RmrRtgSvc = rtgSvc
+	tc.RmrRtgSvc.Enable()
+
 	tc.syncChan = make(chan struct{})
 }
 
 func (tc *RmrControl) TestError(t *testing.T, pattern string, args ...interface{}) {
-	tc.Logger.Error(fmt.Sprintf(pattern, args...))
+	tc.Error(fmt.Sprintf(pattern, args...))
 	t.Errorf(fmt.Sprintf(pattern, args...))
 }
 
 func (tc *RmrControl) TestLog(t *testing.T, pattern string, args ...interface{}) {
-	tc.Logger.Info(fmt.Sprintf(pattern, args...))
+	tc.Info(fmt.Sprintf(pattern, args...))
 	t.Logf(fmt.Sprintf(pattern, args...))
 }