X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fe2ap.go;h=30f1ef2598fb0d45c55e793ff26c64b825994f86;hb=63284a2eed02f5bfec0a237f83aae95adc702c43;hp=084c7eb35e888354eb0e524118ba88894961e904;hpb=8046c70a77be2de39ffda0092b1d86008145d81a;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/e2ap.go b/pkg/control/e2ap.go index 084c7eb..30f1ef2 100644 --- a/pkg/control/e2ap.go +++ b/pkg/control/e2ap.go @@ -27,11 +27,10 @@ package control import "C" import ( - "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/e2ap/pkg/packer" - "unsafe" + "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp" ) var packerif e2ap.E2APPackerIf = e2ap_wrapper.NewAsn1E2Packer() @@ -39,198 +38,188 @@ var packerif e2ap.E2APPackerIf = e2ap_wrapper.NewAsn1E2Packer() type E2ap struct { } -/* RICsubscriptionRequest */ - -// 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. Erroxappde: %v", cret) +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (c *E2ap) UnpackSubscriptionRequest(payload []byte) (*e2ap.E2APSubscriptionRequest, error) { + e2SubReq := packerif.NewPackerSubscriptionRequest() + packedData := &packer.PackedData{} + packedData.Buf = payload + err := e2SubReq.UnPack(packedData) + if err != nil { + return nil, err } - subId = uint16(cret) - return -} - -// Used by submgr, xapp 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. Erroxappde: %v", size) + err, subReq := e2SubReq.Get() + if err != nil { + return nil, err } - return + return subReq, nil } -// Used by submgr, xapp 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. Erroxappde: %v", cret) +func (c *E2ap) PackSubscriptionRequest(req *e2ap.E2APSubscriptionRequest) (int, *packer.PackedData, error) { + e2SubReq := packerif.NewPackerSubscriptionRequest() + err := e2SubReq.Set(req) + if err != nil { + return 0, nil, err } - subId = uint16(cret) - return -} - -// 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. Erroxappde: %v", size) + err, packedData := e2SubReq.Pack(nil) + 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. Erroxappde: %v", cret) +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (c *E2ap) UnpackSubscriptionResponse(payload []byte) (*e2ap.E2APSubscriptionResponse, error) { + e2SubResp := packerif.NewPackerSubscriptionResponse() + packedData := &packer.PackedData{} + packedData.Buf = payload + err := e2SubResp.UnPack(packedData) + if err != nil { + return nil, err } - subId = uint16(cret) - return -} - -// Used by xapp 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. Erroxappde: %v", size) + err, subResp := e2SubResp.Get() + if err != nil { + return nil, err } - return + return subResp, nil } -/* RICsubscriptionDeleteResponse */ - -// Used by submgr, e2t 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. Erroxappde: %v", cret) +func (c *E2ap) PackSubscriptionResponse(req *e2ap.E2APSubscriptionResponse) (int, *packer.PackedData, error) { + e2SubResp := packerif.NewPackerSubscriptionResponse() + err := e2SubResp.Set(req) + if err != nil { + return 0, nil, err } - subId = uint16(cret) - return -} - -// 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. Erroxappde: %v", size) + err, packedData := e2SubResp.Pack(nil) + if err != nil { + return 0, nil, err } - return + return xapp.RIC_SUB_RESP, packedData, nil } -/* RICsubscriptionRequestFailure */ - -// 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. Erroxappde: %v", cret) +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (c *E2ap) UnpackSubscriptionFailure(payload []byte) (*e2ap.E2APSubscriptionFailure, error) { + e2SubFail := packerif.NewPackerSubscriptionFailure() + packedData := &packer.PackedData{} + packedData.Buf = payload + err := e2SubFail.UnPack(packedData) + if err != nil { + return nil, err } - subId = uint16(cret) - return + err, subFail := e2SubFail.Get() + if err != nil { + return nil, err + } + return subFail, nil } -// Used by e2t test stub -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. Erroxappde: %v", size) +func (c *E2ap) PackSubscriptionFailure(req *e2ap.E2APSubscriptionFailure) (int, *packer.PackedData, error) { + e2SubFail := packerif.NewPackerSubscriptionFailure() + err := e2SubFail.Set(req) + if err != nil { + return 0, nil, err } - return + err, packedData := e2SubFail.Pack(nil) + if err != nil { + return 0, nil, err + } + return xapp.RIC_SUB_FAILURE, packedData, nil } -/* RICsubscriptionDeleteFailure */ - -// 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. Erroxappde: %v", cret) +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (c *E2ap) UnpackSubscriptionDeleteRequest(payload []byte) (*e2ap.E2APSubscriptionDeleteRequest, error) { + e2SubDelReq := packerif.NewPackerSubscriptionDeleteRequest() + packedData := &packer.PackedData{} + packedData.Buf = payload + err := e2SubDelReq.UnPack(packedData) + if err != nil { + return nil, err } - subId = uint16(cret) - return + err, subDelReq := e2SubDelReq.Get() + if err != nil { + return nil, err + } + return subDelReq, 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. Erroxappde: %v", size) +func (c *E2ap) PackSubscriptionDeleteRequest(req *e2ap.E2APSubscriptionDeleteRequest) (int, *packer.PackedData, error) { + e2SubDelReq := packerif.NewPackerSubscriptionDeleteRequest() + err := e2SubDelReq.Set(req) + if err != nil { + return 0, nil, err } - return + err, packedData := e2SubDelReq.Pack(nil) + if err != nil { + return 0, nil, err + } + return xapp.RIC_SUB_DEL_REQ, packedData, nil } -// Used by submgr -func (c *E2ap) PackSubscriptionDeleteResponse(payload []byte, newSubscriptionid uint16) (newPayload []byte, err error) { - e2SubDelReq := packerif.NewPackerSubscriptionDeleteRequest() +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (c *E2ap) UnpackSubscriptionDeleteResponse(payload []byte) (*e2ap.E2APSubscriptionDeleteResponse, error) { + e2SubDelResp := packerif.NewPackerSubscriptionDeleteResponse() packedData := &packer.PackedData{} packedData.Buf = payload - err = e2SubDelReq.UnPack(packedData) + err := e2SubDelResp.UnPack(packedData) if err != nil { - return make([]byte, 0), fmt.Errorf("PackSubDelResp: UnPack() failed: %s", err.Error()) + return nil, err } - getErr, subDelReq := e2SubDelReq.Get() - if getErr != nil { - return make([]byte, 0), fmt.Errorf("PackSubDelResp: Get() failed: %s", getErr.Error()) + err, subDelResp := e2SubDelResp.Get() + if err != nil { + return nil, err } + return subDelResp, nil +} +func (c *E2ap) PackSubscriptionDeleteResponse(req *e2ap.E2APSubscriptionDeleteResponse) (int, *packer.PackedData, error) { e2SubDelResp := packerif.NewPackerSubscriptionDeleteResponse() - subDelResp := e2ap.E2APSubscriptionDeleteResponse{} - subDelResp.RequestId.Id = subDelReq.RequestId.Id - subDelResp.RequestId.Seq = uint32(newSubscriptionid) - subDelResp.FunctionId = subDelReq.FunctionId - err = e2SubDelResp.Set(&subDelResp) + err := e2SubDelResp.Set(req) if err != nil { - return make([]byte, 0), fmt.Errorf("PackSubDelResp: Set() failed: %s", err.Error()) + return 0, nil, err } - err, packedData = e2SubDelResp.Pack(nil) + err, packedData := e2SubDelResp.Pack(nil) if err != nil { - return make([]byte, 0), fmt.Errorf("PackSubDelResp: Pack() failed: %s", err.Error()) + return 0, nil, err } - return packedData.Buf, nil + return xapp.RIC_SUB_DEL_RESP, packedData, nil } -// Used by submgr -func (c *E2ap) PackSubscriptionDeleteRequest(payload []byte, newSubscriptionid uint16) (newPayload []byte, err error) { - e2SubReq := packerif.NewPackerSubscriptionRequest() +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (c *E2ap) UnpackSubscriptionDeleteFailure(payload []byte) (*e2ap.E2APSubscriptionDeleteFailure, error) { + e2SubDelFail := packerif.NewPackerSubscriptionDeleteFailure() packedData := &packer.PackedData{} packedData.Buf = payload - err = e2SubReq.UnPack(packedData) + err := e2SubDelFail.UnPack(packedData) if err != nil { - return make([]byte, 0), fmt.Errorf("PackSubDelReq: UnPack() failed: %s", err.Error()) + return nil, err } - getErr, subReq := e2SubReq.Get() - if getErr != nil { - return make([]byte, 0), fmt.Errorf("PackSubDelReq: Get() failed: %s", getErr.Error()) + err, subDelFail := e2SubDelFail.Get() + if err != nil { + return nil, err } + return subDelFail, nil +} - e2SubDel := packerif.NewPackerSubscriptionDeleteRequest() - subDelReq := e2ap.E2APSubscriptionDeleteRequest{} - subDelReq.RequestId.Id = subReq.RequestId.Id - subDelReq.RequestId.Seq = uint32(newSubscriptionid) - subDelReq.FunctionId = subReq.FunctionId - err = e2SubDel.Set(&subDelReq) +func (c *E2ap) PackSubscriptionDeleteFailure(req *e2ap.E2APSubscriptionDeleteFailure) (int, *packer.PackedData, error) { + e2SubDelFail := packerif.NewPackerSubscriptionDeleteFailure() + err := e2SubDelFail.Set(req) if err != nil { - return make([]byte, 0), fmt.Errorf("PackSubDelReq: Set() failed: %s", err.Error()) + return 0, nil, err } - err, packedData = e2SubDel.Pack(nil) + err, packedData := e2SubDelFail.Pack(nil) if err != nil { - return make([]byte, 0), fmt.Errorf("PackSubDelReq: Pack() failed: %s", err.Error()) + return 0, nil, err } - return packedData.Buf, nil + return xapp.RIC_SUB_DEL_FAILURE, packedData, nil }