X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fe2ap.go;h=f564c484a24ec9b810fc5838113ec7beb021814a;hb=refs%2Fchanges%2F31%2F2231%2F1;hp=8f7fb6387de5ceb92dbb2d18a5c5bcc19a1f47a8;hpb=375c141ce21767f7bda94ec435fdf833b41fbbd2;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/e2ap.go b/pkg/control/e2ap.go
index 8f7fb63..f564c48 100644
--- 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()
@@ -46,26 +49,26 @@ func (c *E2ap) UnpackSubscriptionRequest(payload []byte) (*e2ap.E2APSubscription
 	packedData.Buf = payload
 	err := e2SubReq.UnPack(packedData)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
 	}
 	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
+		return 0, nil, err
 	}
 	err, packedData := e2SubReq.Pack(nil)
 	if err != nil {
-		return nil, err
+		return 0, nil, err
 	}
-	return packedData, nil
+	return xapp.RIC_SUB_REQ, packedData, nil
 }
 
 //-----------------------------------------------------------------------------
@@ -77,26 +80,26 @@ func (c *E2ap) UnpackSubscriptionResponse(payload []byte) (*e2ap.E2APSubscriptio
 	packedData.Buf = payload
 	err := e2SubResp.UnPack(packedData)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
 	}
 	err, subResp := e2SubResp.Get()
 	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)
 	if err != nil {
-		return nil, err
+		return 0, nil, err
 	}
 	err, packedData := e2SubResp.Pack(nil)
 	if err != nil {
-		return nil, err
+		return 0, nil, err
 	}
-	return packedData, nil
+	return xapp.RIC_SUB_RESP, packedData, nil
 }
 
 //-----------------------------------------------------------------------------
@@ -108,26 +111,26 @@ func (c *E2ap) UnpackSubscriptionFailure(payload []byte) (*e2ap.E2APSubscription
 	packedData.Buf = payload
 	err := e2SubFail.UnPack(packedData)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
 	}
 	err, subFail := e2SubFail.Get()
 	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
+		return 0, nil, err
 	}
 	err, packedData := e2SubFail.Pack(nil)
 	if err != nil {
-		return nil, err
+		return 0, nil, err
 	}
-	return packedData, nil
+	return xapp.RIC_SUB_FAILURE, packedData, nil
 }
 
 //-----------------------------------------------------------------------------
@@ -139,26 +142,26 @@ func (c *E2ap) UnpackSubscriptionDeleteRequest(payload []byte) (*e2ap.E2APSubscr
 	packedData.Buf = payload
 	err := e2SubDelReq.UnPack(packedData)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
 	}
 	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
+		return 0, nil, err
 	}
 	err, packedData := e2SubDelReq.Pack(nil)
 	if err != nil {
-		return nil, err
+		return 0, nil, err
 	}
-	return packedData, nil
+	return xapp.RIC_SUB_DEL_REQ, packedData, nil
 }
 
 //-----------------------------------------------------------------------------
@@ -170,26 +173,26 @@ func (c *E2ap) UnpackSubscriptionDeleteResponse(payload []byte) (*e2ap.E2APSubsc
 	packedData.Buf = payload
 	err := e2SubDelResp.UnPack(packedData)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
 	}
 	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, *packer.PackedData, error) {
 	e2SubDelResp := packerif.NewPackerSubscriptionDeleteResponse()
 	err := e2SubDelResp.Set(req)
 	if err != nil {
-		return nil, err
+		return 0, nil, err
 	}
 	err, packedData := e2SubDelResp.Pack(nil)
 	if err != nil {
-		return nil, err
+		return 0, nil, err
 	}
-	return packedData, nil
+	return xapp.RIC_SUB_DEL_RESP, packedData, nil
 }
 
 //-----------------------------------------------------------------------------
@@ -201,24 +204,24 @@ func (c *E2ap) UnpackSubscriptionDeleteFailure(payload []byte) (*e2ap.E2APSubscr
 	packedData.Buf = payload
 	err := e2SubDelFail.UnPack(packedData)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
 	}
 	err, subDelFail := e2SubDelFail.Get()
 	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
+		return 0, nil, err
 	}
 	err, packedData := e2SubDelFail.Pack(nil)
 	if err != nil {
-		return nil, err
+		return 0, nil, err
 	}
-	return packedData, nil
+	return xapp.RIC_SUB_DEL_FAILURE, packedData, nil
 }