X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fcontrol.go;h=9ce34a07dc51596b3b07d56f6e09d2423e5db9fc;hb=47b842bf6afc45313a0edadc78f87bff06ddf2b4;hp=fc45f6f20c04421350bb4347f6060d1490440195;hpb=ff8dccd02d76eebfccc0b509ce0b42a2c1760e12;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/control.go b/pkg/control/control.go old mode 100644 new mode 100755 index fc45f6f..9ce34a0 --- a/pkg/control/control.go +++ b/pkg/control/control.go @@ -19,8 +19,6 @@ package control -import "C" - import ( "errors" rtmgrclient "gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/rtmgr_client" @@ -35,16 +33,18 @@ import ( ) var subReqTime time.Duration = 5 * time.Second -var SubDelReqTime time.Duration = 5 * time.Second +var subDelReqTime time.Duration = 5 * time.Second +var maxSubReqTryCount uint64 = 2 // Initial try + retry +var maxSubDelReqTryCount uint64 = 2 // Initial try + retry type Control struct { - e2ap *E2ap - registry *Registry - rtmgrClient *RtmgrClient - tracker *Tracker - timerMap *TimerMap - rmrSendMutex sync.Mutex - skipRouteUpdate bool // temp solution to skip routeupdate in unittests + e2ap *E2ap + registry *Registry + rtmgrClient *RtmgrClient + tracker *Tracker + timerMap *TimerMap + rmrSendMutex sync.Mutex + msgCounter uint64 } type RMRMeid struct { @@ -63,7 +63,7 @@ const ( ) func init() { - xapp.Logger.Info("SUBMGR /ric-plt-submgr:r3-test-v4") + xapp.Logger.Info("SUBMGR") viper.AutomaticEnv() viper.SetEnvPrefix("submgr") viper.AllowEmptyEnv(true) @@ -95,11 +95,11 @@ func NewControl() *Control { rtmgrClient := RtmgrClient{client, handle, deleteHandle} return &Control{e2ap: new(E2ap), - registry: registry, - rtmgrClient: &rtmgrClient, - tracker: tracker, - timerMap: timerMap, - skipRouteUpdate: false, + registry: registry, + rtmgrClient: &rtmgrClient, + tracker: tracker, + timerMap: timerMap, + msgCounter: 0, } } @@ -132,6 +132,7 @@ func (c *Control) rmrReplyToSender(params *xapp.RMRParams) (err error) { } func (c *Control) Consume(msg *xapp.RMRParams) (err error) { + c.msgCounter++ switch msg.Mtype { case xapp.RICMessageTypes["RIC_SUB_REQ"]: go c.handleSubscriptionRequest(msg) @@ -157,54 +158,55 @@ func (c *Control) handleSubscriptionRequest(params *xapp.RMRParams) { params.Mbuf = nil /* Reserve a sequence number and set it in the payload */ - newSubId, isIdValid := c.registry.ReserveSequenceNumber() - if isIdValid != true { + subs := c.registry.ReserveSubscription() + if subs == nil { xapp.Logger.Error("SubReq: Failed to reserve sequence number. Dropping this msg. SubId: %v, Xid: %s", params.SubId, params.Xid) return } - err := c.e2ap.SetSubscriptionRequestSequenceNumber(params.Payload, newSubId) + params.SubId = int(subs.Seq) + err := c.e2ap.SetSubscriptionRequestSequenceNumber(params.Payload, subs.Seq) if err != nil { - xapp.Logger.Error("SubReq: Unable to set Sequence Number in Payload. Dropping this msg. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + xapp.Logger.Error("SubReq: Unable to get Sequence Number from Payload. Dropping this msg. Err: %v, SubId: %v, Xid: %s, Payload %X", err, params.SubId, params.Xid, params.Payload) + c.registry.releaseSequenceNumber(subs.Seq) return } srcAddr, srcPort, err := c.rtmgrClient.SplitSource(params.Src) if err != nil { xapp.Logger.Error("SubReq: Failed to update routing-manager. Dropping this msg. Err: %s, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + c.registry.releaseSequenceNumber(subs.Seq) return } - /* Create transatcion records for every subscription request */ - xactKey := TransactionKey{newSubId, CREATE} - xactValue := Transaction{*srcAddr, *srcPort, params} - err = c.tracker.TrackTransaction(xactKey, xactValue) + // Create transatcion record for every subscription request + var forwardRespToXapp bool = true + var responseReceived bool = false + transaction, err := c.tracker.TrackTransaction(subs.Seq, CREATE, *srcAddr, *srcPort, params, responseReceived, forwardRespToXapp) if err != nil { xapp.Logger.Error("SubReq: Failed to create transaction record. Dropping this msg. Err: %v SubId: %v, Xid: %s", err, params.SubId, params.Xid) + c.registry.releaseSequenceNumber(subs.Seq) return } - /* Update routing manager about the new subscription*/ - subRouteAction := SubRouteInfo{CREATE, *srcAddr, *srcPort, newSubId} + // Update routing manager about the new subscription + subRouteAction := transaction.SubRouteInfo() xapp.Logger.Info("SubReq: Starting routing manager update. SubId: %v, Xid: %s", params.SubId, params.Xid) - if c.skipRouteUpdate == false { - err = c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) - if err != nil { - xapp.Logger.Error("SubReq: Failed to update routing manager. Dropping this SubReq msg. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) - return - } + err = c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) + if err != nil { + xapp.Logger.Error("SubReq: Failed to update routing manager. Dropping this msg. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + c.registry.releaseSequenceNumber(subs.Seq) + return } // Setting new subscription ID in the RMR header - params.SubId = int(newSubId) - xapp.Logger.Info("Forwarding SubReq to E2T: Mtype: %v, SubId: %v, Xid %s, Meid %v", params.Mtype, params.SubId, params.Xid, params.Meid) + xapp.Logger.Info("SubReq: Forwarding SubReq to E2T: Mtype: %v, SubId: %v, Xid %s, Meid %v", params.Mtype, params.SubId, params.Xid, params.Meid) err = c.rmrSend(params) if err != nil { xapp.Logger.Error("SubReq: Failed to send request to E2T %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) - } else { - c.timerMap.StartTimer("RIC_SUB_REQ", int(newSubId), subReqTime, c.handleSubscriptionRequestTimer) } + c.timerMap.StartTimer("RIC_SUB_REQ", int(subs.Seq), subReqTime, FirstTry, c.handleSubscriptionRequestTimer) xapp.Logger.Debug("SubReq: Debugging transaction table = %v", c.tracker.transactionTable) return } @@ -216,7 +218,7 @@ func (c *Control) handleSubscriptionResponse(params *xapp.RMRParams) { payloadSeqNum, err := c.e2ap.GetSubscriptionResponseSequenceNumber(params.Payload) if err != nil { - xapp.Logger.Error("SubResp: Unable to get Sequence Number from Payload. Dropping this msg. Err: %v, SubId: %v", err, params.SubId) + xapp.Logger.Error("SubResp: Unable to get Sequence Number from Payload. Dropping this msg. Err: %v, SubId: %v, Xid: %s, Payload %X", err, params.SubId, params.Xid, params.Payload) return } xapp.Logger.Info("SubResp: Received payloadSeqNum: %v", payloadSeqNum) @@ -228,14 +230,19 @@ func (c *Control) handleSubscriptionResponse(params *xapp.RMRParams) { c.timerMap.StopTimer("RIC_SUB_REQ", int(payloadSeqNum)) - c.registry.setSubscriptionToConfirmed(payloadSeqNum) - var transaction Transaction - transaction, err = c.tracker.RetriveTransaction(payloadSeqNum, CREATE) + transaction, responseReceived, err := c.tracker.CheckResponseReceived(payloadSeqNum, CREATE) if err != nil { - xapp.Logger.Error("SubResp: Failed to retrive transaction record. Dropping this msg. Err: %v, SubId: %v", err, params.SubId) + xapp.Logger.Info("SubResp: Dropping this msg. Err: %v SubId: %v", err, payloadSeqNum) + return + } + + if responseReceived == true { + // Subscription timer already received return } - xapp.Logger.Info("SubResp: SubId: %v, from address: %v:%v. Retrieved old subId", int(payloadSeqNum), transaction.XappInstanceAddress, transaction.XappPort) + xapp.Logger.Info("SubResp: SubId: %v, from address: %v:%v.", payloadSeqNum, transaction.Xappkey.Addr, transaction.Xappkey.Port) + + c.registry.setSubscriptionToConfirmed(payloadSeqNum) params.SubId = int(payloadSeqNum) params.Xid = transaction.OrigParams.Xid @@ -246,8 +253,8 @@ func (c *Control) handleSubscriptionResponse(params *xapp.RMRParams) { xapp.Logger.Error("SubResp: Failed to send response to xApp. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) } - xapp.Logger.Info("SubResp: SubId: %v, from address: %v:%v. Deleting transaction record", int(payloadSeqNum), transaction.XappInstanceAddress, transaction.XappPort) - transaction, err = c.tracker.completeTransaction(payloadSeqNum, CREATE) + xapp.Logger.Info("SubResp: SubId: %v, from address: %v:%v. Deleting transaction record", payloadSeqNum, transaction.Xappkey.Addr, transaction.Xappkey.Port) + _, err = c.tracker.completeTransaction(payloadSeqNum, CREATE) if err != nil { xapp.Logger.Error("SubResp: Failed to delete transaction record. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) return @@ -262,44 +269,37 @@ func (c *Control) handleSubscriptionFailure(params *xapp.RMRParams) { payloadSeqNum, err := c.e2ap.GetSubscriptionFailureSequenceNumber(params.Payload) if err != nil { - xapp.Logger.Error("SubFail: Unable to get Sequence Number from Payload. Dropping this msg. Err: %v, SubId: %v", err, params.SubId) + xapp.Logger.Error("SubFail: Unable to get Sequence Number from Payload. Dropping this msg. Err: %v, SubId: %v, Xid: %s, Payload %X", err, params.SubId, params.Xid, params.Payload) return } xapp.Logger.Info("SubFail: Received payloadSeqNum: %v", payloadSeqNum) c.timerMap.StopTimer("RIC_SUB_REQ", int(payloadSeqNum)) - var transaction Transaction - transaction, err = c.tracker.RetriveTransaction(payloadSeqNum, CREATE) + transaction, responseReceived, err := c.tracker.CheckResponseReceived(payloadSeqNum, CREATE) if err != nil { - xapp.Logger.Error("SubFail: Failed to retrive transaction record. Dropping this msg. Err: %v, SubId: %v", err, params.SubId) + xapp.Logger.Info("SubFail: Dropping this msg. Err: %v SubId: %v", err, payloadSeqNum) return } - xapp.Logger.Info("SubFail: SubId: %v, from address: %v:%v. Forwarding response to xApp", int(payloadSeqNum), transaction.XappInstanceAddress, transaction.XappPort) - params.SubId = int(payloadSeqNum) - params.Xid = transaction.OrigParams.Xid - - xapp.Logger.Info("Forwarding SubFail to xApp: Mtype: %v, SubId: %v, Xid: %v, Meid: %v", params.Mtype, params.SubId, params.Xid, params.Meid) - err = c.rmrReplyToSender(params) - if err != nil { - xapp.Logger.Error("Failed to send response to xApp. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + if responseReceived == true { + // Subscription timer already received + return } + xapp.Logger.Info("SubFail: SubId: %v, from address: %v:%v. Forwarding response to xApp", payloadSeqNum, transaction.Xappkey.Addr, transaction.Xappkey.Port) time.Sleep(3 * time.Second) - if c.skipRouteUpdate == false { - xapp.Logger.Info("SubFail: Starting routing manager update. SubId: %v, Xid: %s", params.SubId, params.Xid) - subRouteAction := SubRouteInfo{CREATE, transaction.XappInstanceAddress, transaction.XappPort, payloadSeqNum} - err = c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) - if err != nil { - xapp.Logger.Error("SubFail: Failed to update routing manager. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) - } + xapp.Logger.Info("SubFail: Starting routing manager update. SubId: %v, Xid: %s", params.SubId, params.Xid) + subRouteAction := transaction.SubRouteInfo() + err = c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) + if err != nil { + xapp.Logger.Error("SubFail: Failed to update routing manager. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) } xapp.Logger.Info("SubFail: Deleting transaction record. SubId: %v, Xid: %s", params.SubId, params.Xid) if c.registry.releaseSequenceNumber(payloadSeqNum) { - transaction, err = c.tracker.completeTransaction(payloadSeqNum, CREATE) + _, err = c.tracker.completeTransaction(payloadSeqNum, CREATE) if err != nil { xapp.Logger.Error("SubFail: Failed to delete transaction record. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) return @@ -311,72 +311,81 @@ func (c *Control) handleSubscriptionFailure(params *xapp.RMRParams) { return } -func (c *Control) handleSubscriptionRequestTimer(strId string, nbrId int) { - newSubId := uint16(nbrId) - xapp.Logger.Info("SubReq timer expired. newSubId: %v", newSubId) - // var causeContent uint8 = 1 // just some random cause. To be checked later. Should be no respose or something - // var causeVal uint8 = 1 // just some random val. To be checked later. Should be no respose or something - // c.sendSubscriptionFailure(newSubId, causeContent, causeVal) -} +func (c *Control) handleSubscriptionRequestTimer(strId string, nbrId int, tryCount uint64) { + subId := uint16(nbrId) + xapp.Logger.Info("handleSubTimer: SubReq timer expired. subId: %v, tryCount: %v", subId, tryCount) -/* -func (c *Control) sendSubscriptionFailure(subId uint16, causeContent uint8, causeVal uint8) { - - transaction, err := c.tracker.completeTransaction(subId, CREATE) + transaction, responseReceived, err := c.tracker.CheckResponseReceived(subId, CREATE) if err != nil { - xapp.Logger.Error("SendSubFail: Failed to delete transaction record. Err:%v. SubId: %v", err, subId) + xapp.Logger.Info("handleSubTimer: Dropping this timer action. Err: %v SubId: %v", err, subId) return } - xapp.Logger.Info("SendSubFail: SubId: %v, Xid %v, Meid: %v", subId, transaction.OrigParams.Xid, transaction.OrigParams.Meid) - var params xapp.RMRParams - params.Mtype = 12012 //xapp.RICMessageTypes["RIC_SUB_FAILURE"] - params.SubId = int(subId) - params.Meid = transaction.OrigParams.Meid - params.Xid = transaction.OrigParams.Xid + if responseReceived == true { + // Subscription Response or Failure already received + return + } -// newPayload, packErr := c.e2ap.PackSubscriptionFailure(transaction.OrigParams.Payload, subId, causeContent, causeVal) -// if packErr != nil { -// xapp.Logger.Error("SendSubFail: PackSubscriptionFailure() due to %v", packErr) -// return -// } + if tryCount < maxSubReqTryCount { + xapp.Logger.Info("handleSubTimer: Resending SubReq to E2T: Mtype: %v, SubId: %v, Xid %s, Meid %v", transaction.OrigParams.Mtype, transaction.OrigParams.SubId, transaction.OrigParams.Xid, transaction.OrigParams.Meid) + // Set possible to handle new response for the subId + err = c.tracker.RetryTransaction(subId, CREATE) + if err != nil { + xapp.Logger.Error("handleSubDelTimer: Failed to retry transaction record. Dropping timer action. Err %v, SubId: %v", err, transaction.OrigParams.SubId) + return + } - newPayload := []byte("40CA4018000003EA7E00050000010016EA6300020021EA74000200C0") // Temporary solution + err = c.rmrSend(transaction.OrigParams) + if err != nil { + xapp.Logger.Error("handleSubTimer: Failed to send request to E2T %v, SubId: %v, Xid: %s", err, transaction.OrigParams.SubId, transaction.OrigParams.Xid) + } - params.PayloadLen = len(newPayload) - params.Payload = newPayload + tryCount++ + c.timerMap.StartTimer("RIC_SUB_REQ", int(subId), subReqTime, tryCount, c.handleSubscriptionRequestTimer) + return + } - xapp.Logger.Info("SendSubFail: Forwarding failure to xApp: Mtype: %v, SubId: %v, Xid: %s, Meid: %v",params.Mtype, params.SubId, params.Xid, params.Meid) - err = c.rmrReplyToSender(¶ms) + var subDelReqPayload []byte + subDelReqPayload, err = c.e2ap.PackSubscriptionDeleteRequest(transaction.OrigParams.Payload, subId) if err != nil { - xapp.Logger.Error("SendSubFail: Failed to send response to xApp. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + xapp.Logger.Error("handleSubTimer: Packing SubDelReq failed. Err: %v", err) + return } - time.Sleep(3 * time.Second) + // Cancel failed subscription + var params xapp.RMRParams + params.Mtype = 12020 // RIC SUBSCRIPTION DELETE + params.SubId = int(subId) + params.Xid = transaction.OrigParams.Xid + params.Meid = transaction.OrigParams.Meid + params.Src = transaction.OrigParams.Src + params.PayloadLen = len(subDelReqPayload) + params.Payload = subDelReqPayload + params.Mbuf = nil - xapp.Logger.Info("SendSubFail: SubId: %v, from address: %v:%v. Deleting transaction record", int(subId), transaction.XappInstanceAddress, transaction.XappPort) + // Delete CREATE transaction + _, err = c.tracker.completeTransaction(subId, CREATE) + if err != nil { + xapp.Logger.Error("handleSubTimer: Failed to delete create transaction record. Dropping this timer action. Err: %v, SubId: %v, Xid: %s", err, subId, params.Xid) + return + } - xapp.Logger.Info("SubReqTimer: Starting routing manager update. SubId: %v, Xid: %s", params.SubId, params.Xid) - subRouteAction := SubRouteInfo{DELETE, transaction.XappInstanceAddress, transaction.XappPort, subId} - err = c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) + // Create DELETE transaction + var forwardRespToXapp bool = false + _, err = c.trackDeleteTransaction(¶ms, subId, forwardRespToXapp) if err != nil { - xapp.Logger.Error("SendSubFail: Failed to update routing manager %v. SubId: %v, Xid: %s", err, params.SubId, params.Xid) + xapp.Logger.Error("handleSubTimer: Failed to create delete transaction record. Dropping this timer action. Err: %v, SubId: %v, Xid: %s", err, subId, params.Xid) return } - xapp.Logger.Info("SendSubFail: Deleting transaction record. SubId: %v, Xid: %s", params.SubId, params.Xid) - if c.registry.releaseSequenceNumber(subId) { - transaction, err = c.tracker.completeTransaction(subId, CREATE) - if err != nil { - xapp.Logger.Error("SendSubFail: Failed to delete transaction record. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) - return - } - } else { - xapp.Logger.Error("SendSubFail: Failed to release sequency number. SubId: %v, Xid: %s", params.SubId, params.Xid) + xapp.Logger.Info("handleSubTimer: Sending SubDelReq to E2T: Mtype: %v, SubId: %v, Meid: %v", params.Mtype, params.SubId, params.Meid) + c.rmrSend(¶ms) + if err != nil { + xapp.Logger.Error("handleSubTimer: Failed to send request to E2T %v. SubId: %v, Xid: %s", err, params.SubId, params.Xid) } + c.timerMap.StartTimer("RIC_SUB_DEL_REQ", int(subId), subDelReqTime, FirstTry, c.handleSubscriptionDeleteRequestTimer) return } -*/ func (act Action) String() string { actions := [...]string{ @@ -408,18 +417,19 @@ func (c *Control) handleSubscriptionDeleteRequest(params *xapp.RMRParams) { payloadSeqNum, err := c.e2ap.GetSubscriptionDeleteRequestSequenceNumber(params.Payload) if err != nil { - xapp.Logger.Error("SubDelReq: Unable to get Sequence Number from Payload. Dropping this msg. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + xapp.Logger.Error("SubDelReq: Unable to get Sequence Number from Payload. Dropping this msg. Err: %v, SubId: %v, Xid: %s, Payload %X", err, params.SubId, params.Xid, params.Payload) return } xapp.Logger.Info("SubDelReq: Received payloadSeqNum: %v", payloadSeqNum) if c.registry.IsValidSequenceNumber(payloadSeqNum) { - c.registry.deleteSubscription(payloadSeqNum) - err = c.trackDeleteTransaction(params, payloadSeqNum) + var forwardRespToXapp bool = true + _, err = c.trackDeleteTransaction(params, payloadSeqNum, forwardRespToXapp) if err != nil { xapp.Logger.Error("SubDelReq: Failed to create transaction record. Dropping this msg. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) return } + c.registry.setSubscriptionToUnConfirmed(payloadSeqNum) } else { xapp.Logger.Error("SubDelReq: Not valid sequence number. Dropping this msg. SubId: %v, Xid: %s", params.SubId, params.Xid) return @@ -429,20 +439,18 @@ func (c *Control) handleSubscriptionDeleteRequest(params *xapp.RMRParams) { c.rmrSend(params) if err != nil { xapp.Logger.Error("SubDelReq: Failed to send request to E2T. Err %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) - } else { - c.timerMap.StartTimer("RIC_SUB_DEL_REQ", int(payloadSeqNum), subReqTime, c.handleSubscriptionDeleteRequestTimer) } + c.timerMap.StartTimer("RIC_SUB_DEL_REQ", int(payloadSeqNum), subDelReqTime, FirstTry, c.handleSubscriptionDeleteRequestTimer) return } -func (c *Control) trackDeleteTransaction(params *xapp.RMRParams, payloadSeqNum uint16) (err error) { +func (c *Control) trackDeleteTransaction(params *xapp.RMRParams, payloadSeqNum uint16, forwardRespToXapp bool) (transaction *Transaction, err error) { srcAddr, srcPort, err := c.rtmgrClient.SplitSource(params.Src) if err != nil { - xapp.Logger.Error("SubDelReq: Failed to update routing-manager. Err: %s, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + xapp.Logger.Error("Failed to split source address. Err: %s, SubId: %v, Xid: %s", err, payloadSeqNum, params.Xid) } - xactKey := TransactionKey{payloadSeqNum, DELETE} - xactValue := Transaction{*srcAddr, *srcPort, params} - err = c.tracker.TrackTransaction(xactKey, xactValue) + var respReceived bool = false + transaction, err = c.tracker.TrackTransaction(payloadSeqNum, DELETE, *srcAddr, *srcPort, params, respReceived, forwardRespToXapp) return } @@ -453,45 +461,48 @@ func (c *Control) handleSubscriptionDeleteResponse(params *xapp.RMRParams) (err payloadSeqNum, err := c.e2ap.GetSubscriptionDeleteResponseSequenceNumber(params.Payload) if err != nil { - xapp.Logger.Error("SubDelResp: Unable to get Sequence Number from Payload. Dropping this msg. Err: %v, SubId: %v", err, params.SubId) + xapp.Logger.Error("SubDelResp: Unable to get Sequence Number from Payload. Dropping this msg. Err: %v, SubId: %v, Xid: %s, Payload %X", err, params.SubId, params.Xid, params.Payload) return } xapp.Logger.Info("SubDelResp: Received payloadSeqNum: %v", payloadSeqNum) c.timerMap.StopTimer("RIC_SUB_DEL_REQ", int(payloadSeqNum)) - var transaction Transaction - transaction, err = c.tracker.RetriveTransaction(payloadSeqNum, DELETE) + transaction, responseReceived, err := c.tracker.CheckResponseReceived(payloadSeqNum, DELETE) if err != nil { - xapp.Logger.Error("SubDelResp: Failed to retrive transaction record. Dropping this msg. Err: %v, SubId: %v", err, params.SubId) + xapp.Logger.Info("SubDelResp: Dropping this msg. Err: %v SubId: %v", err, payloadSeqNum) return } - xapp.Logger.Info("SubDelResp: SubId: %v, from address: %v:%v. Forwarding response to xApp", int(payloadSeqNum), transaction.XappInstanceAddress, transaction.XappPort) - params.SubId = int(payloadSeqNum) - params.Xid = transaction.OrigParams.Xid - xapp.Logger.Info("Forwarding SubDelResp to xApp: Mtype: %v, SubId: %v, Xid: %v, Meid: %v", params.Mtype, params.SubId, params.Xid, params.Meid) - err = c.rmrReplyToSender(params) - if err != nil { - xapp.Logger.Error("SubDelResp: Failed to send response to xApp. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) - // return + if responseReceived == true { + // Subscription Delete timer already received + return } + xapp.Logger.Info("SubDelResp: SubId: %v, from address: %v:%v. Forwarding response to xApp", payloadSeqNum, transaction.Xappkey.Addr, transaction.Xappkey.Port) - time.Sleep(3 * time.Second) - - if c.skipRouteUpdate == false { - xapp.Logger.Info("SubDelResp: Starting routing manager update. SubId: %v, Xid: %s", params.SubId, params.Xid) - subRouteAction := SubRouteInfo{DELETE, transaction.XappInstanceAddress, transaction.XappPort, payloadSeqNum} - err = c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) + if transaction.ForwardRespToXapp == true { + params.SubId = int(payloadSeqNum) + params.Xid = transaction.OrigParams.Xid + xapp.Logger.Info("Forwarding SubDelResp to xApp: Mtype: %v, SubId: %v, Xid: %v, Meid: %v", params.Mtype, params.SubId, params.Xid, params.Meid) + err = c.rmrReplyToSender(params) if err != nil { - xapp.Logger.Error("SubDelResp: Failed to update routing manager. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) - return + xapp.Logger.Error("SubDelResp: Failed to send response to xApp. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) } + + time.Sleep(3 * time.Second) + } + + xapp.Logger.Info("SubDelResp: Starting routing manager update. SubId: %v, Xid: %s", params.SubId, params.Xid) + subRouteAction := SubRouteInfo{DELETE, transaction.Xappkey.Addr, transaction.Xappkey.Port, payloadSeqNum} + err = c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) + if err != nil { + xapp.Logger.Error("SubDelResp: Failed to update routing manager. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + return } xapp.Logger.Info("SubDelResp: Deleting transaction record. SubId: %v, Xid: %s", params.SubId, params.Xid) if c.registry.releaseSequenceNumber(payloadSeqNum) { - transaction, err = c.tracker.completeTransaction(payloadSeqNum, DELETE) + _, err = c.tracker.completeTransaction(payloadSeqNum, DELETE) if err != nil { xapp.Logger.Error("SubDelResp: Failed to delete transaction record. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) return @@ -510,45 +521,61 @@ func (c *Control) handleSubscriptionDeleteFailure(params *xapp.RMRParams) { payloadSeqNum, err := c.e2ap.GetSubscriptionDeleteFailureSequenceNumber(params.Payload) if err != nil { - xapp.Logger.Error("SubDelFail: Unable to get Sequence Number from Payload. Dropping this msg. Err: %v, SubId: %v", err, params.SubId) + xapp.Logger.Error("SubDelFail: Unable to get Sequence Number from Payload. Dropping this msg. Err: %v, SubId: %v, Xid: %s, Payload %X", err, params.SubId, params.Xid, params.Payload) return } xapp.Logger.Info("SubDelFail: Received payloadSeqNum: %v", payloadSeqNum) c.timerMap.StopTimer("RIC_SUB_DEL_REQ", int(payloadSeqNum)) - var transaction Transaction - transaction, err = c.tracker.RetriveTransaction(payloadSeqNum, DELETE) + transaction, responseReceived, err := c.tracker.CheckResponseReceived(payloadSeqNum, DELETE) if err != nil { - xapp.Logger.Error("SubDelFail: Failed to retrive transaction record. Dropping msg. Err %v, SubId: %v", err, params.SubId) + xapp.Logger.Info("SubDelFail: Dropping this msg. Err: %v SubId: %v", err, payloadSeqNum) return } - xapp.Logger.Info("SubDelFail: SubId: %v, from address: %v:%v. Forwarding response to xApp", int(payloadSeqNum), transaction.XappInstanceAddress, transaction.XappPort) - params.SubId = int(payloadSeqNum) - params.Xid = transaction.OrigParams.Xid - xapp.Logger.Info("Forwarding SubDelFail to xApp: Mtype: %v, SubId: %v, Xid: %v, Meid: %v", params.Mtype, params.SubId, params.Xid, params.Meid) - err = c.rmrReplyToSender(params) - if err != nil { - xapp.Logger.Error("Failed to send SubDelFail to xApp. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) - // return + if responseReceived == true { + // Subscription Delete timer already received + return } + xapp.Logger.Info("SubDelFail: SubId: %v, from address: %v:%v. Forwarding response to xApp", payloadSeqNum, transaction.Xappkey.Addr, transaction.Xappkey.Port) - time.Sleep(3 * time.Second) - - if c.skipRouteUpdate == false { - xapp.Logger.Info("SubDelFail: Starting routing manager update. SubId: %v, Xid: %s", params.SubId, params.Xid) - subRouteAction := SubRouteInfo{DELETE, transaction.XappInstanceAddress, transaction.XappPort, payloadSeqNum} - c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) + if transaction.ForwardRespToXapp == true { + var subDelRespPayload []byte + subDelRespPayload, err = c.e2ap.PackSubscriptionDeleteResponse(transaction.OrigParams.Payload, payloadSeqNum) if err != nil { - xapp.Logger.Error("SubDelFail: Failed to update routing manager. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + xapp.Logger.Error("SubDelFail:Packing SubDelResp failed. Err: %v", err) return } + + params.Mtype = 12021 // RIC SUBSCRIPTION DELETE RESPONSE + params.SubId = int(payloadSeqNum) + params.Xid = transaction.OrigParams.Xid + params.Meid = transaction.OrigParams.Meid + params.Src = transaction.OrigParams.Src + params.PayloadLen = len(subDelRespPayload) + params.Payload = subDelRespPayload + params.Mbuf = nil + xapp.Logger.Info("SubDelFail: Forwarding SubDelFail to xApp: Mtype: %v, SubId: %v, Xid: %v, Meid: %v", params.Mtype, params.SubId, params.Xid, params.Meid) + err = c.rmrReplyToSender(params) + if err != nil { + xapp.Logger.Error("SubDelFail: Failed to send SubDelFail to xApp. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + } + + time.Sleep(3 * time.Second) + } + + xapp.Logger.Info("SubDelFail: Starting routing manager update. SubId: %v, Xid: %s", params.SubId, params.Xid) + subRouteAction := SubRouteInfo{DELETE, transaction.Xappkey.Addr, transaction.Xappkey.Port, payloadSeqNum} + err = c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) + if err != nil { + xapp.Logger.Error("SubDelFail: Failed to update routing manager. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + return } xapp.Logger.Info("SubDelFail: Deleting transaction record. SubId: %v, Xid: %s", params.SubId, params.Xid) if c.registry.releaseSequenceNumber(payloadSeqNum) { - transaction, err = c.tracker.completeTransaction(payloadSeqNum, DELETE) + _, err = c.tracker.completeTransaction(payloadSeqNum, DELETE) if err != nil { xapp.Logger.Error("SubDelFail: Failed to delete transaction record. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) return @@ -560,68 +587,84 @@ func (c *Control) handleSubscriptionDeleteFailure(params *xapp.RMRParams) { return } -func (c *Control) handleSubscriptionDeleteRequestTimer(strId string, nbrId int) { - newSubId := uint16(nbrId) - xapp.Logger.Info("SubDelReq timer expired. newSubId: %v", newSubId) - // var causeContent uint8 = 1 // just some random cause. To be checked later. Should be no respose or something - // var causeVal uint8 = 1 // just some random val. To be checked later. Should be no respose or something - // c.sendSubscriptionDeleteFailure(newSubId, causeContent, causeVal) -} +func (c *Control) handleSubscriptionDeleteRequestTimer(strId string, nbrId int, tryCount uint64) { + subId := uint16(nbrId) + xapp.Logger.Info("handleSubDelTimer: SubDelReq timer expired. subId: %v, tryCount: %v", subId, tryCount) -/* -func (c *Control) sendSubscriptionDeleteFailure(subId uint16, causeContent uint8, causeVal uint8) { - transaction, err := c.tracker.completeTransaction(subId, DELETE) + transaction, responseReceived, err := c.tracker.CheckResponseReceived(subId, DELETE) if err != nil { - xapp.Logger.Error("SendSubDelFail: Failed to delete transaction record. Err: %v, newSubId: %v", err, subId) + xapp.Logger.Info("handleSubTimer: Dropping this timer action. Err: %v SubId: %v", err, subId) return } - xapp.Logger.Info("SendSubDelFail: SubId: %v, Xid %v, Meid: %v",subId, transaction.OrigParams.Xid, transaction.OrigParams.Meid) - - var params xapp.RMRParams - params.Mtype = 12022 //xapp.RICMessageTypes["RIC_SUB_DEL_FAILURE"] - params.SubId = int(subId) - params.Meid = transaction.OrigParams.Meid - params.Xid = transaction.OrigParams.Xid -// newPayload, packErr := c.e2ap.PackSubscriptionDeleteFailure(transaction.OrigParams.Payload, subId, causeContent, causeVal) -// if packErr != nil { -// xapp.Logger.Error("SendSubDelFail: PackSubscriptionDeleteFailure(). Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid)) -// return -// } + if responseReceived == true { + // Subscription Delete Response or Failure already received + return + } - newPayload := []byte("40CA4018000003EA7E00050000010016EA6300020021EA74000200C0") // Temporary solution + if tryCount < maxSubDelReqTryCount { + xapp.Logger.Info("handleSubDelTimer: Resending SubDelReq to E2T: Mtype: %v, SubId: %v, Xid %s, Meid %v", transaction.OrigParams.Mtype, transaction.OrigParams.SubId, transaction.OrigParams.Xid, transaction.OrigParams.Meid) + // Set possible to handle new response for the subId + err = c.tracker.RetryTransaction(subId, DELETE) + if err != nil { + xapp.Logger.Error("handleSubDelTimer: Failed to retry transaction record. Dropping timer action. Err %v, SubId: %v", err, transaction.OrigParams.SubId) + return + } - params.PayloadLen = len(newPayload) - params.Payload = newPayload + err = c.rmrSend(transaction.OrigParams) + if err != nil { + xapp.Logger.Error("handleSubDelTimer: Failed to send request to E2T %v, SubId: %v, Xid: %s", err, transaction.OrigParams.SubId, transaction.OrigParams.Xid) + } - xapp.Logger.Info("SendSubDelFail: Forwarding failure to xApp: Mtype: %v, SubId: %v, Xid: %s, Meid: %v",params.Mtype, params.SubId, params.Xid, params.Meid) - err = c.rmrReplyToSender(¶ms) - if err != nil { - xapp.Logger.Error("SendSubDelFail: Failed to send response to xApp: Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + tryCount++ + c.timerMap.StartTimer("RIC_SUB_DEL_REQ", int(subId), subReqTime, tryCount, c.handleSubscriptionDeleteRequestTimer) + return } - time.Sleep(3 * time.Second) + var params xapp.RMRParams + if transaction.ForwardRespToXapp == true { + var subDelRespPayload []byte + subDelRespPayload, err = c.e2ap.PackSubscriptionDeleteResponse(transaction.OrigParams.Payload, subId) + if err != nil { + xapp.Logger.Error("handleSubDelTimer: Unable to pack payload. Dropping this timer action. Err: %v, SubId: %v, Xid: %s, Payload %x", err, subId, transaction.OrigParams.Xid, transaction.OrigParams.Payload) + return + } - xapp.Logger.Info("SendSubDelFail: SubId: %v, from address: %v:%v. Deleting transaction record", int(subId), transaction.XappInstanceAddress, transaction.XappPort) + params.Mtype = 12021 // RIC SUBSCRIPTION DELETE RESPONSE + params.SubId = int(subId) + params.Meid = transaction.OrigParams.Meid + params.Xid = transaction.OrigParams.Xid + params.Src = transaction.OrigParams.Src + params.PayloadLen = len(subDelRespPayload) + params.Payload = subDelRespPayload + params.Mbuf = nil + + xapp.Logger.Info("handleSubDelTimer: Sending SubDelResp to xApp: Mtype: %v, SubId: %v, Xid: %s, Meid: %v", params.Mtype, params.SubId, params.Xid, params.Meid) + err = c.rmrReplyToSender(¶ms) + if err != nil { + xapp.Logger.Error("handleSubDelTimer: Failed to send response to xApp: Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + } - xapp.Logger.Info("SendSubDelFail: Starting routing manager update. SubId: %v, Xid: %s", params.SubId, params.Xid) - subRouteAction := SubRouteInfo{DELETE, transaction.XappInstanceAddress, transaction.XappPort, subId} + time.Sleep(3 * time.Second) + } + + xapp.Logger.Info("handleSubDelTimer: Starting routing manager update. SubId: %v, Xid: %s", subId, params.Xid) + subRouteAction := SubRouteInfo{DELETE, transaction.Xappkey.Addr, transaction.Xappkey.Port, subId} err = c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) if err != nil { - xapp.Logger.Error("SendSubDelFail: Failed to update routing manager. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + xapp.Logger.Error("handleSubDelTimer: Failed to update routing manager. Err: %v, SubId: %v, Xid: %s", err, subId, params.Xid) return } - xapp.Logger.Info("SendSubDelFail: Deleting transaction record. SubId: %v, Xid: %s", params.SubId, params.Xid) + xapp.Logger.Info("handleSubDelTimer: Deleting transaction record. SubId: %v, Xid: %s", subId, params.Xid) if c.registry.releaseSequenceNumber(subId) { - transaction, err = c.tracker.completeTransaction(subId, DELETE) + _, err = c.tracker.completeTransaction(subId, DELETE) if err != nil { - xapp.Logger.Error("SendSubDelFail: Failed to delete transaction record. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + xapp.Logger.Error("handleSubDelTimer: Failed to delete transaction record. Err: %v, SubId: %v, Xid: %s", err, subId, params.Xid) return } } else { - xapp.Logger.Error("SendSubDelFail: Failed to release sequency number. SubId: %v, Xid: %s", params.SubId, params.Xid) + xapp.Logger.Error("handleSubDelTimer: Failed to release sequency number. SubId: %v, Xid: %s", subId, params.Xid) } return } -*/