X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fteststubdummy%2FstubRmrDummy.go;h=b11ac6f08dd3ea31ff4771f0277cd2e321ce9aa0;hb=fc20a5c2486129b14808898a01f3a18437749d25;hp=c4745baa30af01be2ec7ecadff0b3b3977dafee3;hpb=7348625b9ef03d41dd5a0ca0f6c508376259717e;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/teststubdummy/stubRmrDummy.go b/pkg/teststubdummy/stubRmrDummy.go
index c4745ba..b11ac6f 100644
--- a/pkg/teststubdummy/stubRmrDummy.go
+++ b/pkg/teststubdummy/stubRmrDummy.go
@@ -25,7 +25,6 @@ package teststubdummy
 
 import (
 	"gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/teststub"
-	"gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/xapptweaks"
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 	"testing"
 )
@@ -42,9 +41,9 @@ type RmrDummyStub struct {
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
-func CreateNewRmrDummyStub(desc string, rtfile string, port uint16, rtport uint16, stat string, mtypeseed int) *RmrDummyStub {
+func CreateNewRmrDummyStub(desc string, srcId teststub.RmrSrcId, rtgSvc teststub.RmrRtgSvc, stat string, mtypeseed int) *RmrDummyStub {
 	dummyStub := &RmrDummyStub{}
-	dummyStub.RmrStubControl.Init(desc, rtfile, port, rtport, stat, mtypeseed)
+	dummyStub.RmrStubControl.Init(desc, srcId, rtgSvc, stat, mtypeseed)
 	dummyStub.reqMsg = mtypeseed + 1
 	dummyStub.respMsg = mtypeseed + 2
 	return dummyStub
@@ -54,32 +53,58 @@ func CreateNewRmrDummyStub(desc string, rtfile string, port uint16, rtport uint1
 //
 //-----------------------------------------------------------------------------
 
-func (tc *RmrDummyStub) SendReq(t *testing.T) {
-	tc.Logger.Info("SendReq")
-	var dummyBuf []byte = make([]byte, 100)
-	params := xapptweaks.NewParams(nil)
+func (tc *RmrDummyStub) SendReq(t *testing.T, plen int) {
+	tc.Debug("SendReq")
+	len := plen
+	if len == 0 {
+		len = 100
+	}
+	params := &xapp.RMRParams{}
 	params.Mtype = tc.reqMsg
 	params.SubId = -1
-	params.Payload = dummyBuf
-	params.PayloadLen = 100
+
+	params.Payload = make([]byte, len)
+	params.PayloadLen = 0
 	params.Meid = &xapp.RMRMeid{RanName: "TEST"}
 	params.Xid = "TEST"
 	params.Mbuf = nil
 
-	snderr := tc.RmrSend(params, 5)
+	snderr := tc.SendWithRetry(params, false, 5)
 	if snderr != nil {
 		tc.TestError(t, "%s", snderr.Error())
 	}
 	return
 }
 
-func (tc *RmrDummyStub) RecvResp(t *testing.T) bool {
-	tc.Logger.Info("RecvResp")
+func (tc *RmrDummyStub) SendResp(t *testing.T, plen int) {
+	tc.Debug("SendReq")
+	len := plen
+	if len == 0 {
+		len = 100
+	}
+	params := &xapp.RMRParams{}
+	params.Mtype = tc.respMsg
+	params.SubId = -1
+	params.Payload = make([]byte, len)
+	params.PayloadLen = 0
+	params.Meid = &xapp.RMRMeid{RanName: "TEST"}
+	params.Xid = "TEST"
+	params.Mbuf = nil
+
+	snderr := tc.SendWithRetry(params, false, 5)
+	if snderr != nil {
+		tc.TestError(t, "%s", snderr.Error())
+	}
+	return
+}
+
+func (tc *RmrDummyStub) RecvReq(t *testing.T) bool {
+	tc.Debug("RecvReq")
 
 	msg := tc.WaitMsg(15)
 	if msg != nil {
-		if msg.Mtype != tc.respMsg {
-			tc.TestError(t, "Received wrong mtype expected %d got %d, error", tc.respMsg, msg.Mtype)
+		if msg.Mtype != tc.reqMsg {
+			tc.TestError(t, "Received wrong mtype expected %d got %d, error", tc.reqMsg, msg.Mtype)
 			return false
 		}
 		return true
@@ -89,26 +114,18 @@ func (tc *RmrDummyStub) RecvResp(t *testing.T) bool {
 	return false
 }
 
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-func RmrDummyHandleMessage(msg *xapptweaks.RMRParams, mtypeseed int, rmr xapptweaks.XAppWrapperIf) (bool, error) {
-	if msg.Mtype == mtypeseed+1 {
-		var dummyBuf []byte = make([]byte, 100)
-		params := xapptweaks.NewParams(nil)
-		params.Mtype = mtypeseed + 2
-		params.SubId = msg.SubId
-		params.Payload = dummyBuf
-		params.PayloadLen = 100
-		params.Meid = msg.Meid
-		params.Xid = msg.Xid
-		params.Mbuf = nil
-		rmr.GetLogger().Info("SEND DUMMY RESP: %s", params.String())
-		err := rmr.RmrSend(params, 5)
-		if err != nil {
-			rmr.GetLogger().Error("RmrDummyHandleMessage: err(%s)", err.Error())
+func (tc *RmrDummyStub) RecvResp(t *testing.T) bool {
+	tc.Debug("RecvResp")
+
+	msg := tc.WaitMsg(15)
+	if msg != nil {
+		if msg.Mtype != tc.respMsg {
+			tc.TestError(t, "Received wrong mtype expected %d got %d, error", tc.respMsg, msg.Mtype)
+			return false
 		}
-		return true, err
+		return true
+	} else {
+		tc.TestError(t, "Not Received msg within %d secs", 15)
 	}
-	return false, nil
+	return false
 }