SVC address support for rmr stubs.
Have seen that if used may cause netlink errno 9. Maybe
due we have several rmr instances inside one procedure?
Change-Id: Ia52ae40bc05592179e3fc9143cd6c398af46adba
Signed-off-by: Juha Hyttinen <juha.hyttinen@nokia.com>
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 @@
"fmt"
"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
"os"
+ "strconv"
"testing"
)
@@ -30,7 +31,9 @@
//-----------------------------------------------------------------------------
type RmrControl struct {
TestWrapper
- syncChan chan struct{}
+ syncChan chan struct{}
+ DataPort uint16
+ RoutePort uint16
}
func (tc *RmrControl) ReadyCB(data interface{}) {
@@ -42,14 +45,20 @@
<-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{})
}