Subscription REST interface update

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

diff --git a/pkg/control/e2ap.go b/pkg/control/e2ap.go
index 9f19ba7..0aa5ebe 100644 (file)
--- a/pkg/control/e2ap.go
+++ b/pkg/control/e2ap.go
@@ -51,7 +51,7 @@ type E2ap struct {
 //
 //-----------------------------------------------------------------------------
 func (c *E2ap) FillSubscriptionReqMsgs(params interface{}, subreqList *e2ap.SubscriptionRequestList, restSubscription *RESTSubscription) error {
-       xapp.Logger.Info("FillSubscriptionReqMsgs")
+       xapp.Logger.Debug("FillSubscriptionReqMsgs")
 
        p := params.(*models.SubscriptionParams)
 
@@ -61,11 +61,15 @@ func (c *E2ap) FillSubscriptionReqMsgs(params interface{}, subreqList *e2ap.Subs
                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))
+               e2EventInstanceID := restSubscription.GetE2IdFromXappIdToE2Id(*subscriptionDetail.XappEventInstanceID)
+               subReqMsg.RequestId = e2ap.RequestId{uint32(*subscriptionDetail.XappEventInstanceID), uint32(e2EventInstanceID)}
 
+               if len(subscriptionDetail.EventTriggers) > 0 {
+                       for _, val := range subscriptionDetail.EventTriggers {
+                               subReqMsg.EventTriggerDefinition.Data.Data = append(subReqMsg.EventTriggerDefinition.Data.Data, byte(val))
+                       }
+                       subReqMsg.EventTriggerDefinition.Data.Length = uint64(len(subscriptionDetail.EventTriggers))
+               }
                for _, actionToBeSetup := range subscriptionDetail.ActionToBeSetupList {
                        actionToBeSetupItem := e2ap.ActionToBeSetupItem{}
                        actionToBeSetupItem.ActionType = e2ap.E2AP_ActionTypeInvalid
@@ -74,9 +78,11 @@ func (c *E2ap) FillSubscriptionReqMsgs(params interface{}, subreqList *e2ap.Subs
                        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 len(actionToBeSetup.ActionDefinition) > 0 {
+                               for _, val := range actionToBeSetup.ActionDefinition {
+                                       actionToBeSetupItem.ActionDefinitionChoice.Data.Data = append(actionToBeSetupItem.ActionDefinitionChoice.Data.Data, byte(val))
+                               }
+                               actionToBeSetupItem.ActionDefinitionChoice.Data.Length = uint64(len(actionToBeSetup.ActionDefinition))
 
                        }
                        if actionToBeSetup.SubsequentAction != nil {
@@ -208,6 +214,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)
@@ -216,3 +223,4 @@ func (c *E2ap) PackSubscriptionDeleteFailure(req *e2ap.E2APSubscriptionDeleteFai
        }
        return xapp.RIC_SUB_DEL_FAILURE, packedData, nil
 }
+*/