X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fe2ap.go;h=f17012bcc6809d8ad0f35c9c37474b0898b5e685;hb=e5e672c043d80c7a531b9d6d640ca8879d9bf01b;hp=ed2f6901c03c08450a18ef7173425e2c3c2b140b;hpb=a9bf76cb8dec6e52e7699edf1631c214647f8beb;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/e2ap.go b/pkg/control/e2ap.go
index ed2f690..f17012b 100644
--- a/pkg/control/e2ap.go
+++ b/pkg/control/e2ap.go
@@ -20,8 +20,6 @@
 package control
 
 /*
-#include <wrapper.h>
-
 #cgo LDFLAGS: -le2ap_wrapper -le2ap
 */
 import "C"
@@ -29,16 +27,70 @@ 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/xapp-frame/pkg/models"
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 )
 
 var packerif e2ap.E2APPackerIf = e2ap_wrapper.NewAsn1E2Packer()
 
+func GetPackerIf() e2ap.E2APPackerIf {
+	return packerif
+}
+
+func SetPackerIf(iface e2ap.E2APPackerIf) {
+	packerif = iface
+}
+
 type E2ap struct {
 }
 
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+func (c *E2ap) FillSubscriptionReqMsgs(params interface{}, subreqList *e2ap.SubscriptionRequestList, restSubscription *RESTSubscription) error {
+	xapp.Logger.Info("FillSubscriptionReqMsgs")
+
+	p := params.(*models.SubscriptionParams)
+
+	for _, subscriptionDetail := range p.SubscriptionDetails {
+		subReqMsg := e2ap.E2APSubscriptionRequest{}
+
+		if p.RANFunctionID != nil {
+			subReqMsg.FunctionId = (e2ap.FunctionId)(*p.RANFunctionID)
+		}
+		subReqMsg.RequestId = e2ap.RequestId{uint32(*subscriptionDetail.RequestorID), uint32(*subscriptionDetail.InstanceID)}
+
+		subReqMsg.EventTriggerDefinition.Data.Data = []byte(subscriptionDetail.EventTriggers.OctetString)
+		subReqMsg.EventTriggerDefinition.Data.Length = uint64(len(subscriptionDetail.EventTriggers.OctetString))
+
+		for _, actionToBeSetup := range subscriptionDetail.ActionToBeSetupList {
+			actionToBeSetupItem := e2ap.ActionToBeSetupItem{}
+			actionToBeSetupItem.ActionType = e2ap.E2AP_ActionTypeInvalid
+			actionToBeSetupItem.ActionId = uint64(*actionToBeSetup.ActionID)
+
+			actionToBeSetupItem.ActionType = e2ap.E2AP_ActionTypeStrMap[*actionToBeSetup.ActionType]
+			actionToBeSetupItem.RicActionDefinitionPresent = true
+
+			if actionToBeSetup.ActionDefinition != nil {
+				actionToBeSetupItem.ActionDefinitionChoice.Data.Data = []byte(actionToBeSetup.ActionDefinition.OctetString)
+				actionToBeSetupItem.ActionDefinitionChoice.Data.Length = uint64(len(actionToBeSetup.ActionDefinition.OctetString))
+
+			}
+			if actionToBeSetup.SubsequentAction != nil {
+				actionToBeSetupItem.SubsequentAction.Present = true
+				actionToBeSetupItem.SubsequentAction.Type = e2ap.E2AP_SubSeqActionTypeStrMap[*actionToBeSetup.SubsequentAction.SubsequentActionType]
+				actionToBeSetupItem.SubsequentAction.TimetoWait = e2ap.E2AP_TimeToWaitStrMap[*actionToBeSetup.SubsequentAction.TimeToWait]
+			}
+			subReqMsg.ActionSetups = append(subReqMsg.ActionSetups, actionToBeSetupItem)
+		}
+		subreqList.E2APSubscriptionRequests = append(subreqList.E2APSubscriptionRequests, subReqMsg)
+	}
+	return nil
+}
+
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
@@ -156,6 +208,7 @@ func (c *E2ap) UnpackSubscriptionDeleteFailure(payload []byte) (*e2ap.E2APSubscr
 	return subDelFail, nil
 }
 
+/*
 func (c *E2ap) PackSubscriptionDeleteFailure(req *e2ap.E2APSubscriptionDeleteFailure) (int, *e2ap.PackedData, error) {
 	e2SubDelFail := packerif.NewPackerSubscriptionDeleteFailure()
 	err, packedData := e2SubDelFail.Pack(req)
@@ -164,3 +217,4 @@ func (c *E2ap) PackSubscriptionDeleteFailure(req *e2ap.E2APSubscriptionDeleteFai
 	}
 	return xapp.RIC_SUB_DEL_FAILURE, packedData, nil
 }
+*/