Cleaning and bug fixes

[ric-plt/submgr.git] / pkg / control / e2ap.go

diff --git a/pkg/control/e2ap.go b/pkg/control/e2ap.go
index 8f7fb63..f0b3381 100644 (file)
--- a/pkg/control/e2ap.go
+++ b/pkg/control/e2ap.go
@@ -27,9 +27,12 @@ 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"
+       "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 )
 
 var packerif e2ap.E2APPackerIf = e2ap_wrapper.NewAsn1E2Packer()
@@ -44,28 +47,20 @@ func (c *E2ap) UnpackSubscriptionRequest(payload []byte) (*e2ap.E2APSubscription
        e2SubReq := packerif.NewPackerSubscriptionRequest()
        packedData := &packer.PackedData{}
        packedData.Buf = payload
-       err := e2SubReq.UnPack(packedData)
+       err, subReq := e2SubReq.UnPack(packedData)
        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, *packer.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
 }
 
 //-----------------------------------------------------------------------------
@@ -75,28 +70,20 @@ func (c *E2ap) UnpackSubscriptionResponse(payload []byte) (*e2ap.E2APSubscriptio
        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(packedData)
        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, *packer.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
 }
 
 //-----------------------------------------------------------------------------
@@ -106,28 +93,20 @@ func (c *E2ap) UnpackSubscriptionFailure(payload []byte) (*e2ap.E2APSubscription
        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(packedData)
        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, *packer.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
 }
 
 //-----------------------------------------------------------------------------
@@ -137,28 +116,20 @@ func (c *E2ap) UnpackSubscriptionDeleteRequest(payload []byte) (*e2ap.E2APSubscr
        e2SubDelReq := packerif.NewPackerSubscriptionDeleteRequest()
        packedData := &packer.PackedData{}
        packedData.Buf = payload
-       err := e2SubDelReq.UnPack(packedData)
+       err, subDelReq := e2SubDelReq.UnPack(packedData)
        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, *packer.PackedData, error) {
        e2SubDelReq := packerif.NewPackerSubscriptionDeleteRequest()
-       err := e2SubDelReq.Set(req)
-       if err != nil {
-               return nil, err
-       }
-       err, packedData := e2SubDelReq.Pack(nil)
+       err, packedData := e2SubDelReq.Pack(req)
        if err != nil {
-               return nil, err
+               return 0, nil, err
        }
-       return packedData, nil
+       return xapp.RIC_SUB_DEL_REQ, packedData, nil
 }
 
 //-----------------------------------------------------------------------------
@@ -168,28 +139,20 @@ func (c *E2ap) UnpackSubscriptionDeleteResponse(payload []byte) (*e2ap.E2APSubsc
        e2SubDelResp := packerif.NewPackerSubscriptionDeleteResponse()
        packedData := &packer.PackedData{}
        packedData.Buf = payload
-       err := e2SubDelResp.UnPack(packedData)
-       if err != nil {
-               return nil, err
-       }
-       err, subDelResp := e2SubDelResp.Get()
+       err, subDelResp := e2SubDelResp.UnPack(packedData)
        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, *packer.PackedData, error) {
        e2SubDelResp := packerif.NewPackerSubscriptionDeleteResponse()
-       err := e2SubDelResp.Set(req)
+       err, packedData := e2SubDelResp.Pack(req)
        if err != nil {
-               return nil, err
+               return 0, nil, err
        }
-       err, packedData := e2SubDelResp.Pack(nil)
-       if err != nil {
-               return nil, err
-       }
-       return packedData, nil
+       return xapp.RIC_SUB_DEL_RESP, packedData, nil
 }
 
 //-----------------------------------------------------------------------------
@@ -199,26 +162,18 @@ func (c *E2ap) UnpackSubscriptionDeleteFailure(payload []byte) (*e2ap.E2APSubscr
        e2SubDelFail := packerif.NewPackerSubscriptionDeleteFailure()
        packedData := &packer.PackedData{}
        packedData.Buf = payload
-       err := e2SubDelFail.UnPack(packedData)
-       if err != nil {
-               return nil, err
-       }
-       err, subDelFail := e2SubDelFail.Get()
+       err, subDelFail := e2SubDelFail.UnPack(packedData)
        if err != nil {
-               return nil, err
+               return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
        }
        return subDelFail, nil
 }
 
-func (c *E2ap) PackSubscriptionDeleteFailure(req *e2ap.E2APSubscriptionDeleteFailure) (*packer.PackedData, error) {
+func (c *E2ap) PackSubscriptionDeleteFailure(req *e2ap.E2APSubscriptionDeleteFailure) (int, *packer.PackedData, error) {
        e2SubDelFail := packerif.NewPackerSubscriptionDeleteFailure()
-       err := e2SubDelFail.Set(req)
-       if err != nil {
-               return nil, err
-       }
-       err, packedData := e2SubDelFail.Pack(nil)
+       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
 }