X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fe2ap.go;h=93bd42d5370b98eaf84122a3f1aec9972bdf7d73;hb=6bd579175aaa85f1dd864ad10fe4209ed6b450ea;hp=d3bd36b255b0859357f2d82c6e5266a541d8bf96;hpb=37f85a0157751a7e34e03f766d356ce890bad838;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/e2ap.go b/pkg/control/e2ap.go index d3bd36b..93bd42d 100644 --- a/pkg/control/e2ap.go +++ b/pkg/control/e2ap.go @@ -26,7 +26,9 @@ import "C" import ( "encoding/hex" + "encoding/json" "fmt" + "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/xapp-frame/pkg/models" @@ -35,14 +37,29 @@ import ( var packerif e2ap.E2APPackerIf = e2ap_wrapper.NewAsn1E2Packer() +func GetPackerIf() e2ap.E2APPackerIf { + return packerif +} + +func SetPackerIf(iface e2ap.E2APPackerIf) { + packerif = iface +} + type E2ap struct { } //----------------------------------------------------------------------------- // //----------------------------------------------------------------------------- -func (c *E2ap) FillSubscriptionReqMsgs(params interface{}, subreqList *e2ap.SubscriptionRequestList, restSubscription *RESTSubscription) error { - xapp.Logger.Info("FillSubscriptionReqMsgs") +func (e *E2ap) SetASN1DebugPrintStatus(logLevel int) { + e2ap_wrapper.SetASN1DebugPrintStatus(logLevel) +} + +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (e *E2ap) FillSubscriptionReqMsgs(params interface{}, subreqList *e2ap.SubscriptionRequestList, restSubscription *RESTSubscription) error { + xapp.Logger.Debug("FillSubscriptionReqMsgs") p := params.(*models.SubscriptionParams) @@ -52,11 +69,15 @@ func (c *E2ap) FillSubscriptionReqMsgs(params interface{}, subreqList *e2ap.Subs if p.RANFunctionID != nil { subReqMsg.FunctionId = (e2ap.FunctionId)(*p.RANFunctionID) } - subReqMsg.RequestId = e2ap.RequestId{uint32(*subscriptionDetail.RequestorID), uint32(*subscriptionDetail.InstanceID)} - - subReqMsg.EventTriggerDefinition.Data.Data = []byte(subscriptionDetail.EventTriggers.OctetString) - subReqMsg.EventTriggerDefinition.Data.Length = uint64(len(subscriptionDetail.EventTriggers.OctetString)) + e2EventInstanceID := restSubscription.GetE2IdFromXappIdToE2Id(*subscriptionDetail.XappEventInstanceID) + subReqMsg.RequestId = e2ap.RequestId{uint32(*subscriptionDetail.XappEventInstanceID), uint32(e2EventInstanceID)} + if len(subscriptionDetail.EventTriggers) > 0 { + for _, val := range subscriptionDetail.EventTriggers { + subReqMsg.EventTriggerDefinition.Data.Data = append(subReqMsg.EventTriggerDefinition.Data.Data, byte(val)) + } + subReqMsg.EventTriggerDefinition.Data.Length = uint64(len(subscriptionDetail.EventTriggers)) + } for _, actionToBeSetup := range subscriptionDetail.ActionToBeSetupList { actionToBeSetupItem := e2ap.ActionToBeSetupItem{} actionToBeSetupItem.ActionType = e2ap.E2AP_ActionTypeInvalid @@ -65,9 +86,11 @@ func (c *E2ap) FillSubscriptionReqMsgs(params interface{}, subreqList *e2ap.Subs actionToBeSetupItem.ActionType = e2ap.E2AP_ActionTypeStrMap[*actionToBeSetup.ActionType] actionToBeSetupItem.RicActionDefinitionPresent = true - if actionToBeSetup.ActionDefinition != nil { - actionToBeSetupItem.ActionDefinitionChoice.Data.Data = []byte(actionToBeSetup.ActionDefinition.OctetString) - actionToBeSetupItem.ActionDefinitionChoice.Data.Length = uint64(len(actionToBeSetup.ActionDefinition.OctetString)) + if len(actionToBeSetup.ActionDefinition) > 0 { + for _, val := range actionToBeSetup.ActionDefinition { + actionToBeSetupItem.ActionDefinitionChoice.Data.Data = append(actionToBeSetupItem.ActionDefinitionChoice.Data.Data, byte(val)) + } + actionToBeSetupItem.ActionDefinitionChoice.Data.Length = uint64(len(actionToBeSetup.ActionDefinition)) } if actionToBeSetup.SubsequentAction != nil { @@ -85,7 +108,41 @@ func (c *E2ap) FillSubscriptionReqMsgs(params interface{}, subreqList *e2ap.Subs //----------------------------------------------------------------------------- // //----------------------------------------------------------------------------- -func (c *E2ap) UnpackSubscriptionRequest(payload []byte) (*e2ap.E2APSubscriptionRequest, error) { +func (e *E2ap) CheckActionNotAdmittedList(msgType int, actionNotAdmittedList e2ap.ActionNotAdmittedList, c *Control) ErrorInfo { + + var prefixString string + var errorInfo ErrorInfo + var actionNotAdmittedString string + if len(actionNotAdmittedList.Items) > 0 { + if msgType == xapp.RIC_SUB_RESP { + prefixString = "RICSubscriptionResponse partially accepted:" + c.UpdateCounter(cPartialSubRespFromE2) + } else if msgType == xapp.RIC_SUB_FAILURE { + prefixString = "RICSubscriptionFailure:" + } + jsonActionNotAdmittedList, err := json.Marshal(actionNotAdmittedList.Items) + if err != nil { + actionNotAdmittedString = "ActionNotAdmittedList > 0. Submgr json.Marshal error" + xapp.Logger.Error("CheckActionNotAdmittedList() json.Marshal error %s", err.Error()) + } else { + actionNotAdmittedString = "ActionNotAdmittedList: " + string(jsonActionNotAdmittedList) + } + } + + if msgType == xapp.RIC_SUB_FAILURE { + prefixString = "RICSubscriptionFailure" + err := fmt.Errorf("%s", prefixString) + errorInfo.SetInfo(err.Error(), models.SubscriptionInstanceErrorSourceE2Node, "") + } + err := fmt.Errorf("%s %s", prefixString, actionNotAdmittedString) + errorInfo.SetInfo(err.Error(), models.SubscriptionInstanceErrorSourceE2Node, "") + return errorInfo +} + +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (e *E2ap) UnpackSubscriptionRequest(payload []byte) (*e2ap.E2APSubscriptionRequest, error) { e2SubReq := packerif.NewPackerSubscriptionRequest() err, subReq := e2SubReq.UnPack(&e2ap.PackedData{payload}) if err != nil { @@ -106,7 +163,7 @@ func (c *E2ap) PackSubscriptionRequest(req *e2ap.E2APSubscriptionRequest) (int, //----------------------------------------------------------------------------- // //----------------------------------------------------------------------------- -func (c *E2ap) UnpackSubscriptionResponse(payload []byte) (*e2ap.E2APSubscriptionResponse, error) { +func (e *E2ap) UnpackSubscriptionResponse(payload []byte) (*e2ap.E2APSubscriptionResponse, error) { e2SubResp := packerif.NewPackerSubscriptionResponse() err, subResp := e2SubResp.UnPack(&e2ap.PackedData{payload}) if err != nil { @@ -115,7 +172,7 @@ func (c *E2ap) UnpackSubscriptionResponse(payload []byte) (*e2ap.E2APSubscriptio return subResp, nil } -func (c *E2ap) PackSubscriptionResponse(req *e2ap.E2APSubscriptionResponse) (int, *e2ap.PackedData, error) { +func (e *E2ap) PackSubscriptionResponse(req *e2ap.E2APSubscriptionResponse) (int, *e2ap.PackedData, error) { e2SubResp := packerif.NewPackerSubscriptionResponse() err, packedData := e2SubResp.Pack(req) if err != nil { @@ -127,7 +184,7 @@ func (c *E2ap) PackSubscriptionResponse(req *e2ap.E2APSubscriptionResponse) (int //----------------------------------------------------------------------------- // //----------------------------------------------------------------------------- -func (c *E2ap) UnpackSubscriptionFailure(payload []byte) (*e2ap.E2APSubscriptionFailure, error) { +func (e *E2ap) UnpackSubscriptionFailure(payload []byte) (*e2ap.E2APSubscriptionFailure, error) { e2SubFail := packerif.NewPackerSubscriptionFailure() err, subFail := e2SubFail.UnPack(&e2ap.PackedData{payload}) if err != nil { @@ -136,7 +193,7 @@ func (c *E2ap) UnpackSubscriptionFailure(payload []byte) (*e2ap.E2APSubscription return subFail, nil } -func (c *E2ap) PackSubscriptionFailure(req *e2ap.E2APSubscriptionFailure) (int, *e2ap.PackedData, error) { +func (e *E2ap) PackSubscriptionFailure(req *e2ap.E2APSubscriptionFailure) (int, *e2ap.PackedData, error) { e2SubFail := packerif.NewPackerSubscriptionFailure() err, packedData := e2SubFail.Pack(req) if err != nil { @@ -148,7 +205,7 @@ func (c *E2ap) PackSubscriptionFailure(req *e2ap.E2APSubscriptionFailure) (int, //----------------------------------------------------------------------------- // //----------------------------------------------------------------------------- -func (c *E2ap) UnpackSubscriptionDeleteRequest(payload []byte) (*e2ap.E2APSubscriptionDeleteRequest, error) { +func (e *E2ap) UnpackSubscriptionDeleteRequest(payload []byte) (*e2ap.E2APSubscriptionDeleteRequest, error) { e2SubDelReq := packerif.NewPackerSubscriptionDeleteRequest() err, subDelReq := e2SubDelReq.UnPack(&e2ap.PackedData{payload}) if err != nil { @@ -157,7 +214,7 @@ func (c *E2ap) UnpackSubscriptionDeleteRequest(payload []byte) (*e2ap.E2APSubscr return subDelReq, nil } -func (c *E2ap) PackSubscriptionDeleteRequest(req *e2ap.E2APSubscriptionDeleteRequest) (int, *e2ap.PackedData, error) { +func (e *E2ap) PackSubscriptionDeleteRequest(req *e2ap.E2APSubscriptionDeleteRequest) (int, *e2ap.PackedData, error) { e2SubDelReq := packerif.NewPackerSubscriptionDeleteRequest() err, packedData := e2SubDelReq.Pack(req) if err != nil { @@ -169,7 +226,7 @@ func (c *E2ap) PackSubscriptionDeleteRequest(req *e2ap.E2APSubscriptionDeleteReq //----------------------------------------------------------------------------- // //----------------------------------------------------------------------------- -func (c *E2ap) UnpackSubscriptionDeleteResponse(payload []byte) (*e2ap.E2APSubscriptionDeleteResponse, error) { +func (e *E2ap) UnpackSubscriptionDeleteResponse(payload []byte) (*e2ap.E2APSubscriptionDeleteResponse, error) { e2SubDelResp := packerif.NewPackerSubscriptionDeleteResponse() err, subDelResp := e2SubDelResp.UnPack(&e2ap.PackedData{payload}) if err != nil { @@ -178,7 +235,7 @@ func (c *E2ap) UnpackSubscriptionDeleteResponse(payload []byte) (*e2ap.E2APSubsc return subDelResp, nil } -func (c *E2ap) PackSubscriptionDeleteResponse(req *e2ap.E2APSubscriptionDeleteResponse) (int, *e2ap.PackedData, error) { +func (e *E2ap) PackSubscriptionDeleteResponse(req *e2ap.E2APSubscriptionDeleteResponse) (int, *e2ap.PackedData, error) { e2SubDelResp := packerif.NewPackerSubscriptionDeleteResponse() err, packedData := e2SubDelResp.Pack(req) if err != nil { @@ -190,7 +247,7 @@ func (c *E2ap) PackSubscriptionDeleteResponse(req *e2ap.E2APSubscriptionDeleteRe //----------------------------------------------------------------------------- // //----------------------------------------------------------------------------- -func (c *E2ap) UnpackSubscriptionDeleteFailure(payload []byte) (*e2ap.E2APSubscriptionDeleteFailure, error) { +func (e *E2ap) UnpackSubscriptionDeleteFailure(payload []byte) (*e2ap.E2APSubscriptionDeleteFailure, error) { e2SubDelFail := packerif.NewPackerSubscriptionDeleteFailure() err, subDelFail := e2SubDelFail.UnPack(&e2ap.PackedData{payload}) if err != nil { @@ -200,7 +257,7 @@ func (c *E2ap) UnpackSubscriptionDeleteFailure(payload []byte) (*e2ap.E2APSubscr } /* -func (c *E2ap) PackSubscriptionDeleteFailure(req *e2ap.E2APSubscriptionDeleteFailure) (int, *e2ap.PackedData, error) { +func (e *E2ap) PackSubscriptionDeleteFailure(req *e2ap.E2APSubscriptionDeleteFailure) (int, *e2ap.PackedData, error) { e2SubDelFail := packerif.NewPackerSubscriptionDeleteFailure() err, packedData := e2SubDelFail.Pack(req) if err != nil {