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

diff --git a/pkg/control/e2ap.go b/pkg/control/e2ap.go
index f17012b..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))