X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fe2ap.go;h=f17012bcc6809d8ad0f35c9c37474b0898b5e685;hb=e5e672c043d80c7a531b9d6d640ca8879d9bf01b;hp=209b13cc8c9666edd605bc083a9e797035a84804;hpb=ff8dccd02d76eebfccc0b509ce0b42a2c1760e12;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/e2ap.go b/pkg/control/e2ap.go index 209b13c..f17012b 100644 --- a/pkg/control/e2ap.go +++ b/pkg/control/e2ap.go @@ -20,152 +20,201 @@ package control /* -#include - #cgo LDFLAGS: -le2ap_wrapper -le2ap */ import "C" import ( + "encoding/hex" "fmt" - "unsafe" + + "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" + "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp" ) -type E2ap struct { +var packerif e2ap.E2APPackerIf = e2ap_wrapper.NewAsn1E2Packer() + +func GetPackerIf() e2ap.E2APPackerIf { + return packerif } -/* RICsubscriptionRequest */ +func SetPackerIf(iface e2ap.E2APPackerIf) { + packerif = iface +} -// Used by e2t test stub -func (c *E2ap) GetSubscriptionRequestSequenceNumber(payload []byte) (subId uint16, err error) { - cptr := unsafe.Pointer(&payload[0]) - cret := C.e2ap_get_ric_subscription_request_sequence_number(cptr, C.size_t(len(payload))) - if cret < 0 { - return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Request Sequence Number due to wrong or invalid payload. ErrorCode: %v", cret) - } - subId = uint16(cret) - return +type E2ap struct { } -// Used by submgr, rco test stub -func (c *E2ap) SetSubscriptionRequestSequenceNumber(payload []byte, newSubscriptionid uint16) (err error) { - cptr := unsafe.Pointer(&payload[0]) - size := C.e2ap_set_ric_subscription_request_sequence_number(cptr, C.size_t(len(payload)), C.long(newSubscriptionid)) - if size < 0 { - return fmt.Errorf("e2ap wrapper is unable to set Subscription Request Sequence Number due to wrong or invalid payload. ErrorCode: %v", size) +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (c *E2ap) FillSubscriptionReqMsgs(params interface{}, subreqList *e2ap.SubscriptionRequestList, restSubscription *RESTSubscription) error { + xapp.Logger.Info("FillSubscriptionReqMsgs") + + p := params.(*models.SubscriptionParams) + + for _, subscriptionDetail := range p.SubscriptionDetails { + subReqMsg := e2ap.E2APSubscriptionRequest{} + + 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)) + + for _, actionToBeSetup := range subscriptionDetail.ActionToBeSetupList { + actionToBeSetupItem := e2ap.ActionToBeSetupItem{} + actionToBeSetupItem.ActionType = e2ap.E2AP_ActionTypeInvalid + actionToBeSetupItem.ActionId = uint64(*actionToBeSetup.ActionID) + + 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 actionToBeSetup.SubsequentAction != nil { + actionToBeSetupItem.SubsequentAction.Present = true + actionToBeSetupItem.SubsequentAction.Type = e2ap.E2AP_SubSeqActionTypeStrMap[*actionToBeSetup.SubsequentAction.SubsequentActionType] + actionToBeSetupItem.SubsequentAction.TimetoWait = e2ap.E2AP_TimeToWaitStrMap[*actionToBeSetup.SubsequentAction.TimeToWait] + } + subReqMsg.ActionSetups = append(subReqMsg.ActionSetups, actionToBeSetupItem) + } + subreqList.E2APSubscriptionRequests = append(subreqList.E2APSubscriptionRequests, subReqMsg) } - return + return nil } -// Used by submgr, rco test stub -func (c *E2ap) GetSubscriptionResponseSequenceNumber(payload []byte) (subId uint16, err error) { - cptr := unsafe.Pointer(&payload[0]) - cret := C.e2ap_get_ric_subscription_response_sequence_number(cptr, C.size_t(len(payload))) - if cret < 0 { - return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Response Sequence Number due to wrong or invalid payload. ErrorCode: %v", cret) +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (c *E2ap) UnpackSubscriptionRequest(payload []byte) (*e2ap.E2APSubscriptionRequest, error) { + e2SubReq := packerif.NewPackerSubscriptionRequest() + err, subReq := e2SubReq.UnPack(&e2ap.PackedData{payload}) + if err != nil { + return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload)) } - subId = uint16(cret) - return + return subReq, nil } -// Used by e2t test stub -func (c *E2ap) SetSubscriptionResponseSequenceNumber(payload []byte, newSubscriptionid uint16) (err error) { - cptr := unsafe.Pointer(&payload[0]) - size := C.e2ap_set_ric_subscription_response_sequence_number(cptr, C.size_t(len(payload)), C.long(newSubscriptionid)) - if size < 0 { - return fmt.Errorf("e2ap wrapper is unable to set Subscription Response Sequence Number due to wrong or invalid payload. ErrorCode: %v", size) +func (c *E2ap) PackSubscriptionRequest(req *e2ap.E2APSubscriptionRequest) (int, *e2ap.PackedData, error) { + e2SubReq := packerif.NewPackerSubscriptionRequest() + err, packedData := e2SubReq.Pack(req) + if err != nil { + return 0, nil, err } - return + return xapp.RIC_SUB_REQ, packedData, nil } -/* RICsubscriptionDeleteRequest */ - -// Used by submgr, e2t test stub -func (c *E2ap) GetSubscriptionDeleteRequestSequenceNumber(payload []byte) (subId uint16, err error) { - cptr := unsafe.Pointer(&payload[0]) - cret := C.e2ap_get_ric_subscription_delete_request_sequence_number(cptr, C.size_t(len(payload))) - if cret < 0 { - return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Delete Request Sequence Number due to wrong or invalid payload. ErrorCode: %v", cret) +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (c *E2ap) UnpackSubscriptionResponse(payload []byte) (*e2ap.E2APSubscriptionResponse, error) { + e2SubResp := packerif.NewPackerSubscriptionResponse() + err, subResp := e2SubResp.UnPack(&e2ap.PackedData{payload}) + if err != nil { + return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload)) } - subId = uint16(cret) - return + return subResp, nil } -// Used by rco test stub -func (c *E2ap) SetSubscriptionDeleteRequestSequenceNumber(payload []byte, newSubscriptionid uint16) (err error) { - cptr := unsafe.Pointer(&payload[0]) - size := C.e2ap_set_ric_subscription_delete_request_sequence_number(cptr, C.size_t(len(payload)), C.long(newSubscriptionid)) - if size < 0 { - return fmt.Errorf("e2ap wrapper is unable to set Subscription Delete Request Sequence Number due to wrong or invalid payload. ErrorCode: %v", size) +func (c *E2ap) PackSubscriptionResponse(req *e2ap.E2APSubscriptionResponse) (int, *e2ap.PackedData, error) { + e2SubResp := packerif.NewPackerSubscriptionResponse() + err, packedData := e2SubResp.Pack(req) + if err != nil { + return 0, nil, err } - return + return xapp.RIC_SUB_RESP, packedData, nil } -/* RICsubscriptionDeleteResponse */ - -// Used by submgr, rco test stub -func (c *E2ap) GetSubscriptionDeleteResponseSequenceNumber(payload []byte) (subId uint16, err error) { - cptr := unsafe.Pointer(&payload[0]) - cret := C.e2ap_get_ric_subscription_delete_response_sequence_number(cptr, C.size_t(len(payload))) - if cret < 0 { - return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Delete Response Sequence Number due to wrong or invalid payload. ErrorCode: %v", cret) +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (c *E2ap) UnpackSubscriptionFailure(payload []byte) (*e2ap.E2APSubscriptionFailure, error) { + e2SubFail := packerif.NewPackerSubscriptionFailure() + err, subFail := e2SubFail.UnPack(&e2ap.PackedData{payload}) + if err != nil { + return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload)) } - subId = uint16(cret) - return + return subFail, nil } -// Used by e2t test stub -func (c *E2ap) SetSubscriptionDeleteResponseSequenceNumber(payload []byte, newSubscriptionid uint16) (err error) { - cptr := unsafe.Pointer(&payload[0]) - size := C.e2ap_set_ric_subscription_delete_response_sequence_number(cptr, C.size_t(len(payload)), C.long(newSubscriptionid)) - if size < 0 { - return fmt.Errorf("e2ap wrapper is unable to set Subscription Delete Response Sequence Number due to wrong or invalid payload. ErrorCode: %v", size) +func (c *E2ap) PackSubscriptionFailure(req *e2ap.E2APSubscriptionFailure) (int, *e2ap.PackedData, error) { + e2SubFail := packerif.NewPackerSubscriptionFailure() + err, packedData := e2SubFail.Pack(req) + if err != nil { + return 0, nil, err } - return + return xapp.RIC_SUB_FAILURE, packedData, nil } -/* RICsubscriptionRequestFailure */ +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (c *E2ap) UnpackSubscriptionDeleteRequest(payload []byte) (*e2ap.E2APSubscriptionDeleteRequest, error) { + e2SubDelReq := packerif.NewPackerSubscriptionDeleteRequest() + err, subDelReq := e2SubDelReq.UnPack(&e2ap.PackedData{payload}) + if err != nil { + return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload)) + } + return subDelReq, nil +} -// Used by submgr -func (c *E2ap) GetSubscriptionFailureSequenceNumber(payload []byte) (subId uint16, err error) { - cptr := unsafe.Pointer(&payload[0]) - cret := C.e2ap_get_ric_subscription_failure_sequence_number(cptr, C.size_t(len(payload))) - if cret < 0 { - return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Failure Sequence Number due to wrong or invalid payload. ErrorCode: %v", cret) +func (c *E2ap) PackSubscriptionDeleteRequest(req *e2ap.E2APSubscriptionDeleteRequest) (int, *e2ap.PackedData, error) { + e2SubDelReq := packerif.NewPackerSubscriptionDeleteRequest() + err, packedData := e2SubDelReq.Pack(req) + if err != nil { + return 0, nil, err } - subId = uint16(cret) - return + return xapp.RIC_SUB_DEL_REQ, packedData, nil } -// Used by submgr -func (c *E2ap) SetSubscriptionFailureSequenceNumber(payload []byte, newSubscriptionid uint16) (err error) { - cptr := unsafe.Pointer(&payload[0]) - size := C.e2ap_set_ric_subscription_failure_sequence_number(cptr, C.size_t(len(payload)), C.long(newSubscriptionid)) - if size < 0 { - return fmt.Errorf("e2ap wrapper is unable to set Subscription Failure Sequence Number due to wrong or invalid payload. ErrorCode: %v", size) +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (c *E2ap) UnpackSubscriptionDeleteResponse(payload []byte) (*e2ap.E2APSubscriptionDeleteResponse, error) { + e2SubDelResp := packerif.NewPackerSubscriptionDeleteResponse() + err, subDelResp := e2SubDelResp.UnPack(&e2ap.PackedData{payload}) + if err != nil { + return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload)) } - return + return subDelResp, nil } -/* RICsubscriptionDeleteFailure */ +func (c *E2ap) PackSubscriptionDeleteResponse(req *e2ap.E2APSubscriptionDeleteResponse) (int, *e2ap.PackedData, error) { + e2SubDelResp := packerif.NewPackerSubscriptionDeleteResponse() + err, packedData := e2SubDelResp.Pack(req) + if err != nil { + return 0, nil, err + } + return xapp.RIC_SUB_DEL_RESP, packedData, nil +} -// Used by submgr -func (c *E2ap) GetSubscriptionDeleteFailureSequenceNumber(payload []byte) (subId uint16, err error) { - cptr := unsafe.Pointer(&payload[0]) - cret := C.e2ap_get_ric_subscription_delete_failure_sequence_number(cptr, C.size_t(len(payload))) - if cret < 0 { - return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Delete Failure Sequence Number due to wrong or invalid payload. ErrorCode: %v", cret) +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (c *E2ap) UnpackSubscriptionDeleteFailure(payload []byte) (*e2ap.E2APSubscriptionDeleteFailure, error) { + e2SubDelFail := packerif.NewPackerSubscriptionDeleteFailure() + err, subDelFail := e2SubDelFail.UnPack(&e2ap.PackedData{payload}) + if err != nil { + return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload)) } - subId = uint16(cret) - return + return subDelFail, nil } -// Used by submgr -func (c *E2ap) SetSubscriptionDeleteFailureSequenceNumber(payload []byte, newSubscriptionid uint16) (err error) { - cptr := unsafe.Pointer(&payload[0]) - size := C.e2ap_set_ric_subscription_delete_failure_sequence_number(cptr, C.size_t(len(payload)), C.long(newSubscriptionid)) - if size < 0 { - return fmt.Errorf("e2ap wrapper is unable to set Subscription Delete Failure Sequence Number due to wrong or invalid payload. ErrorCode: %v", size) +/* +func (c *E2ap) PackSubscriptionDeleteFailure(req *e2ap.E2APSubscriptionDeleteFailure) (int, *e2ap.PackedData, error) { + e2SubDelFail := packerif.NewPackerSubscriptionDeleteFailure() + err, packedData := e2SubDelFail.Pack(req) + if err != nil { + return 0, nil, err } - return + return xapp.RIC_SUB_DEL_FAILURE, packedData, nil } +*/