X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=pkg%2Fcontrol%2Fe2ap.go;h=54eba76a54fb727604f009224bd75fb31824a8cf;hb=refs%2Fchanges%2F46%2F6246%2F2;hp=9f19ba7ad15ea003987b69b82d5a71d706dabaae;hpb=fa39fedbbd1c2e6bfea4b952184936f393ff2690;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/e2ap.go b/pkg/control/e2ap.go
index 9f19ba7..54eba76 100644
--- a/pkg/control/e2ap.go
+++ b/pkg/control/e2ap.go
@@ -61,7 +61,8 @@ 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)}
+		e2EventInstanceID := restSubscription.GetE2IdFromXappIdToE2Id(*subscriptionDetail.XappEventInstanceID)
+		subReqMsg.RequestId = e2ap.RequestId{uint32(*subscriptionDetail.XappEventInstanceID), uint32(e2EventInstanceID)}
 
 		subReqMsg.EventTriggerDefinition.Data.Data = []byte(subscriptionDetail.EventTriggers.OctetString)
 		subReqMsg.EventTriggerDefinition.Data.Length = uint64(len(subscriptionDetail.EventTriggers.OctetString))
@@ -208,6 +209,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 +218,4 @@ func (c *E2ap) PackSubscriptionDeleteFailure(req *e2ap.E2APSubscriptionDeleteFai
 	}
 	return xapp.RIC_SUB_DEL_FAILURE, packedData, nil
 }
+*/