X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fteststub%2FcontrolRmr.go;h=011819be1b2d3e81633ea6c6142a306972221dec;hb=84662c4f3e2273152fc849f74880108b6346bcad;hp=bcea5007698bc2c8bef44ad0976519bc19f0c292;hpb=5f8ffa07163f52d65092d63f5d173149cd5c46ad;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/teststub/controlRmr.go b/pkg/teststub/controlRmr.go
index bcea500..011819b 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,21 +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)
-	xapp.Logger.Info("Using rt file %s", os.Getenv("RMR_SEED_RT"))
-	xapp.Logger.Info("Using src id  %s", os.Getenv("RMR_SRC_ID"))
+
+	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.Debug(fmt.Sprintf(pattern, args...))
 	t.Logf(fmt.Sprintf(pattern, args...))
 }