X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fe2ap.go;h=5f567abe28b1b83515f0ff1d2dc0d1a8421ebccf;hb=60bfcf92de9e13b60acf1fd3e18bfaeb6a2d389b;hp=fe71f26b99a7470b0c3b4b2d27617133d314adc7;hpb=b3dc15673967c1c94a52d82ea8b169fefd6f9154;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/e2ap.go b/pkg/control/e2ap.go
index fe71f26..5f567ab 100644
--- a/pkg/control/e2ap.go
+++ b/pkg/control/e2ap.go
@@ -39,29 +39,6 @@ var packerif e2ap.E2APPackerIf = e2ap_wrapper.NewAsn1E2Packer()
 type E2ap struct {
 }
 
-/* RICsubscriptionResponse */
-
-// 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. Erroxappde: %v", cret)
-	}
-	subId = uint16(cret)
-	return
-}
-
-// Used by e2t test stub
-func (c *E2ap) SetSubscriptionResponseSequenceNumber(payload []byte, newSubscriptionid uint16) (err error) {
-	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. Erroxappde: %v", size)
-	}
-	return
-}
-
 /* RICsubscriptionDeleteResponse */
 
 // Used by submgr, e2t test stub
@@ -85,29 +62,6 @@ func (c *E2ap) SetSubscriptionDeleteResponseSequenceNumber(payload []byte, newSu
 	return
 }
 
-/* RICsubscriptionRequestFailure */
-
-// Used by submgr
-func (c *E2ap) GetSubscriptionFailureSequenceNumber(payload []byte) (subId uint16, err error) {
-	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. Erroxappde: %v", cret)
-	}
-	subId = uint16(cret)
-	return
-}
-
-// 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. Erroxappde: %v", size)
-	}
-	return
-}
-
 /* RICsubscriptionDeleteFailure */
 
 // Used by submgr
@@ -182,6 +136,68 @@ func (c *E2ap) PackSubscriptionRequest(req *e2ap.E2APSubscriptionRequest) (*pack
 	return packedData, nil
 }
 
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+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()
+	if err != nil {
+		return nil, err
+	}
+	return subResp, nil
+}
+
+func (c *E2ap) PackSubscriptionResponse(req *e2ap.E2APSubscriptionResponse) (*packer.PackedData, error) {
+	e2SubResp := packerif.NewPackerSubscriptionResponse()
+	err := e2SubResp.Set(req)
+	if err != nil {
+		return nil, err
+	}
+	err, packedData := e2SubResp.Pack(nil)
+	if err != nil {
+		return nil, err
+	}
+	return packedData, nil
+}
+
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+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()
+	if err != nil {
+		return nil, err
+	}
+	return subFail, nil
+}
+
+func (c *E2ap) PackSubscriptionFailure(req *e2ap.E2APSubscriptionFailure) (*packer.PackedData, error) {
+	e2SubFail := packerif.NewPackerSubscriptionFailure()
+	err := e2SubFail.Set(req)
+	if err != nil {
+		return nil, err
+	}
+	err, packedData := e2SubFail.Pack(nil)
+	if err != nil {
+		return nil, err
+	}
+	return packedData, nil
+}
+
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
@@ -193,11 +209,11 @@ func (c *E2ap) UnpackSubscriptionDeleteRequest(payload []byte) (*e2ap.E2APSubscr
 	if err != nil {
 		return nil, err
 	}
-	err, subReq := e2SubDelReq.Get()
+	err, subDelReq := e2SubDelReq.Get()
 	if err != nil {
 		return nil, err
 	}
-	return subReq, nil
+	return subDelReq, nil
 }
 
 func (c *E2ap) PackSubscriptionDeleteRequest(req *e2ap.E2APSubscriptionDeleteRequest) (*packer.PackedData, error) {
@@ -213,6 +229,24 @@ func (c *E2ap) PackSubscriptionDeleteRequest(req *e2ap.E2APSubscriptionDeleteReq
 	return packedData, nil
 }
 
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+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, err
+	}
+	err, subDelResp := e2SubDelResp.Get()
+	if err != nil {
+		return nil, err
+	}
+	return subDelResp, nil
+}
+
 func (c *E2ap) PackSubscriptionDeleteResponse(req *e2ap.E2APSubscriptionDeleteResponse) (*packer.PackedData, error) {
 	e2SubDelResp := packerif.NewPackerSubscriptionDeleteResponse()
 	err := e2SubDelResp.Set(req)