X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fe2ap.go;h=ed2f6901c03c08450a18ef7173425e2c3c2b140b;hb=a9bf76cb8dec6e52e7699edf1631c214647f8beb;hp=5f4bb4463540028aeeb8d1db544d49e0aa8f1fef;hpb=4e7c8c5ecb72a7b64b659156d26416a1dbddf394;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/e2ap.go b/pkg/control/e2ap.go index 5f4bb44..ed2f690 100644 --- a/pkg/control/e2ap.go +++ b/pkg/control/e2ap.go @@ -27,11 +27,11 @@ package control import "C" import ( + "encoding/hex" "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,78 +39,25 @@ var packerif e2ap.E2APPackerIf = e2ap_wrapper.NewAsn1E2Packer() type E2ap struct { } -/* 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) - } - subId = uint16(cret) - return -} - -// 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) - } - return -} - -// Used by submgr -func (c *E2ap) PackSubscriptionDeleteResponseFromSubDelReq(payload []byte, newSubscriptionid uint16) (newPayload []byte, err error) { - - subDelReq, err := c.UnpackSubscriptionDeleteRequest(payload) - if err != nil { - return make([]byte, 0), fmt.Errorf("PackSubDelRespFromSubDelReq: SubDelReq unpack failed: %s", err.Error()) - } - - subDelResp := &e2ap.E2APSubscriptionDeleteResponse{} - subDelResp.RequestId.Id = subDelReq.RequestId.Id - subDelResp.RequestId.Seq = uint32(newSubscriptionid) - subDelResp.FunctionId = subDelReq.FunctionId - - packedData, err := c.PackSubscriptionDeleteResponse(subDelResp) - if err != nil { - return make([]byte, 0), fmt.Errorf("PackSubDelRespFromSubDelReq: SubDelResp pack failed: %s", err.Error()) - } - return packedData.Buf, nil -} - //----------------------------------------------------------------------------- // //----------------------------------------------------------------------------- func (c *E2ap) UnpackSubscriptionRequest(payload []byte) (*e2ap.E2APSubscriptionRequest, error) { e2SubReq := packerif.NewPackerSubscriptionRequest() - packedData := &packer.PackedData{} - packedData.Buf = payload - err := e2SubReq.UnPack(packedData) + err, subReq := e2SubReq.UnPack(&e2ap.PackedData{payload}) if err != nil { - return nil, err - } - err, subReq := e2SubReq.Get() - if err != nil { - return nil, err + return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload)) } return subReq, nil } -func (c *E2ap) PackSubscriptionRequest(req *e2ap.E2APSubscriptionRequest) (*packer.PackedData, error) { +func (c *E2ap) PackSubscriptionRequest(req *e2ap.E2APSubscriptionRequest) (int, *e2ap.PackedData, error) { e2SubReq := packerif.NewPackerSubscriptionRequest() - err := e2SubReq.Set(req) - if err != nil { - return nil, err - } - err, packedData := e2SubReq.Pack(nil) + err, packedData := e2SubReq.Pack(req) if err != nil { - return nil, err + return 0, nil, err } - return packedData, nil + return xapp.RIC_SUB_REQ, packedData, nil } //----------------------------------------------------------------------------- @@ -118,30 +65,20 @@ func (c *E2ap) PackSubscriptionRequest(req *e2ap.E2APSubscriptionRequest) (*pack //----------------------------------------------------------------------------- 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 - } - err, subResp := e2SubResp.Get() + err, subResp := e2SubResp.UnPack(&e2ap.PackedData{payload}) if err != nil { - return nil, err + return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload)) } return subResp, nil } -func (c *E2ap) PackSubscriptionResponse(req *e2ap.E2APSubscriptionResponse) (*packer.PackedData, error) { +func (c *E2ap) PackSubscriptionResponse(req *e2ap.E2APSubscriptionResponse) (int, *e2ap.PackedData, error) { e2SubResp := packerif.NewPackerSubscriptionResponse() - err := e2SubResp.Set(req) + err, packedData := e2SubResp.Pack(req) if err != nil { - return nil, err + return 0, nil, err } - err, packedData := e2SubResp.Pack(nil) - if err != nil { - return nil, err - } - return packedData, nil + return xapp.RIC_SUB_RESP, packedData, nil } //----------------------------------------------------------------------------- @@ -149,30 +86,20 @@ func (c *E2ap) PackSubscriptionResponse(req *e2ap.E2APSubscriptionResponse) (*pa //----------------------------------------------------------------------------- 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 - } - err, subFail := e2SubFail.Get() + err, subFail := e2SubFail.UnPack(&e2ap.PackedData{payload}) if err != nil { - return nil, err + return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload)) } return subFail, nil } -func (c *E2ap) PackSubscriptionFailure(req *e2ap.E2APSubscriptionFailure) (*packer.PackedData, error) { +func (c *E2ap) PackSubscriptionFailure(req *e2ap.E2APSubscriptionFailure) (int, *e2ap.PackedData, error) { e2SubFail := packerif.NewPackerSubscriptionFailure() - err := e2SubFail.Set(req) - if err != nil { - return nil, err - } - err, packedData := e2SubFail.Pack(nil) + err, packedData := e2SubFail.Pack(req) if err != nil { - return nil, err + return 0, nil, err } - return packedData, nil + return xapp.RIC_SUB_FAILURE, packedData, nil } //----------------------------------------------------------------------------- @@ -180,30 +107,20 @@ func (c *E2ap) PackSubscriptionFailure(req *e2ap.E2APSubscriptionFailure) (*pack //----------------------------------------------------------------------------- func (c *E2ap) UnpackSubscriptionDeleteRequest(payload []byte) (*e2ap.E2APSubscriptionDeleteRequest, error) { e2SubDelReq := packerif.NewPackerSubscriptionDeleteRequest() - packedData := &packer.PackedData{} - packedData.Buf = payload - err := e2SubDelReq.UnPack(packedData) + err, subDelReq := e2SubDelReq.UnPack(&e2ap.PackedData{payload}) if err != nil { - return nil, err - } - err, subDelReq := e2SubDelReq.Get() - if err != nil { - return nil, err + return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload)) } return subDelReq, nil } -func (c *E2ap) PackSubscriptionDeleteRequest(req *e2ap.E2APSubscriptionDeleteRequest) (*packer.PackedData, error) { +func (c *E2ap) PackSubscriptionDeleteRequest(req *e2ap.E2APSubscriptionDeleteRequest) (int, *e2ap.PackedData, error) { e2SubDelReq := packerif.NewPackerSubscriptionDeleteRequest() - err := e2SubDelReq.Set(req) + err, packedData := e2SubDelReq.Pack(req) if err != nil { - return nil, err + return 0, nil, err } - err, packedData := e2SubDelReq.Pack(nil) - if err != nil { - return nil, err - } - return packedData, nil + return xapp.RIC_SUB_DEL_REQ, packedData, nil } //----------------------------------------------------------------------------- @@ -211,28 +128,39 @@ func (c *E2ap) PackSubscriptionDeleteRequest(req *e2ap.E2APSubscriptionDeleteReq //----------------------------------------------------------------------------- func (c *E2ap) UnpackSubscriptionDeleteResponse(payload []byte) (*e2ap.E2APSubscriptionDeleteResponse, error) { e2SubDelResp := packerif.NewPackerSubscriptionDeleteResponse() - packedData := &packer.PackedData{} - packedData.Buf = payload - err := e2SubDelResp.UnPack(packedData) + err, subDelResp := e2SubDelResp.UnPack(&e2ap.PackedData{payload}) if err != nil { - return nil, err - } - err, subDelResp := e2SubDelResp.Get() - if err != nil { - return nil, err + return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload)) } return subDelResp, nil } -func (c *E2ap) PackSubscriptionDeleteResponse(req *e2ap.E2APSubscriptionDeleteResponse) (*packer.PackedData, error) { +func (c *E2ap) PackSubscriptionDeleteResponse(req *e2ap.E2APSubscriptionDeleteResponse) (int, *e2ap.PackedData, error) { e2SubDelResp := packerif.NewPackerSubscriptionDeleteResponse() - err := e2SubDelResp.Set(req) + err, packedData := e2SubDelResp.Pack(req) + if err != nil { + return 0, nil, err + } + return xapp.RIC_SUB_DEL_RESP, packedData, nil +} + +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (c *E2ap) UnpackSubscriptionDeleteFailure(payload []byte) (*e2ap.E2APSubscriptionDeleteFailure, error) { + e2SubDelFail := packerif.NewPackerSubscriptionDeleteFailure() + err, subDelFail := e2SubDelFail.UnPack(&e2ap.PackedData{payload}) if err != nil { - return nil, err + return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload)) } - err, packedData := e2SubDelResp.Pack(nil) + return subDelFail, nil +} + +func (c *E2ap) PackSubscriptionDeleteFailure(req *e2ap.E2APSubscriptionDeleteFailure) (int, *e2ap.PackedData, error) { + e2SubDelFail := packerif.NewPackerSubscriptionDeleteFailure() + err, packedData := e2SubDelFail.Pack(req) if err != nil { - return nil, err + return 0, nil, err } - return packedData, nil + return xapp.RIC_SUB_DEL_FAILURE, packedData, nil }