X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fe2ap.go;h=fe71f26b99a7470b0c3b4b2d27617133d314adc7;hb=b3dc15673967c1c94a52d82ea8b169fefd6f9154;hp=209b13cc8c9666edd605bc083a9e797035a84804;hpb=ff8dccd02d76eebfccc0b509ce0b42a2c1760e12;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/e2ap.go b/pkg/control/e2ap.go index 209b13c..fe71f26 100644 --- a/pkg/control/e2ap.go +++ b/pkg/control/e2ap.go @@ -28,41 +28,25 @@ 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" ) -type E2ap struct { -} +var packerif e2ap.E2APPackerIf = e2ap_wrapper.NewAsn1E2Packer() -/* 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. 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) - } - return -} +/* RICsubscriptionResponse */ -// Used by submgr, rco test stub +// 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. ErrorCode: %v", cret) + return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Response Sequence Number due to wrong or invalid payload. Erroxappde: %v", cret) } subId = uint16(cret) return @@ -73,42 +57,19 @@ func (c *E2ap) SetSubscriptionResponseSequenceNumber(payload []byte, newSubscrip 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) - } - return -} - -/* 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) - } - subId = uint16(cret) - return -} - -// 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) + return fmt.Errorf("e2ap wrapper is unable to set Subscription Response Sequence Number due to wrong or invalid payload. Erroxappde: %v", size) } return } /* RICsubscriptionDeleteResponse */ -// Used by submgr, rco test stub +// 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. ErrorCode: %v", cret) + return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Delete Response Sequence Number due to wrong or invalid payload. Erroxappde: %v", cret) } subId = uint16(cret) return @@ -119,7 +80,7 @@ func (c *E2ap) SetSubscriptionDeleteResponseSequenceNumber(payload []byte, newSu 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) + return fmt.Errorf("e2ap wrapper is unable to set Subscription Delete Response Sequence Number due to wrong or invalid payload. Erroxappde: %v", size) } return } @@ -131,18 +92,18 @@ func (c *E2ap) GetSubscriptionFailureSequenceNumber(payload []byte) (subId uint1 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) + return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Failure Sequence Number due to wrong or invalid payload. Erroxappde: %v", cret) } subId = uint16(cret) return } -// Used by submgr +// 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. ErrorCode: %v", size) + return fmt.Errorf("e2ap wrapper is unable to set Subscription Failure Sequence Number due to wrong or invalid payload. Erroxappde: %v", size) } return } @@ -154,7 +115,7 @@ func (c *E2ap) GetSubscriptionDeleteFailureSequenceNumber(payload []byte) (subId 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) + 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 @@ -165,7 +126,102 @@ func (c *E2ap) SetSubscriptionDeleteFailureSequenceNumber(payload []byte, newSub 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) + 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) + if err != nil { + return nil, err + } + err, subReq := e2SubReq.Get() + if err != nil { + return nil, err + } + return subReq, nil +} + +func (c *E2ap) PackSubscriptionRequest(req *e2ap.E2APSubscriptionRequest) (*packer.PackedData, error) { + e2SubReq := packerif.NewPackerSubscriptionRequest() + err := e2SubReq.Set(req) + if err != nil { + return nil, err + } + err, packedData := e2SubReq.Pack(nil) + if err != nil { + return nil, err + } + return packedData, nil +} + +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +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 + } + err, subReq := e2SubDelReq.Get() + if err != nil { + return nil, err + } + return subReq, nil +} + +func (c *E2ap) PackSubscriptionDeleteRequest(req *e2ap.E2APSubscriptionDeleteRequest) (*packer.PackedData, error) { + e2SubDelReq := packerif.NewPackerSubscriptionDeleteRequest() + err := e2SubDelReq.Set(req) + if err != nil { + return nil, err + } + err, packedData := e2SubDelReq.Pack(nil) + if err != nil { + return nil, err + } + return packedData, nil +} + +func (c *E2ap) PackSubscriptionDeleteResponse(req *e2ap.E2APSubscriptionDeleteResponse) (*packer.PackedData, error) { + e2SubDelResp := packerif.NewPackerSubscriptionDeleteResponse() + err := e2SubDelResp.Set(req) + if err != nil { + return nil, err + } + err, packedData := e2SubDelResp.Pack(nil) + if err != nil { + return nil, err + } + return packedData, nil +}