X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fteststube2ap%2FstubE2.go;h=0ebb29f0eda1637f972b8f15bf6c5794f9f60886;hb=d708a43badb0742684b22866977f14cc1c03a1ba;hp=c7c09ab3b49e8a87d4aae06ac35db550476a25aa;hpb=5f8ffa07163f52d65092d63f5d173149cd5c46ad;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/teststube2ap/stubE2.go b/pkg/teststube2ap/stubE2.go
index c7c09ab..0ebb29f 100644
--- a/pkg/teststube2ap/stubE2.go
+++ b/pkg/teststube2ap/stubE2.go
@@ -43,7 +43,7 @@ type RmrTransactionId struct {
 }
 
 func (trans *RmrTransactionId) String() string {
-	return "trans(" + trans.xid + "/" + trans.meid.RanName + ")"
+	return "trans(" + trans.xid + "/" + (&xapptweaks.RMRMeid{trans.meid}).String() + ")"
 }
 
 type E2Stub struct {
@@ -104,7 +104,8 @@ func (p *E2StubSubsReqParams) Init() {
 	p.Req.FunctionId = 1
 
 	p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.Present = true
-	p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.StringPut("310150")
+	p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.Mcc = "310"
+	p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.Mnc = "150"
 	p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Id = 123
 	p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Bits = e2ap.E2AP_ENBIDHomeBits28
 
@@ -116,15 +117,15 @@ func (p *E2StubSubsReqParams) Init() {
 	p.Req.EventTriggerDefinition.TypeOfMessage = e2ap.E2AP_InitiatingMessage
 
 	p.Req.ActionSetups = make([]e2ap.ActionToBeSetupItem, 1)
+
 	p.Req.ActionSetups[0].ActionId = 0
 	p.Req.ActionSetups[0].ActionType = e2ap.E2AP_ActionTypeReport
-	p.Req.ActionSetups[0].ActionDefinition.Present = false
+	p.Req.ActionSetups[0].ActionDefinition.Present = false // Not supported
 	//p.Req.ActionSetups[index].ActionDefinition.StyleId = 255
 	//p.Req.ActionSetups[index].ActionDefinition.ParamId = 222
 	p.Req.ActionSetups[0].SubsequentAction.Present = true
 	p.Req.ActionSetups[0].SubsequentAction.Type = e2ap.E2AP_SubSeqActionTypeContinue
 	p.Req.ActionSetups[0].SubsequentAction.TimetoWait = e2ap.E2AP_TimeToWaitZero
-
 }
 
 //-----------------------------------------------------------------------------
@@ -198,12 +199,13 @@ func (tc *E2Stub) SendSubsReq(t *testing.T, rparams *E2StubSubsReqParams, oldTra
 	params.Mtype = xapp.RIC_SUB_REQ
 	params.SubId = -1
 	params.Payload = packedMsg.Buf
+	params.PayloadLen = len(packedMsg.Buf)
 	params.Meid = trans.meid
 	params.Xid = trans.xid
 	params.Mbuf = nil
 
 	tc.Logger.Info("SEND SUB REQ: %s", params.String())
-	snderr := tc.RmrSend(params)
+	snderr := tc.RmrSend(params, 5)
 	if snderr != nil {
 		tc.TestError(t, "RMR SEND FAILED: %s %s", trans.String(), snderr.Error())
 		return nil
@@ -282,12 +284,13 @@ func (tc *E2Stub) SendSubsResp(t *testing.T, req *e2ap.E2APSubscriptionRequest,
 	//params.SubId = msg.SubId
 	params.SubId = -1
 	params.Payload = packedMsg.Buf
+	params.PayloadLen = len(packedMsg.Buf)
 	params.Meid = msg.Meid
 	//params.Xid = msg.Xid
 	params.Mbuf = nil
 
 	tc.Logger.Info("SEND SUB RESP: %s", params.String())
-	snderr := tc.RmrSend(params)
+	snderr := tc.RmrSend(params, 5)
 	if snderr != nil {
 		tc.TestError(t, "RMR SEND FAILED: %s", snderr.Error())
 	}
@@ -354,12 +357,13 @@ func (tc *E2Stub) SendSubsFail(t *testing.T, fparams *E2StubSubsFailParams, msg
 	params.Mtype = xapp.RIC_SUB_FAILURE
 	params.SubId = msg.SubId
 	params.Payload = packedMsg.Buf
+	params.PayloadLen = len(packedMsg.Buf)
 	params.Meid = msg.Meid
 	params.Xid = msg.Xid
 	params.Mbuf = nil
 
 	tc.Logger.Info("SEND SUB FAIL: %s", params.String())
-	snderr := tc.RmrSend(params)
+	snderr := tc.RmrSend(params, 5)
 	if snderr != nil {
 		tc.TestError(t, "RMR SEND FAILED: %s", snderr.Error())
 	}
@@ -436,12 +440,13 @@ func (tc *E2Stub) SendSubsDelReq(t *testing.T, oldTrans *RmrTransactionId, e2Sub
 	params.Mtype = xapp.RIC_SUB_DEL_REQ
 	params.SubId = int(e2SubsId)
 	params.Payload = packedMsg.Buf
+	params.PayloadLen = len(packedMsg.Buf)
 	params.Meid = trans.meid
 	params.Xid = trans.xid
 	params.Mbuf = nil
 
 	tc.Logger.Info("SEND SUB DEL REQ: %s", params.String())
-	snderr := tc.RmrSend(params)
+	snderr := tc.RmrSend(params, 5)
 	if snderr != nil {
 		tc.TestError(t, "RMR SEND FAILED: %s %s", trans.String(), snderr.Error())
 		return nil
@@ -505,12 +510,13 @@ func (tc *E2Stub) SendSubsDelResp(t *testing.T, req *e2ap.E2APSubscriptionDelete
 	params.Mtype = xapp.RIC_SUB_DEL_RESP
 	params.SubId = msg.SubId
 	params.Payload = packedMsg.Buf
+	params.PayloadLen = len(packedMsg.Buf)
 	params.Meid = msg.Meid
 	params.Xid = msg.Xid
 	params.Mbuf = nil
 
 	tc.Logger.Info("SEND SUB DEL RESP: %s", params.String())
-	snderr := tc.RmrSend(params)
+	snderr := tc.RmrSend(params, 5)
 	if snderr != nil {
 		tc.TestError(t, "RMR SEND FAILED: %s", snderr.Error())
 	}
@@ -576,12 +582,13 @@ func (tc *E2Stub) SendSubsDelFail(t *testing.T, req *e2ap.E2APSubscriptionDelete
 	params.Mtype = xapp.RIC_SUB_DEL_FAILURE
 	params.SubId = msg.SubId
 	params.Payload = packedMsg.Buf
+	params.PayloadLen = len(packedMsg.Buf)
 	params.Meid = msg.Meid
 	params.Xid = msg.Xid
 	params.Mbuf = nil
 
 	tc.Logger.Info("SEND SUB DEL FAIL: %s", params.String())
-	snderr := tc.RmrSend(params)
+	snderr := tc.RmrSend(params, 5)
 	if snderr != nil {
 		tc.TestError(t, "RMR SEND FAILED: %s", snderr.Error())
 	}