}
func (trans *RmrTransactionId) String() string {
- return "trans(" + trans.xid + "/" + trans.meid.RanName + ")"
+ return "trans(" + trans.xid + "/" + (&xapptweaks.RMRMeid{trans.meid}).String() + ")"
}
type E2Stub struct {
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
if ind < 0 {
for index := int(0); index < len(p.Fail.ActionNotAdmittedList.Items); index++ {
p.Fail.ActionNotAdmittedList.Items[index].Cause.Content = content
- p.Fail.ActionNotAdmittedList.Items[index].Cause.CauseVal = causeval
+ p.Fail.ActionNotAdmittedList.Items[index].Cause.Value = causeval
}
return
}
p.Fail.ActionNotAdmittedList.Items[ind].Cause.Content = content
- p.Fail.ActionNotAdmittedList.Items[ind].Cause.CauseVal = causeval
+ p.Fail.ActionNotAdmittedList.Items[ind].Cause.Value = causeval
}
//-----------------------------------------------------------------------------
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
item := e2ap.ActionNotAdmittedItem{}
item.ActionId = index
item.Cause.Content = 1
- item.Cause.CauseVal = 1
+ item.Cause.Value = 1
resp.ActionNotAdmittedList.Items = append(resp.ActionNotAdmittedList.Items, item)
}
//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())
}
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())
}
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
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())
}
resp.RequestId.Id = req.RequestId.Id
resp.RequestId.Seq = req.RequestId.Seq
resp.FunctionId = req.FunctionId
- resp.Cause.Content = 3 // CauseMisc
- resp.Cause.CauseVal = 4 // unspecified
+ resp.Cause.Content = 3 // CauseMisc
+ resp.Cause.Value = 4 // unspecified
packerr, packedMsg := e2SubsDelFail.Pack(resp)
if packerr != nil {
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())
}