X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fteststube2ap%2FstubE2.go;h=160597f7757ae46dc1512464008ddee46ac64f11;hb=cdc35bff0dd4c41d1e764d3f48efa70d9f33a8f7;hp=dbd518b49121f60ae7c226fab7158f1e03d42e36;hpb=9bcb0a4620d71671f758dce029cb2e3da9ab9dbe;p=ric-plt%2Fsubmgr.git diff --git a/pkg/teststube2ap/stubE2.go b/pkg/teststube2ap/stubE2.go index dbd518b..160597f 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 { @@ -54,9 +54,9 @@ type E2Stub struct { //----------------------------------------------------------------------------- // //----------------------------------------------------------------------------- -func CreateNewE2Stub(desc string, rtfile string, port string, stat string, mtypeseed int) *E2Stub { +func CreateNewE2Stub(desc string, srcId teststub.RmrSrcId, rtgSvc teststub.RmrRtgSvc, stat string, mtypeseed int) *E2Stub { tc := &E2Stub{} - tc.RmrStubControl.Init(desc, rtfile, port, stat, mtypeseed) + tc.RmrStubControl.Init(desc, srcId, rtgSvc, stat, mtypeseed) tc.xid_seq = 1 tc.SetCheckXid(true) return tc @@ -65,9 +65,9 @@ func CreateNewE2Stub(desc string, rtfile string, port string, stat string, mtype //----------------------------------------------------------------------------- // //----------------------------------------------------------------------------- -func CreateNewE2termStub(desc string, rtfile string, port string, stat string, mtypeseed int) *E2Stub { +func CreateNewE2termStub(desc string, srcId teststub.RmrSrcId, rtgSvc teststub.RmrRtgSvc, stat string, mtypeseed int) *E2Stub { tc := &E2Stub{} - tc.RmrStubControl.Init(desc, rtfile, port, stat, mtypeseed) + tc.RmrStubControl.Init(desc, srcId, rtgSvc, stat, mtypeseed) tc.xid_seq = 1 tc.SetCheckXid(false) return tc @@ -100,28 +100,26 @@ func (p *E2StubSubsReqParams) Init() { p.Req = &e2ap.E2APSubscriptionRequest{} p.Req.RequestId.Id = 1 - p.Req.RequestId.Seq = 0 + p.Req.RequestId.InstanceId = 0 p.Req.FunctionId = 1 - p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.Present = true - p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.StringPut("310150") - p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Id = 123 - p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Bits = e2ap.E2AP_ENBIDHomeBits28 - // gnb -> enb outgoing // enb -> gnb incoming // X2 36423-f40.doc - p.Req.EventTriggerDefinition.InterfaceDirection = e2ap.E2AP_InterfaceDirectionIncoming - p.Req.EventTriggerDefinition.ProcedureCode = 5 //28 35 - p.Req.EventTriggerDefinition.TypeOfMessage = e2ap.E2AP_InitiatingMessage + p.Req.EventTriggerDefinition.Data.Length = 1 + p.Req.EventTriggerDefinition.Data.Data = make([]uint8, p.Req.EventTriggerDefinition.Data.Length) + p.Req.EventTriggerDefinition.Data.Data[0] = 1 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 // Not supported - //p.Req.ActionSetups[index].ActionDefinition.StyleId = 255 - //p.Req.ActionSetups[index].ActionDefinition.ParamId = 222 + p.Req.ActionSetups[0].RicActionDefinitionPresent = true + + p.Req.ActionSetups[0].ActionDefinitionChoice.Data.Length = 1 + p.Req.ActionSetups[0].ActionDefinitionChoice.Data.Data = make([]uint8, p.Req.ActionSetups[0].ActionDefinitionChoice.Data.Length) + p.Req.ActionSetups[0].ActionDefinitionChoice.Data.Data[0] = 1 + 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 @@ -141,7 +139,7 @@ func (p *E2StubSubsFailParams) Set(req *e2ap.E2APSubscriptionRequest) { p.Fail = &e2ap.E2APSubscriptionFailure{} p.Fail.RequestId.Id = p.Req.RequestId.Id - p.Fail.RequestId.Seq = p.Req.RequestId.Seq + p.Fail.RequestId.InstanceId = p.Req.RequestId.InstanceId p.Fail.FunctionId = p.Req.FunctionId p.Fail.ActionNotAdmittedList.Items = make([]e2ap.ActionNotAdmittedItem, len(p.Req.ActionSetups)) for index := int(0); index < len(p.Fail.ActionNotAdmittedList.Items); index++ { @@ -155,12 +153,12 @@ func (p *E2StubSubsFailParams) SetCauseVal(ind int, content uint8, causeval uint 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 } //----------------------------------------------------------------------------- @@ -198,12 +196,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 @@ -255,7 +254,7 @@ func (tc *E2Stub) SendSubsResp(t *testing.T, req *e2ap.E2APSubscriptionRequest, resp := &e2ap.E2APSubscriptionResponse{} resp.RequestId.Id = req.RequestId.Id - resp.RequestId.Seq = req.RequestId.Seq + resp.RequestId.InstanceId = req.RequestId.InstanceId resp.FunctionId = req.FunctionId resp.ActionAdmittedList.Items = make([]e2ap.ActionAdmittedItem, len(req.ActionSetups)) @@ -267,7 +266,7 @@ func (tc *E2Stub) SendSubsResp(t *testing.T, req *e2ap.E2APSubscriptionRequest, 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) } @@ -282,12 +281,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()) } @@ -324,7 +324,7 @@ func (tc *E2Stub) RecvSubsResp(t *testing.T, trans *RmrTransactionId) uint32 { if unpackerr != nil { tc.TestError(t, "RIC_SUB_RESP unpack failed err: %s", unpackerr.Error()) } - tc.Logger.Info("Recv Subs Resp rmr: xid=%s subid=%d, asn: seqnro=%d", msg.Xid, msg.SubId, resp.RequestId.Seq) + tc.Logger.Info("Recv Subs Resp rmr: xid=%s subid=%d, asn: instanceid=%d", msg.Xid, msg.SubId, resp.RequestId.InstanceId) return e2SubsId } } else { @@ -354,12 +354,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()) } @@ -396,7 +397,7 @@ func (tc *E2Stub) RecvSubsFail(t *testing.T, trans *RmrTransactionId) uint32 { if unpackerr != nil { tc.TestError(t, "RIC_SUB_FAILURE unpack failed err: %s", unpackerr.Error()) } - tc.Logger.Info("Recv Subs Fail rmr: xid=%s subid=%d, asn: seqnro=%d", msg.Xid, msg.SubId, resp.RequestId.Seq) + tc.Logger.Info("Recv Subs Fail rmr: xid=%s subid=%d, asn: instanceid=%d", msg.Xid, msg.SubId, resp.RequestId.InstanceId) return e2SubsId } } else { @@ -422,7 +423,7 @@ func (tc *E2Stub) SendSubsDelReq(t *testing.T, oldTrans *RmrTransactionId, e2Sub //--------------------------------- req := &e2ap.E2APSubscriptionDeleteRequest{} req.RequestId.Id = 1 - req.RequestId.Seq = e2SubsId + req.RequestId.InstanceId = e2SubsId req.FunctionId = 1 err, packedMsg := e2SubsDelReq.Pack(req) @@ -436,12 +437,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 @@ -492,7 +494,7 @@ func (tc *E2Stub) SendSubsDelResp(t *testing.T, req *e2ap.E2APSubscriptionDelete //--------------------------------- resp := &e2ap.E2APSubscriptionDeleteResponse{} resp.RequestId.Id = req.RequestId.Id - resp.RequestId.Seq = req.RequestId.Seq + resp.RequestId.InstanceId = req.RequestId.InstanceId resp.FunctionId = req.FunctionId packerr, packedMsg := e2SubsDelResp.Pack(resp) @@ -505,12 +507,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()) } @@ -541,7 +544,7 @@ func (tc *E2Stub) RecvSubsDelResp(t *testing.T, trans *RmrTransactionId) { if unpackerr != nil { tc.TestError(t, "RIC_SUB_DEL_RESP unpack failed err: %s", unpackerr.Error()) } - tc.Logger.Info("Recv Subs Del Resp rmr: xid=%s subid=%d, asn: seqnro=%d", msg.Xid, msg.SubId, resp.RequestId.Seq) + tc.Logger.Info("Recv Subs Del Resp rmr: xid=%s subid=%d, asn: instanceid=%d", msg.Xid, msg.SubId, resp.RequestId.InstanceId) return } } else { @@ -561,10 +564,10 @@ func (tc *E2Stub) SendSubsDelFail(t *testing.T, req *e2ap.E2APSubscriptionDelete //--------------------------------- resp := &e2ap.E2APSubscriptionDeleteFailure{} resp.RequestId.Id = req.RequestId.Id - resp.RequestId.Seq = req.RequestId.Seq + resp.RequestId.InstanceId = req.RequestId.InstanceId resp.FunctionId = req.FunctionId - resp.Cause.Content = 3 // CauseMisc - resp.Cause.CauseVal = 4 // unspecified + resp.Cause.Content = 4 // CauseMisc + resp.Cause.Value = 3 // unspecified packerr, packedMsg := e2SubsDelFail.Pack(resp) if packerr != nil { @@ -576,12 +579,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()) }