Code Review
/
ric-plt
/
submgr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Make subscription manager independent of E2SMs
[ric-plt/submgr.git]
/
pkg
/
control
/
e2ap.go
diff --git
a/pkg/control/e2ap.go
b/pkg/control/e2ap.go
index
f564c48
..
b21eb3f
100644
(file)
--- a/
pkg/control/e2ap.go
+++ b/
pkg/control/e2ap.go
@@
-20,8
+20,6
@@
package control
/*
package control
/*
-#include <wrapper.h>
-
#cgo LDFLAGS: -le2ap_wrapper -le2ap
*/
import "C"
#cgo LDFLAGS: -le2ap_wrapper -le2ap
*/
import "C"
@@
-31,7
+29,6
@@
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"
"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"
"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
)
"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
)
@@
-45,26
+42,16
@@
type E2ap struct {
//-----------------------------------------------------------------------------
func (c *E2ap) UnpackSubscriptionRequest(payload []byte) (*e2ap.E2APSubscriptionRequest, error) {
e2SubReq := packerif.NewPackerSubscriptionRequest()
//-----------------------------------------------------------------------------
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, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
- }
- err, subReq := e2SubReq.Get()
+ err, subReq := e2SubReq.UnPack(&e2ap.PackedData{payload})
if err != nil {
return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
}
return subReq, nil
}
if err != nil {
return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
}
return subReq, nil
}
-func (c *E2ap) PackSubscriptionRequest(req *e2ap.E2APSubscriptionRequest) (int, *
packer
.PackedData, error) {
+func (c *E2ap) PackSubscriptionRequest(req *e2ap.E2APSubscriptionRequest) (int, *
e2ap
.PackedData, error) {
e2SubReq := packerif.NewPackerSubscriptionRequest()
e2SubReq := packerif.NewPackerSubscriptionRequest()
- err := e2SubReq.Set(req)
- if err != nil {
- return 0, nil, err
- }
- err, packedData := e2SubReq.Pack(nil)
+ err, packedData := e2SubReq.Pack(req)
if err != nil {
return 0, nil, err
}
if err != nil {
return 0, nil, err
}
@@
-76,26
+63,16
@@
func (c *E2ap) PackSubscriptionRequest(req *e2ap.E2APSubscriptionRequest) (int,
//-----------------------------------------------------------------------------
func (c *E2ap) UnpackSubscriptionResponse(payload []byte) (*e2ap.E2APSubscriptionResponse, error) {
e2SubResp := packerif.NewPackerSubscriptionResponse()
//-----------------------------------------------------------------------------
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, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
- }
- err, subResp := e2SubResp.Get()
+ err, subResp := e2SubResp.UnPack(&e2ap.PackedData{payload})
if err != nil {
return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
}
return subResp, nil
}
if err != nil {
return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
}
return subResp, nil
}
-func (c *E2ap) PackSubscriptionResponse(req *e2ap.E2APSubscriptionResponse) (int, *
packer
.PackedData, error) {
+func (c *E2ap) PackSubscriptionResponse(req *e2ap.E2APSubscriptionResponse) (int, *
e2ap
.PackedData, error) {
e2SubResp := packerif.NewPackerSubscriptionResponse()
e2SubResp := packerif.NewPackerSubscriptionResponse()
- err := e2SubResp.Set(req)
- if err != nil {
- return 0, nil, err
- }
- err, packedData := e2SubResp.Pack(nil)
+ err, packedData := e2SubResp.Pack(req)
if err != nil {
return 0, nil, err
}
if err != nil {
return 0, nil, err
}
@@
-107,26
+84,16
@@
func (c *E2ap) PackSubscriptionResponse(req *e2ap.E2APSubscriptionResponse) (int
//-----------------------------------------------------------------------------
func (c *E2ap) UnpackSubscriptionFailure(payload []byte) (*e2ap.E2APSubscriptionFailure, error) {
e2SubFail := packerif.NewPackerSubscriptionFailure()
//-----------------------------------------------------------------------------
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, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
- }
- err, subFail := e2SubFail.Get()
+ err, subFail := e2SubFail.UnPack(&e2ap.PackedData{payload})
if err != nil {
return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
}
return subFail, nil
}
if err != nil {
return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
}
return subFail, nil
}
-func (c *E2ap) PackSubscriptionFailure(req *e2ap.E2APSubscriptionFailure) (int, *
packer
.PackedData, error) {
+func (c *E2ap) PackSubscriptionFailure(req *e2ap.E2APSubscriptionFailure) (int, *
e2ap
.PackedData, error) {
e2SubFail := packerif.NewPackerSubscriptionFailure()
e2SubFail := packerif.NewPackerSubscriptionFailure()
- err := e2SubFail.Set(req)
- if err != nil {
- return 0, nil, err
- }
- err, packedData := e2SubFail.Pack(nil)
+ err, packedData := e2SubFail.Pack(req)
if err != nil {
return 0, nil, err
}
if err != nil {
return 0, nil, err
}
@@
-138,26
+105,16
@@
func (c *E2ap) PackSubscriptionFailure(req *e2ap.E2APSubscriptionFailure) (int,
//-----------------------------------------------------------------------------
func (c *E2ap) UnpackSubscriptionDeleteRequest(payload []byte) (*e2ap.E2APSubscriptionDeleteRequest, error) {
e2SubDelReq := packerif.NewPackerSubscriptionDeleteRequest()
//-----------------------------------------------------------------------------
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, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
- }
- err, subDelReq := e2SubDelReq.Get()
+ 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
}
if err != nil {
return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
}
return subDelReq, nil
}
-func (c *E2ap) PackSubscriptionDeleteRequest(req *e2ap.E2APSubscriptionDeleteRequest) (int, *
packer
.PackedData, error) {
+func (c *E2ap) PackSubscriptionDeleteRequest(req *e2ap.E2APSubscriptionDeleteRequest) (int, *
e2ap
.PackedData, error) {
e2SubDelReq := packerif.NewPackerSubscriptionDeleteRequest()
e2SubDelReq := packerif.NewPackerSubscriptionDeleteRequest()
- err := e2SubDelReq.Set(req)
- if err != nil {
- return 0, nil, err
- }
- err, packedData := e2SubDelReq.Pack(nil)
+ err, packedData := e2SubDelReq.Pack(req)
if err != nil {
return 0, nil, err
}
if err != nil {
return 0, nil, err
}
@@
-169,26
+126,16
@@
func (c *E2ap) PackSubscriptionDeleteRequest(req *e2ap.E2APSubscriptionDeleteReq
//-----------------------------------------------------------------------------
func (c *E2ap) UnpackSubscriptionDeleteResponse(payload []byte) (*e2ap.E2APSubscriptionDeleteResponse, error) {
e2SubDelResp := packerif.NewPackerSubscriptionDeleteResponse()
//-----------------------------------------------------------------------------
func (c *E2ap) UnpackSubscriptionDeleteResponse(payload []byte) (*e2ap.E2APSubscriptionDeleteResponse, error) {
e2SubDelResp := packerif.NewPackerSubscriptionDeleteResponse()
- packedData := &packer.PackedData{}
- packedData.Buf = payload
- err := e2SubDelResp.UnPack(packedData)
- if err != nil {
- return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
- }
- err, subDelResp := e2SubDelResp.Get()
+ err, subDelResp := e2SubDelResp.UnPack(&e2ap.PackedData{payload})
if err != nil {
return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
}
return subDelResp, nil
}
if err != nil {
return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
}
return subDelResp, nil
}
-func (c *E2ap) PackSubscriptionDeleteResponse(req *e2ap.E2APSubscriptionDeleteResponse) (int, *
packer
.PackedData, error) {
+func (c *E2ap) PackSubscriptionDeleteResponse(req *e2ap.E2APSubscriptionDeleteResponse) (int, *
e2ap
.PackedData, error) {
e2SubDelResp := packerif.NewPackerSubscriptionDeleteResponse()
e2SubDelResp := packerif.NewPackerSubscriptionDeleteResponse()
- err := e2SubDelResp.Set(req)
- if err != nil {
- return 0, nil, err
- }
- err, packedData := e2SubDelResp.Pack(nil)
+ err, packedData := e2SubDelResp.Pack(req)
if err != nil {
return 0, nil, err
}
if err != nil {
return 0, nil, err
}
@@
-200,26
+147,16
@@
func (c *E2ap) PackSubscriptionDeleteResponse(req *e2ap.E2APSubscriptionDeleteRe
//-----------------------------------------------------------------------------
func (c *E2ap) UnpackSubscriptionDeleteFailure(payload []byte) (*e2ap.E2APSubscriptionDeleteFailure, error) {
e2SubDelFail := packerif.NewPackerSubscriptionDeleteFailure()
//-----------------------------------------------------------------------------
func (c *E2ap) UnpackSubscriptionDeleteFailure(payload []byte) (*e2ap.E2APSubscriptionDeleteFailure, error) {
e2SubDelFail := packerif.NewPackerSubscriptionDeleteFailure()
- packedData := &packer.PackedData{}
- packedData.Buf = payload
- err := e2SubDelFail.UnPack(packedData)
- if err != nil {
- return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
- }
- err, subDelFail := e2SubDelFail.Get()
+ err, subDelFail := e2SubDelFail.UnPack(&e2ap.PackedData{payload})
if err != nil {
return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
}
return subDelFail, nil
}
if err != nil {
return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
}
return subDelFail, nil
}
-func (c *E2ap) PackSubscriptionDeleteFailure(req *e2ap.E2APSubscriptionDeleteFailure) (int, *
packer
.PackedData, error) {
+func (c *E2ap) PackSubscriptionDeleteFailure(req *e2ap.E2APSubscriptionDeleteFailure) (int, *
e2ap
.PackedData, error) {
e2SubDelFail := packerif.NewPackerSubscriptionDeleteFailure()
e2SubDelFail := packerif.NewPackerSubscriptionDeleteFailure()
- err := e2SubDelFail.Set(req)
- if err != nil {
- return 0, nil, err
- }
- err, packedData := e2SubDelFail.Pack(nil)
+ err, packedData := e2SubDelFail.Pack(req)
if err != nil {
return 0, nil, err
}
if err != nil {
return 0, nil, err
}