X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fteststube2ap%2FstubE2.go;h=ec3010a17f803865d5be3665fbd53841dee0cbab;hb=c9ef0ba044f66201c34f42e3bb459e0ae4e6855b;hp=5804f74ab9d7bd397875b68e7543ba5cef284ac7;hpb=cd78aeeae3212fa722be4ba9768cac711305badf;p=ric-plt%2Fsubmgr.git diff --git a/pkg/teststube2ap/stubE2.go b/pkg/teststube2ap/stubE2.go index 5804f74..ec3010a 100644 --- a/pkg/teststube2ap/stubE2.go +++ b/pkg/teststube2ap/stubE2.go @@ -20,13 +20,16 @@ package teststube2ap import ( + "fmt" + "strconv" + "testing" + "time" + "gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap" "gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap_wrapper" "gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/teststub" - "gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/xapptweaks" + clientmodel "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/clientmodel" "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp" - "strconv" - "testing" ) //----------------------------------------------------------------------------- @@ -42,23 +45,51 @@ type RmrTransactionId struct { meid *xapp.RMRMeid } +type E2RestIds struct { + RestSubsId string + E2SubsId uint32 +} + func (trans *RmrTransactionId) String() string { - return "trans(" + trans.xid + "/" + (&xapptweaks.RMRMeid{trans.meid}).String() + ")" + meidstr := "N/A" + if trans.meid != nil { + meidstr = trans.meid.String() + } + return "trans(" + trans.xid + "/" + meidstr + ")" } type E2Stub struct { teststub.RmrStubControl - xid_seq uint64 + xid_seq uint64 + subscriptionId string + requestCount int + CallBackNotification chan int64 + RESTNotification chan uint32 + CallBackListedNotifications chan E2RestIds + ListedRESTNotifications chan E2RestIds + clientEndpoint clientmodel.SubscriptionParamsClientEndpoint + meid string + restSubsIdList []string } //----------------------------------------------------------------------------- // //----------------------------------------------------------------------------- -func CreateNewE2Stub(desc string, srcId teststub.RmrSrcId, rtgSvc teststub.RmrRtgSvc, stat string, mtypeseed int) *E2Stub { +func CreateNewE2Stub(desc string, srcId teststub.RmrSrcId, rtgSvc teststub.RmrRtgSvc, stat string, mtypeseed int, ranName string, host string, RMRPort int64, HTTPPort int64) *E2Stub { tc := &E2Stub{} tc.RmrStubControl.Init(desc, srcId, rtgSvc, stat, mtypeseed) tc.xid_seq = 1 tc.SetCheckXid(true) + tc.CallBackNotification = make(chan int64) + tc.RESTNotification = make(chan uint32) + tc.CallBackListedNotifications = make(chan E2RestIds) + tc.ListedRESTNotifications = make(chan E2RestIds, 2) + var endPoint clientmodel.SubscriptionParamsClientEndpoint + endPoint.Host = host + endPoint.HTTPPort = &HTTPPort + endPoint.RMRPort = &RMRPort + tc.clientEndpoint = endPoint + tc.meid = ranName return tc } @@ -85,7 +116,7 @@ func (tc *E2Stub) NewRmrTransactionId(xid string, ranname string) *RmrTransactio trans.xid = xid } trans.meid = &xapp.RMRMeid{RanName: ranname} - tc.Logger.Info("New test %s", trans.String()) + tc.Info("New test %s", trans.String()) return trans } @@ -106,77 +137,20 @@ func (p *E2StubSubsReqParams) Init() { // gnb -> enb outgoing // enb -> gnb incoming // X2 36423-f40.doc - p.Req.EventTriggerDefinition.NBX2EventTriggerDefinitionPresent = true - p.Req.EventTriggerDefinition.NBNRTEventTriggerDefinitionPresent = false - if p.Req.EventTriggerDefinition.NBX2EventTriggerDefinitionPresent == true { - p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.Present = true - p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.Set("310150") - p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Id = 123 - p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Bits = e2ap.E2AP_ENBIDHomeBits28 - - p.Req.EventTriggerDefinition.InterfaceDirection = e2ap.E2AP_InterfaceDirectionIncoming - p.Req.EventTriggerDefinition.ProcedureCode = 5 //28 35 - p.Req.EventTriggerDefinition.TypeOfMessage = e2ap.E2AP_InitiatingMessage - } else if p.Req.EventTriggerDefinition.NBNRTEventTriggerDefinitionPresent == true { - p.Req.EventTriggerDefinition.NBNRTEventTriggerDefinition.TriggerNature = e2ap.NRTTriggerNature_now - } + 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].RicActionDefinitionPresent = true - p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format1Present = false - p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format2Present = true - p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionNRTFormat1Present = false - - if p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format1Present { - p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format1.StyleID = 99 - // 1..255 - for index := 0; index < 1; index++ { - actionParameterItem := e2ap.ActionParameterItem{} - actionParameterItem.ParameterID = 11 - actionParameterItem.ActionParameterValue.ValueIntPresent = true - actionParameterItem.ActionParameterValue.ValueInt = 100 - p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format1.ActionParameterItems = - append(p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format1.ActionParameterItems, actionParameterItem) - } - } else if p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format2Present { - // 1..15 - for index := 0; index < 1; index++ { - ranUEgroupItem := e2ap.RANueGroupItem{} - // 1..255 - for index2 := 0; index2 < 1; index2++ { - ranUEGroupDefItem := e2ap.RANueGroupDefItem{} - ranUEGroupDefItem.RanParameterID = 22 - ranUEGroupDefItem.RanParameterTest = e2ap.RANParameterTest_equal - ranUEGroupDefItem.RanParameterValue.ValueIntPresent = true - ranUEGroupDefItem.RanParameterValue.ValueInt = 100 - ranUEgroupItem.RanUEgroupDefinition.RanUEGroupDefItems = append(ranUEgroupItem.RanUEgroupDefinition.RanUEGroupDefItems, ranUEGroupDefItem) - } - // 1..255 - for index3 := 0; index3 < 1; index3++ { - ranParameterItem := e2ap.RANParameterItem{} - ranParameterItem.RanParameterID = 33 - ranParameterItem.RanParameterValue.ValueIntPresent = true - ranParameterItem.RanParameterValue.ValueInt = 100 - ranUEgroupItem.RanPolicy.RanParameterItems = append(ranUEgroupItem.RanPolicy.RanParameterItems, ranParameterItem) - } - ranUEgroupItem.RanUEgroupID = 2 - p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format2.RanUEgroupItems = - append(p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format2.RanUEgroupItems, ranUEgroupItem) - } - } else if p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionNRTFormat1Present { - // 1..255 - for index := 0; index < 1; index++ { - ranParameterItem := e2ap.RANParameterItem{} - ranParameterItem.RanParameterID = 33 - ranParameterItem.RanParameterValue.ValueIntPresent = true - ranParameterItem.RanParameterValue.ValueInt = 100 - p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionNRTFormat1.RanParameterList = - append(p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionNRTFormat1.RanParameterList, ranParameterItem) - } - } + + 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 @@ -229,7 +203,7 @@ func (tc *E2Stub) SendSubsReq(t *testing.T, rparams *E2StubSubsReqParams, oldTra trans = tc.NewRmrTransactionId("", "RAN_NAME_1") } - tc.Logger.Info("SendSubsReq %s", trans.String()) + tc.Info("SendSubsReq %s", trans.String()) e2SubsReq := e2asnpacker.NewPackerSubscriptionRequest() //--------------------------------- @@ -247,9 +221,9 @@ func (tc *E2Stub) SendSubsReq(t *testing.T, rparams *E2StubSubsReqParams, oldTra tc.TestError(t, "pack NOK %s %s", trans.String(), err.Error()) return nil } - tc.Logger.Debug("%s %s", trans.String(), e2SubsReq.String()) + tc.Debug("%s %s", trans.String(), e2SubsReq.String()) - params := xapptweaks.NewParams(nil) + params := &xapp.RMRParams{} params.Mtype = xapp.RIC_SUB_REQ params.SubId = -1 params.Payload = packedMsg.Buf @@ -258,8 +232,8 @@ func (tc *E2Stub) SendSubsReq(t *testing.T, rparams *E2StubSubsReqParams, oldTra params.Xid = trans.xid params.Mbuf = nil - tc.Logger.Info("SEND SUB REQ: %s", params.String()) - snderr := tc.RmrSend(params, 5) + tc.Info("SEND SUB REQ: %s", params.String()) + snderr := tc.SendWithRetry(params, false, 5) if snderr != nil { tc.TestError(t, "RMR SEND FAILED: %s %s", trans.String(), snderr.Error()) return nil @@ -270,8 +244,8 @@ func (tc *E2Stub) SendSubsReq(t *testing.T, rparams *E2StubSubsReqParams, oldTra //----------------------------------------------------------------------------- // //----------------------------------------------------------------------------- -func (tc *E2Stub) RecvSubsReq(t *testing.T) (*e2ap.E2APSubscriptionRequest, *xapptweaks.RMRParams) { - tc.Logger.Info("RecvSubsReq") +func (tc *E2Stub) RecvSubsReq(t *testing.T) (*e2ap.E2APSubscriptionRequest, *xapp.RMRParams) { + tc.Info("RecvSubsReq") e2SubsReq := e2asnpacker.NewPackerSubscriptionRequest() //--------------------------------- @@ -282,7 +256,7 @@ func (tc *E2Stub) RecvSubsReq(t *testing.T) (*e2ap.E2APSubscriptionRequest, *xap if msg.Mtype != xapp.RICMessageTypes["RIC_SUB_REQ"] { tc.TestError(t, "Received wrong mtype expected %s got %s, error", "RIC_SUB_REQ", xapp.RicMessageTypeToName[msg.Mtype]) } else { - tc.Logger.Info("Recv Subs Req") + tc.Info("Recv Subs Req") packedData := &e2ap.PackedData{} packedData.Buf = msg.Payload unpackerr, req := e2SubsReq.UnPack(packedData) @@ -301,8 +275,8 @@ func (tc *E2Stub) RecvSubsReq(t *testing.T) (*e2ap.E2APSubscriptionRequest, *xap //----------------------------------------------------------------------------- // //----------------------------------------------------------------------------- -func (tc *E2Stub) SendSubsResp(t *testing.T, req *e2ap.E2APSubscriptionRequest, msg *xapptweaks.RMRParams) { - tc.Logger.Info("SendSubsResp") +func (tc *E2Stub) SendSubsResp(t *testing.T, req *e2ap.E2APSubscriptionRequest, msg *xapp.RMRParams) { + tc.Info("SendSubsResp") e2SubsResp := e2asnpacker.NewPackerSubscriptionResponse() //--------------------------------- @@ -331,9 +305,9 @@ func (tc *E2Stub) SendSubsResp(t *testing.T, req *e2ap.E2APSubscriptionRequest, if packerr != nil { tc.TestError(t, "pack NOK %s", packerr.Error()) } - tc.Logger.Debug("%s", e2SubsResp.String()) + tc.Debug("%s", e2SubsResp.String()) - params := xapptweaks.NewParams(nil) + params := &xapp.RMRParams{} params.Mtype = xapp.RIC_SUB_RESP //params.SubId = msg.SubId params.SubId = -1 @@ -343,8 +317,40 @@ func (tc *E2Stub) SendSubsResp(t *testing.T, req *e2ap.E2APSubscriptionRequest, //params.Xid = msg.Xid params.Mbuf = nil - tc.Logger.Info("SEND SUB RESP: %s", params.String()) - snderr := tc.RmrSend(params, 5) + tc.Info("SEND SUB RESP: %s", params.String()) + snderr := tc.SendWithRetry(params, false, 5) + if snderr != nil { + tc.TestError(t, "RMR SEND FAILED: %s", snderr.Error()) + } +} + +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (tc *E2Stub) SendInvalidE2Asn1Resp(t *testing.T, msg *xapp.RMRParams, msgType int) { + + params := &xapp.RMRParams{} + params.Mtype = msgType + params.SubId = -1 + params.Payload = []byte{1, 2, 3, 4, 5} + params.PayloadLen = 5 + params.Meid = msg.Meid + params.Xid = "" + params.Mbuf = nil + + if params.Mtype == xapp.RIC_SUB_RESP { + tc.Info("SEND INVALID ASN.1 SUB RESP") + + } else if params.Mtype == xapp.RIC_SUB_FAILURE { + tc.Info("SEND INVALID ASN.1 SUB FAILURE") + + } else if params.Mtype == xapp.RIC_SUB_DEL_RESP { + tc.Info("SEND INVALID ASN.1 SUB DEL RESP") + + } else if params.Mtype == xapp.RIC_SUB_DEL_FAILURE { + tc.Info("SEND INVALID ASN.1 SUB DEL FAILURE") + } + snderr := tc.SendWithRetry(params, false, 5) if snderr != nil { tc.TestError(t, "RMR SEND FAILED: %s", snderr.Error()) } @@ -354,7 +360,7 @@ func (tc *E2Stub) SendSubsResp(t *testing.T, req *e2ap.E2APSubscriptionRequest, // //----------------------------------------------------------------------------- func (tc *E2Stub) RecvSubsResp(t *testing.T, trans *RmrTransactionId) uint32 { - tc.Logger.Info("RecvSubsResp") + tc.Info("RecvSubsResp") e2SubsResp := e2asnpacker.NewPackerSubscriptionResponse() var e2SubsId uint32 @@ -381,7 +387,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: instanceid=%d", msg.Xid, msg.SubId, resp.RequestId.InstanceId) + tc.Info("Recv Subs Resp rmr: xid=%s subid=%d, asn: instanceid=%d", msg.Xid, msg.SubId, resp.RequestId.InstanceId) return e2SubsId } } else { @@ -394,8 +400,8 @@ func (tc *E2Stub) RecvSubsResp(t *testing.T, trans *RmrTransactionId) uint32 { // //----------------------------------------------------------------------------- -func (tc *E2Stub) SendSubsFail(t *testing.T, fparams *E2StubSubsFailParams, msg *xapptweaks.RMRParams) { - tc.Logger.Info("SendSubsFail") +func (tc *E2Stub) SendSubsFail(t *testing.T, fparams *E2StubSubsFailParams, msg *xapp.RMRParams) { + tc.Info("SendSubsFail") e2SubsFail := e2asnpacker.NewPackerSubscriptionFailure() //--------------------------------- @@ -405,9 +411,9 @@ func (tc *E2Stub) SendSubsFail(t *testing.T, fparams *E2StubSubsFailParams, msg if packerr != nil { tc.TestError(t, "pack NOK %s", packerr.Error()) } - tc.Logger.Debug("%s", e2SubsFail.String()) + tc.Debug("%s", e2SubsFail.String()) - params := xapptweaks.NewParams(nil) + params := &xapp.RMRParams{} params.Mtype = xapp.RIC_SUB_FAILURE params.SubId = msg.SubId params.Payload = packedMsg.Buf @@ -416,8 +422,8 @@ func (tc *E2Stub) SendSubsFail(t *testing.T, fparams *E2StubSubsFailParams, msg params.Xid = msg.Xid params.Mbuf = nil - tc.Logger.Info("SEND SUB FAIL: %s", params.String()) - snderr := tc.RmrSend(params, 5) + tc.Info("SEND SUB FAIL: %s", params.String()) + snderr := tc.SendWithRetry(params, false, 5) if snderr != nil { tc.TestError(t, "RMR SEND FAILED: %s", snderr.Error()) } @@ -427,7 +433,7 @@ func (tc *E2Stub) SendSubsFail(t *testing.T, fparams *E2StubSubsFailParams, msg // //----------------------------------------------------------------------------- func (tc *E2Stub) RecvSubsFail(t *testing.T, trans *RmrTransactionId) uint32 { - tc.Logger.Info("RecvSubsFail") + tc.Info("RecvSubsFail") e2SubsFail := e2asnpacker.NewPackerSubscriptionFailure() var e2SubsId uint32 @@ -454,7 +460,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: instanceid=%d", msg.Xid, msg.SubId, resp.RequestId.InstanceId) + tc.Info("Recv Subs Fail rmr: xid=%s subid=%d, asn: instanceid=%d", msg.Xid, msg.SubId, resp.RequestId.InstanceId) return e2SubsId } } else { @@ -473,7 +479,7 @@ func (tc *E2Stub) SendSubsDelReq(t *testing.T, oldTrans *RmrTransactionId, e2Sub trans = tc.NewRmrTransactionId("", "RAN_NAME_1") } - tc.Logger.Info("SendSubsDelReq %s", trans.String()) + tc.Info("SendSubsDelReq %s", trans.String()) e2SubsDelReq := e2asnpacker.NewPackerSubscriptionDeleteRequest() //--------------------------------- // xapp activity: Send Subs Del Req @@ -488,9 +494,9 @@ func (tc *E2Stub) SendSubsDelReq(t *testing.T, oldTrans *RmrTransactionId, e2Sub tc.TestError(t, "pack NOK %s %s", trans.String(), err.Error()) return nil } - tc.Logger.Debug("%s %s", trans.String(), e2SubsDelReq.String()) + tc.Debug("%s %s", trans.String(), e2SubsDelReq.String()) - params := xapptweaks.NewParams(nil) + params := &xapp.RMRParams{} params.Mtype = xapp.RIC_SUB_DEL_REQ params.SubId = int(e2SubsId) params.Payload = packedMsg.Buf @@ -499,8 +505,8 @@ func (tc *E2Stub) SendSubsDelReq(t *testing.T, oldTrans *RmrTransactionId, e2Sub params.Xid = trans.xid params.Mbuf = nil - tc.Logger.Info("SEND SUB DEL REQ: %s", params.String()) - snderr := tc.RmrSend(params, 5) + tc.Info("SEND SUB DEL REQ: %s", params.String()) + snderr := tc.SendWithRetry(params, false, 5) if snderr != nil { tc.TestError(t, "RMR SEND FAILED: %s %s", trans.String(), snderr.Error()) return nil @@ -511,8 +517,8 @@ func (tc *E2Stub) SendSubsDelReq(t *testing.T, oldTrans *RmrTransactionId, e2Sub //----------------------------------------------------------------------------- // //----------------------------------------------------------------------------- -func (tc *E2Stub) RecvSubsDelReq(t *testing.T) (*e2ap.E2APSubscriptionDeleteRequest, *xapptweaks.RMRParams) { - tc.Logger.Info("RecvSubsDelReq") +func (tc *E2Stub) RecvSubsDelReq(t *testing.T) (*e2ap.E2APSubscriptionDeleteRequest, *xapp.RMRParams) { + tc.Info("RecvSubsDelReq") e2SubsDelReq := e2asnpacker.NewPackerSubscriptionDeleteRequest() //--------------------------------- @@ -523,7 +529,7 @@ func (tc *E2Stub) RecvSubsDelReq(t *testing.T) (*e2ap.E2APSubscriptionDeleteRequ if msg.Mtype != xapp.RICMessageTypes["RIC_SUB_DEL_REQ"] { tc.TestError(t, "Received wrong mtype expected %s got %s, error", "RIC_SUB_DEL_REQ", xapp.RicMessageTypeToName[msg.Mtype]) } else { - tc.Logger.Info("Recv Subs Del Req") + tc.Info("Recv Subs Del Req") packedData := &e2ap.PackedData{} packedData.Buf = msg.Payload @@ -542,8 +548,8 @@ func (tc *E2Stub) RecvSubsDelReq(t *testing.T) (*e2ap.E2APSubscriptionDeleteRequ //----------------------------------------------------------------------------- // //----------------------------------------------------------------------------- -func (tc *E2Stub) SendSubsDelResp(t *testing.T, req *e2ap.E2APSubscriptionDeleteRequest, msg *xapptweaks.RMRParams) { - tc.Logger.Info("SendSubsDelResp") +func (tc *E2Stub) SendSubsDelResp(t *testing.T, req *e2ap.E2APSubscriptionDeleteRequest, msg *xapp.RMRParams) { + tc.Info("SendSubsDelResp") e2SubsDelResp := e2asnpacker.NewPackerSubscriptionDeleteResponse() //--------------------------------- @@ -558,9 +564,9 @@ func (tc *E2Stub) SendSubsDelResp(t *testing.T, req *e2ap.E2APSubscriptionDelete if packerr != nil { tc.TestError(t, "pack NOK %s", packerr.Error()) } - tc.Logger.Debug("%s", e2SubsDelResp.String()) + tc.Debug("%s", e2SubsDelResp.String()) - params := xapptweaks.NewParams(nil) + params := &xapp.RMRParams{} params.Mtype = xapp.RIC_SUB_DEL_RESP params.SubId = msg.SubId params.Payload = packedMsg.Buf @@ -569,8 +575,8 @@ func (tc *E2Stub) SendSubsDelResp(t *testing.T, req *e2ap.E2APSubscriptionDelete params.Xid = msg.Xid params.Mbuf = nil - tc.Logger.Info("SEND SUB DEL RESP: %s", params.String()) - snderr := tc.RmrSend(params, 5) + tc.Info("SEND SUB DEL RESP: %s", params.String()) + snderr := tc.SendWithRetry(params, false, 5) if snderr != nil { tc.TestError(t, "RMR SEND FAILED: %s", snderr.Error()) } @@ -580,7 +586,7 @@ func (tc *E2Stub) SendSubsDelResp(t *testing.T, req *e2ap.E2APSubscriptionDelete // //----------------------------------------------------------------------------- func (tc *E2Stub) RecvSubsDelResp(t *testing.T, trans *RmrTransactionId) { - tc.Logger.Info("RecvSubsDelResp") + tc.Info("RecvSubsDelResp") e2SubsDelResp := e2asnpacker.NewPackerSubscriptionDeleteResponse() //--------------------------------- @@ -601,7 +607,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: instanceid=%d", msg.Xid, msg.SubId, resp.RequestId.InstanceId) + tc.Info("Recv Subs Del Resp rmr: xid=%s subid=%d, asn: instanceid=%d", msg.Xid, msg.SubId, resp.RequestId.InstanceId) return } } else { @@ -612,8 +618,8 @@ func (tc *E2Stub) RecvSubsDelResp(t *testing.T, trans *RmrTransactionId) { //----------------------------------------------------------------------------- // //----------------------------------------------------------------------------- -func (tc *E2Stub) SendSubsDelFail(t *testing.T, req *e2ap.E2APSubscriptionDeleteRequest, msg *xapptweaks.RMRParams) { - tc.Logger.Info("SendSubsDelFail") +func (tc *E2Stub) SendSubsDelFail(t *testing.T, req *e2ap.E2APSubscriptionDeleteRequest, msg *xapp.RMRParams) { + tc.Info("SendSubsDelFail") e2SubsDelFail := e2asnpacker.NewPackerSubscriptionDeleteFailure() //--------------------------------- @@ -623,16 +629,16 @@ func (tc *E2Stub) SendSubsDelFail(t *testing.T, req *e2ap.E2APSubscriptionDelete resp.RequestId.Id = req.RequestId.Id resp.RequestId.InstanceId = req.RequestId.InstanceId resp.FunctionId = req.FunctionId - resp.Cause.Content = 4 // CauseMisc + resp.Cause.Content = 5 // CauseMisc resp.Cause.Value = 3 // unspecified packerr, packedMsg := e2SubsDelFail.Pack(resp) if packerr != nil { tc.TestError(t, "pack NOK %s", packerr.Error()) } - tc.Logger.Debug("%s", e2SubsDelFail.String()) + tc.Debug("%s", e2SubsDelFail.String()) - params := xapptweaks.NewParams(nil) + params := &xapp.RMRParams{} params.Mtype = xapp.RIC_SUB_DEL_FAILURE params.SubId = msg.SubId params.Payload = packedMsg.Buf @@ -641,9 +647,432 @@ func (tc *E2Stub) SendSubsDelFail(t *testing.T, req *e2ap.E2APSubscriptionDelete params.Xid = msg.Xid params.Mbuf = nil - tc.Logger.Info("SEND SUB DEL FAIL: %s", params.String()) - snderr := tc.RmrSend(params, 5) + tc.Info("SEND SUB DEL FAIL: %s", params.String()) + snderr := tc.SendWithRetry(params, false, 5) if snderr != nil { tc.TestError(t, "RMR SEND FAILED: %s", snderr.Error()) } } + +// REST code below all + +/*****************************************************************************/ +// REST interface specific functions are below + +//----------------------------------------------------------------------------- +// Callback handler for subscription response notifications +//----------------------------------------------------------------------------- +func (tc *E2Stub) SubscriptionRespHandler(resp *clientmodel.SubscriptionResponse) { + if tc.subscriptionId == "SUBSCRIPTIONID NOT SET" { + tc.Info("REST notification received for %v while no SubscriptionID was not set for InstanceID=%v, RequestorID=%v (%v)", + *resp.SubscriptionID, *resp.SubscriptionInstances[0].InstanceID, *resp.SubscriptionInstances[0].RequestorID, tc) + tc.CallBackNotification <- *resp.SubscriptionInstances[0].InstanceID + } else if tc.subscriptionId == *resp.SubscriptionID { + tc.Info("REST notification received SubscriptionID=%s, InstanceID=%v, RequestorID=%v (%v)", + *resp.SubscriptionID, *resp.SubscriptionInstances[0].InstanceID, *resp.SubscriptionInstances[0].RequestorID, tc) + tc.CallBackNotification <- *resp.SubscriptionInstances[0].InstanceID + } else { + tc.Info("MISMATCHING REST notification received SubscriptionID=%s<>%s, InstanceID=%v, RequestorID=%v (%v)", + tc.subscriptionId, *resp.SubscriptionID, *resp.SubscriptionInstances[0].InstanceID, *resp.SubscriptionInstances[0].RequestorID, tc) + } +} + +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (tc *E2Stub) ExpectRESTNotification(t *testing.T, restSubsId string) { + + tc.Info("### Started to wait REST notification for %v on port %v f(RMR port %v), %v responses expected", restSubsId, *tc.clientEndpoint.HTTPPort, *tc.clientEndpoint.RMRPort, tc.requestCount) + tc.restSubsIdList = []string{restSubsId} + xapp.Subscription.SetResponseCB(tc.ListedRestNotifHandler) + if tc.requestCount == 0 { + tc.TestError(t, "### NO REST notifications SET received for endpoint=%s, request zount ZERO! (%v)", tc.clientEndpoint, tc) + } + go func() { + select { + case e2Ids := <-tc.CallBackListedNotifications: + if tc.requestCount == 0 { + tc.TestError(t, "### REST notification count unexpectedly ZERO for %s (%v)", restSubsId, tc) + } else if e2Ids.RestSubsId != restSubsId { + tc.TestError(t, "### Unexpected REST notifications received |%s:%s| (%v)", e2Ids.RestSubsId, restSubsId, tc) + } else { + tc.requestCount-- + if tc.requestCount == 0 { + tc.Info("### All expected REST notifications received for %s (%v)", e2Ids.RestSubsId, tc) + } else { + tc.Info("### Expected REST notifications received for %s, (%v)", e2Ids.RestSubsId, tc) + } + tc.Info("### REST Notification received Notif for %s : %v", e2Ids.RestSubsId, e2Ids.E2SubsId) + tc.ListedRESTNotifications <- e2Ids + } + case <-time.After(15 * time.Second): + err := fmt.Errorf("### Timeout 15s expired while expecting REST notification for subsId: %v", restSubsId) + tc.TestError(t, "%s", err.Error()) + } + }() +} + +func (tc *E2Stub) WaitRESTNotification(t *testing.T, restSubsId string) uint32 { + select { + case e2SubsId := <-tc.ListedRESTNotifications: + if e2SubsId.RestSubsId == restSubsId { + tc.Info("### Expected REST notifications received %s, e2SubsId %v for endpoint=%s, (%v)", e2SubsId.RestSubsId, e2SubsId.E2SubsId, tc.clientEndpoint, tc) + return e2SubsId.E2SubsId + } else { + tc.TestError(t, "### Unexpected REST notifications received %s, expected %s for endpoint=%s, (%v)", e2SubsId.RestSubsId, restSubsId, tc.clientEndpoint, tc) + return 0 + } + case <-time.After(15 * time.Second): + err := fmt.Errorf("### Timeout 15s expired while waiting REST notification for subsId: %v", restSubsId) + tc.TestError(t, "%s", err.Error()) + panic("WaitRESTNotification - timeout error") + } + return 0 +} + +func (tc *E2Stub) WaitRESTNotificationForAnySubscriptionId(t *testing.T) { + go func() { + tc.Info("### REST notifications received for endpoint=%s, (%v)", tc.clientEndpoint, tc) + select { + case e2SubsId := <-tc.CallBackNotification: + tc.Info("### REST notifications received e2SubsId %v for endpoint=%s, (%v)", e2SubsId, tc.clientEndpoint, tc) + tc.RESTNotification <- (uint32)(e2SubsId) + case <-time.After(15 * time.Second): + err := fmt.Errorf("### Timeout 15s expired while waiting REST notification") + tc.TestError(t, "%s", err.Error()) + tc.RESTNotification <- 0 + } + }() +} + +func (tc *E2Stub) ListedRestNotifHandler(resp *clientmodel.SubscriptionResponse) { + + if len(tc.restSubsIdList) == 0 { + tc.Error("Unexpected listed REST notifications received for endpoint=%s, expected restSubsId list size was ZERO!", tc.clientEndpoint) + } else { + for i, subsId := range tc.restSubsIdList { + if *resp.SubscriptionID == subsId { + //tc.Info("Listed REST notifications received SubscriptionID=%s, InstanceID=%v, RequestorID=%v", + // *resp.SubscriptionID, *resp.SubscriptionInstances[0].InstanceID, *resp.SubscriptionInstances[0].RequestorID) + + tc.restSubsIdList = append(tc.restSubsIdList[:i], tc.restSubsIdList[i+1:]...) + //tc.Info("Removed %s from Listed REST notifications, %v entries left", *resp.SubscriptionID, len(tc.restSubsIdList)) + + tc.CallBackListedNotifications <- E2RestIds{*resp.SubscriptionID, uint32(*resp.SubscriptionInstances[0].InstanceID)} + + if len(tc.restSubsIdList) == 0 { + //tc.Info("All listed REST notifications received for endpoint=%s", tc.clientEndpoint) + } + + return + } + } + tc.Error("UNKONWN REST notification received SubscriptionID=%s<>%s, InstanceID=%v, RequestorID=%v (%v)", + tc.subscriptionId, *resp.SubscriptionID, *resp.SubscriptionInstances[0].InstanceID, *resp.SubscriptionInstances[0].RequestorID, tc) + } +} + +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (tc *E2Stub) WaitListedRestNotifications(t *testing.T, restSubsIds []string) { + tc.Info("Started to wait REST notifications %v on port %v f(RMR port %v)", restSubsIds, *tc.clientEndpoint.HTTPPort, *tc.clientEndpoint.RMRPort) + + tc.restSubsIdList = restSubsIds + xapp.Subscription.SetResponseCB(tc.ListedRestNotifHandler) + + for i := 0; i < len(restSubsIds); i++ { + go func() { + select { + case e2Ids := <-tc.CallBackListedNotifications: + tc.Info("Listed Notification waiter received Notif for %s : %v", e2Ids.RestSubsId, e2Ids.E2SubsId) + tc.ListedRESTNotifications <- e2Ids + case <-time.After(15 * time.Second): + err := fmt.Errorf("Timeout 15s expired while waiting Listed REST notification") + tc.TestError(t, "%s", err.Error()) + tc.RESTNotification <- 0 + } + }() + } +} + +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (tc *E2Stub) SendRESTSubsReq(t *testing.T, params *RESTSubsReqParams) string { // This need to be edited according to new specification + tc.Info("======== Posting REST Report subscriptions to Submgr ======") + + if params == nil { + tc.Info("SendRESTReportSubsReq: params == nil") + return "" + } + + tc.subscriptionId = "SUBSCIPTIONID NOT SET" + + resp, err := xapp.Subscription.Subscribe(¶ms.SubsReqParams) + if err != nil { + // Swagger generated code makes checks for the values that are inserted the subscription function + // If error cause is unknown and POST is not done, the problem is in the inserted values + tc.Error("======== REST report subscriptions failed %s ========", err.Error()) + return "" + } + tc.subscriptionId = *resp.SubscriptionID + tc.Info("======== REST report subscriptions posted successfully. SubscriptionID = %s, RequestCount = %v ========", *resp.SubscriptionID, tc.requestCount) + return *resp.SubscriptionID +} + +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (tc *E2Stub) GetRESTSubsReqReportParams(subReqCount int) *RESTSubsReqParams { + + reportParams := RESTSubsReqParams{} + reportParams.GetRESTSubsReqReportParams(subReqCount, &tc.clientEndpoint, &tc.meid) + tc.requestCount = subReqCount + return &reportParams +} + +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +type RESTSubsReqParams struct { + SubsReqParams clientmodel.SubscriptionParams +} + +func (p *RESTSubsReqParams) GetRESTSubsReqReportParams(subReqCount int, clientEndpoint *clientmodel.SubscriptionParamsClientEndpoint, meid *string) { + + // E2SM-gNB-X2 + p.SubsReqParams.ClientEndpoint = clientEndpoint + p.SubsReqParams.Meid = meid + var rANFunctionID int64 = 33 + p.SubsReqParams.RANFunctionID = &rANFunctionID + + // reqId := int64(1) + //seqId := int64(1) + actionId := int64(1) + actionType := "report" + subsequestActioType := "continue" + timeToWait := "w10ms" + + for requestCount := 0; requestCount < subReqCount; requestCount++ { + reqId := int64(requestCount) + 1 + seqId := int64(requestCount) + 1 + subscriptionDetail := &clientmodel.SubscriptionDetail{ + RequestorID: &reqId, + InstanceID: &seqId, + EventTriggers: &clientmodel.EventTriggerDefinition{ + OctetString: "1234" + strconv.Itoa(requestCount), + }, + ActionToBeSetupList: clientmodel.ActionsToBeSetup{ + &clientmodel.ActionToBeSetup{ + ActionID: &actionId, + ActionType: &actionType, + ActionDefinition: &clientmodel.ActionDefinition{ + OctetString: "5678" + strconv.Itoa(requestCount), + }, + SubsequentAction: &clientmodel.SubsequentAction{ + SubsequentActionType: &subsequestActioType, + TimeToWait: &timeToWait, + }, + }, + }, + } + p.SubsReqParams.SubscriptionDetails = append(p.SubsReqParams.SubscriptionDetails, subscriptionDetail) + } + +} + +func (p *RESTSubsReqParams) SetMeid(MEID string) { + p.SubsReqParams.Meid = &MEID +} + +func (p *RESTSubsReqParams) SetEndpoint(HTTP_port int64, RMR_port int64, host string) { + var endpoint clientmodel.SubscriptionParamsClientEndpoint + endpoint.HTTPPort = &HTTP_port + endpoint.RMRPort = &RMR_port + endpoint.Host = host + p.SubsReqParams.ClientEndpoint = &endpoint +} + +func (p *RESTSubsReqParams) SetEndpointHost(host string) { + + if p.SubsReqParams.ClientEndpoint.Host != "" { + if p.SubsReqParams.ClientEndpoint.Host != host { + // Renaming toto, print something tc.Info("Posting REST subscription request to Submgr") + err := fmt.Errorf("hostname change attempt: %s -> %s", p.SubsReqParams.ClientEndpoint.Host, host) + panic(err) + } + } + p.SubsReqParams.ClientEndpoint.Host = host +} + +func (p *RESTSubsReqParams) SetHTTPEndpoint(HTTP_port int64, host string) { + + p.SubsReqParams.ClientEndpoint.HTTPPort = &HTTP_port + + p.SetEndpointHost(host) + + if p.SubsReqParams.ClientEndpoint.RMRPort == nil { + var RMR_port int64 + p.SubsReqParams.ClientEndpoint.RMRPort = &RMR_port + } +} + +func (p *RESTSubsReqParams) SetSubActionTypes(actionType string) { + + for _, subDetail := range p.SubsReqParams.SubscriptionDetails { + for _, action := range subDetail.ActionToBeSetupList { + if action != nil { + action.ActionType = &actionType + } + } + } +} + +func (p *RESTSubsReqParams) SetSubActionIDs(actionId int64) { + + for _, subDetail := range p.SubsReqParams.SubscriptionDetails { + for _, action := range subDetail.ActionToBeSetupList { + if action != nil { + action.ActionID = &actionId + } + } + } +} + +func (p *RESTSubsReqParams) SetSubActionDefinition(actionDefinition string) { + + for _, subDetail := range p.SubsReqParams.SubscriptionDetails { + for _, action := range subDetail.ActionToBeSetupList { + if action != nil { + action.ActionDefinition.OctetString = actionDefinition + } + } + } +} + +func (p *RESTSubsReqParams) SetSubEventTriggerDefinition(eventTriggerDefinition string) { + + for _, subDetail := range p.SubsReqParams.SubscriptionDetails { + if subDetail != nil { + subDetail.EventTriggers.OctetString = eventTriggerDefinition + } + } +} + +func (p *RESTSubsReqParams) AppendActionToActionToBeSetupList(actionId int64, actionType string, actionDefinition string, subsequentActionType string, timeToWait string) { + + actionToBeSetup := &clientmodel.ActionToBeSetup{ + ActionID: &actionId, + ActionType: &actionType, + ActionDefinition: &clientmodel.ActionDefinition{ + OctetString: actionDefinition, + }, + SubsequentAction: &clientmodel.SubsequentAction{ + SubsequentActionType: &subsequentActionType, + TimeToWait: &timeToWait, + }, + } + + for _, subDetail := range p.SubsReqParams.SubscriptionDetails { + if subDetail != nil { + subDetail.ActionToBeSetupList = append(subDetail.ActionToBeSetupList, actionToBeSetup) + } + } +} + +func (p *RESTSubsReqParams) SetRMREndpoint(RMR_port int64, host string) { + + p.SubsReqParams.ClientEndpoint.RMRPort = &RMR_port + + p.SetEndpointHost(host) + + if p.SubsReqParams.ClientEndpoint.HTTPPort == nil { + var HTTP_port int64 + p.SubsReqParams.ClientEndpoint.HTTPPort = &HTTP_port + } +} + +func (p *RESTSubsReqParams) SetTimeToWait(timeToWait string) { + + for _, subDetail := range p.SubsReqParams.SubscriptionDetails { + for _, action := range subDetail.ActionToBeSetupList { + if action != nil && action.SubsequentAction != nil { + action.SubsequentAction.TimeToWait = &timeToWait + } + } + } +} + +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (tc *E2Stub) SendRESTSubsDelReq(t *testing.T, subscriptionID *string) { + + if *subscriptionID == "" { + tc.Error("REST error in deleting subscriptions. Empty SubscriptionID = %s", *subscriptionID) + } + tc.Info("REST deleting E2 subscriptions. SubscriptionID = %s", *subscriptionID) + + err := xapp.Subscription.Unsubscribe(*subscriptionID) + if err != nil { + tc.Error("REST Delete subscription failed %s", err.Error()) + } + tc.Info("REST delete subscription pushed to submgr successfully. SubscriptionID = %s", *subscriptionID) +} + +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (tc *E2Stub) GetRESTSubsReqPolicyParams(subReqCount int) *RESTSubsReqParams { + + policyParams := RESTSubsReqParams{} + policyParams.GetRESTSubsReqPolicyParams(subReqCount, &tc.clientEndpoint, &tc.meid) + tc.requestCount = subReqCount + return &policyParams +} + +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (p *RESTSubsReqParams) GetRESTSubsReqPolicyParams(subReqCount int, clientEndpoint *clientmodel.SubscriptionParamsClientEndpoint, meid *string) { + + p.SubsReqParams.ClientEndpoint = clientEndpoint + p.SubsReqParams.Meid = meid + var rANFunctionID int64 = 33 + p.SubsReqParams.RANFunctionID = &rANFunctionID + + // reqId := int64(1) + //seqId := int64(1) + actionId := int64(1) + actionType := "policy" + subsequestActioType := "continue" + timeToWait := "w10ms" + + for requestCount := 0; requestCount < subReqCount; requestCount++ { + reqId := int64(requestCount) + 1 + seqId := int64(0) + subscriptionDetail := &clientmodel.SubscriptionDetail{ + RequestorID: &reqId, + InstanceID: &seqId, + EventTriggers: &clientmodel.EventTriggerDefinition{ + OctetString: "1234" + strconv.Itoa(requestCount), + }, + ActionToBeSetupList: clientmodel.ActionsToBeSetup{ + &clientmodel.ActionToBeSetup{ + ActionID: &actionId, + ActionType: &actionType, + ActionDefinition: &clientmodel.ActionDefinition{ + OctetString: "5678" + strconv.Itoa(requestCount), + }, + SubsequentAction: &clientmodel.SubsequentAction{ + SubsequentActionType: &subsequestActioType, + TimeToWait: &timeToWait, + }, + }, + }, + } + p.SubsReqParams.SubscriptionDetails = append(p.SubsReqParams.SubscriptionDetails, subscriptionDetail) + } + +}