package control
-import "C"
-
import (
"errors"
rtmgrclient "gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/rtmgr_client"
)
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
)
func init() {
- xapp.Logger.Info("SUBMGR /ric-plt-submgr:r3-test-v4")
+ xapp.Logger.Info("SUBMGR")
viper.AutomaticEnv()
viper.SetEnvPrefix("submgr")
viper.AllowEmptyEnv(true)
newSubId, isIdValid := c.registry.ReserveSequenceNumber()
if isIdValid != true {
xapp.Logger.Error("SubReq: Failed to reserve sequence number. Dropping this msg. SubId: %v, Xid: %s", params.SubId, params.Xid)
+ c.registry.releaseSequenceNumber(newSubId)
return
}
+ params.SubId = int(newSubId)
err := c.e2ap.SetSubscriptionRequestSequenceNumber(params.Payload, newSubId)
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(newSubId)
return
}
return
}
- /* Create transatcion records for every subscription request */
- transaction, err := c.tracker.TrackTransaction(newSubId, CREATE, *srcAddr, *srcPort, params)
+ // Create transatcion record for every subscription request
+ var forwardRespToXapp bool = true
+ var responseReceived bool = false
+ transaction, err := c.tracker.TrackTransaction(newSubId, 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(newSubId)
return
}
- /* Update routing manager about the new subscription*/
+ // 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)
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)
+ 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(newSubId)
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(newSubId), subReqTime, FirstTry, c.handleSubscriptionRequestTimer)
xapp.Logger.Debug("SubReq: Debugging transaction table = %v", c.tracker.transactionTable)
return
}
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)
c.timerMap.StopTimer("RIC_SUB_REQ", int(payloadSeqNum))
- c.registry.setSubscriptionToConfirmed(payloadSeqNum)
- 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
}
- xapp.Logger.Info("SubResp: SubId: %v, from address: %v:%v. Retrieved old subId", int(payloadSeqNum), transaction.Xappkey.Addr, transaction.Xappkey.Port)
+
+ if responseReceived == true {
+ // Subscription timer already received
+ return
+ }
+ 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
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.Xappkey.Addr, transaction.Xappkey.Port)
- 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
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))
- 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.Xappkey.Addr, transaction.Xappkey.Port)
- 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)
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
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) sendSubscriptionFailure(subId uint16, causeContent uint8, causeVal uint8) {
+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)
- 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.Xappkey.Addr, transaction.Xappkey.Port)
+ // 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.Xappkey.Addr, transaction.Xappkey.Port, 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{
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.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) (transaction *Transaction, 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)
}
- transaction, err = c.tracker.TrackTransaction(payloadSeqNum, DELETE, *srcAddr, *srcPort, params)
+ var respReceived bool = false
+ transaction, err = c.tracker.TrackTransaction(payloadSeqNum, DELETE, *srcAddr, *srcPort, params, respReceived, forwardRespToXapp)
return
}
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))
- 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.Xappkey.Addr, transaction.Xappkey.Port)
- 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 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 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}
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
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))
- 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.Xappkey.Addr, transaction.Xappkey.Port)
- 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 transaction.ForwardRespToXapp == true {
+ var subDelRespPayload []byte
+ subDelRespPayload, err = c.e2ap.PackSubscriptionDeleteResponse(transaction.OrigParams.Payload, payloadSeqNum)
+ if err != nil {
+ 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}
- c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
+ 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
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
+ }
+
+ 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: SubId: %v, from address: %v:%v. Deleting transaction record", int(subId), transaction.Xappkey.Addr, transaction.Xappkey.Port)
+ time.Sleep(3 * time.Second)
+ }
- xapp.Logger.Info("SendSubDelFail: Starting routing manager update. SubId: %v, Xid: %s", params.SubId, params.Xid)
+ 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
}
-*/
import (
"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/e2ap/pkg/packer"
"unsafe"
)
+var packerif e2ap.E2APPackerIf = e2ap_wrapper.NewAsn1E2Packer()
+
type E2ap struct {
}
cptr := unsafe.Pointer(&payload[0])
cret := C.e2ap_get_ric_subscription_request_sequence_number(cptr, C.size_t(len(payload)))
if cret < 0 {
- return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Request Sequence Number due to wrong or invalid payload. ErrorCode: %v", cret)
+ return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Request Sequence Number due to wrong or invalid payload. Erroxappde: %v", cret)
}
subId = uint16(cret)
return
}
-// Used by submgr, rco test stub
+// Used by submgr, xapp test stub
func (c *E2ap) SetSubscriptionRequestSequenceNumber(payload []byte, newSubscriptionid uint16) (err error) {
cptr := unsafe.Pointer(&payload[0])
size := C.e2ap_set_ric_subscription_request_sequence_number(cptr, C.size_t(len(payload)), C.long(newSubscriptionid))
if size < 0 {
- return fmt.Errorf("e2ap wrapper is unable to set Subscription Request Sequence Number due to wrong or invalid payload. ErrorCode: %v", size)
+ return fmt.Errorf("e2ap wrapper is unable to set Subscription Request Sequence Number due to wrong or invalid payload. Erroxappde: %v", size)
}
return
}
-// Used by submgr, rco test stub
+// Used by submgr, xapp test stub
func (c *E2ap) GetSubscriptionResponseSequenceNumber(payload []byte) (subId uint16, err error) {
cptr := unsafe.Pointer(&payload[0])
cret := C.e2ap_get_ric_subscription_response_sequence_number(cptr, C.size_t(len(payload)))
if cret < 0 {
- return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Response Sequence Number due to wrong or invalid payload. ErrorCode: %v", cret)
+ return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Response Sequence Number due to wrong or invalid payload. Erroxappde: %v", cret)
}
subId = uint16(cret)
return
cptr := unsafe.Pointer(&payload[0])
size := C.e2ap_set_ric_subscription_response_sequence_number(cptr, C.size_t(len(payload)), C.long(newSubscriptionid))
if size < 0 {
- return fmt.Errorf("e2ap wrapper is unable to set Subscription Response Sequence Number due to wrong or invalid payload. ErrorCode: %v", size)
+ return fmt.Errorf("e2ap wrapper is unable to set Subscription Response Sequence Number due to wrong or invalid payload. Erroxappde: %v", size)
}
return
}
cptr := unsafe.Pointer(&payload[0])
cret := C.e2ap_get_ric_subscription_delete_request_sequence_number(cptr, C.size_t(len(payload)))
if cret < 0 {
- return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Delete Request Sequence Number due to wrong or invalid payload. ErrorCode: %v", cret)
+ return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Delete Request Sequence Number due to wrong or invalid payload. Erroxappde: %v", cret)
}
subId = uint16(cret)
return
}
-// Used by rco test stub
+// Used by xapp test stub
func (c *E2ap) SetSubscriptionDeleteRequestSequenceNumber(payload []byte, newSubscriptionid uint16) (err error) {
cptr := unsafe.Pointer(&payload[0])
size := C.e2ap_set_ric_subscription_delete_request_sequence_number(cptr, C.size_t(len(payload)), C.long(newSubscriptionid))
if size < 0 {
- return fmt.Errorf("e2ap wrapper is unable to set Subscription Delete Request Sequence Number due to wrong or invalid payload. ErrorCode: %v", size)
+ return fmt.Errorf("e2ap wrapper is unable to set Subscription Delete Request Sequence Number due to wrong or invalid payload. Erroxappde: %v", size)
}
return
}
/* RICsubscriptionDeleteResponse */
-// Used by submgr, rco test stub
+// Used by submgr, e2t test stub
func (c *E2ap) GetSubscriptionDeleteResponseSequenceNumber(payload []byte) (subId uint16, err error) {
cptr := unsafe.Pointer(&payload[0])
cret := C.e2ap_get_ric_subscription_delete_response_sequence_number(cptr, C.size_t(len(payload)))
if cret < 0 {
- return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Delete Response Sequence Number due to wrong or invalid payload. ErrorCode: %v", cret)
+ return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Delete Response Sequence Number due to wrong or invalid payload. Erroxappde: %v", cret)
}
subId = uint16(cret)
return
cptr := unsafe.Pointer(&payload[0])
size := C.e2ap_set_ric_subscription_delete_response_sequence_number(cptr, C.size_t(len(payload)), C.long(newSubscriptionid))
if size < 0 {
- return fmt.Errorf("e2ap wrapper is unable to set Subscription Delete Response Sequence Number due to wrong or invalid payload. ErrorCode: %v", size)
+ return fmt.Errorf("e2ap wrapper is unable to set Subscription Delete Response Sequence Number due to wrong or invalid payload. Erroxappde: %v", size)
}
return
}
cptr := unsafe.Pointer(&payload[0])
cret := C.e2ap_get_ric_subscription_failure_sequence_number(cptr, C.size_t(len(payload)))
if cret < 0 {
- return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Failure Sequence Number due to wrong or invalid payload. ErrorCode: %v", cret)
+ return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Failure Sequence Number due to wrong or invalid payload. Erroxappde: %v", cret)
}
subId = uint16(cret)
return
}
-// Used by submgr
+// Used by e2t test stub
func (c *E2ap) SetSubscriptionFailureSequenceNumber(payload []byte, newSubscriptionid uint16) (err error) {
cptr := unsafe.Pointer(&payload[0])
size := C.e2ap_set_ric_subscription_failure_sequence_number(cptr, C.size_t(len(payload)), C.long(newSubscriptionid))
if size < 0 {
- return fmt.Errorf("e2ap wrapper is unable to set Subscription Failure Sequence Number due to wrong or invalid payload. ErrorCode: %v", size)
+ return fmt.Errorf("e2ap wrapper is unable to set Subscription Failure Sequence Number due to wrong or invalid payload. Erroxappde: %v", size)
}
return
}
cptr := unsafe.Pointer(&payload[0])
cret := C.e2ap_get_ric_subscription_delete_failure_sequence_number(cptr, C.size_t(len(payload)))
if cret < 0 {
- return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Delete Failure Sequence Number due to wrong or invalid payload. ErrorCode: %v", cret)
+ return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Delete Failure Sequence Number due to wrong or invalid payload. Erroxappde: %v", cret)
}
subId = uint16(cret)
return
cptr := unsafe.Pointer(&payload[0])
size := C.e2ap_set_ric_subscription_delete_failure_sequence_number(cptr, C.size_t(len(payload)), C.long(newSubscriptionid))
if size < 0 {
- return fmt.Errorf("e2ap wrapper is unable to set Subscription Delete Failure Sequence Number due to wrong or invalid payload. ErrorCode: %v", size)
+ return fmt.Errorf("e2ap wrapper is unable to set Subscription Delete Failure Sequence Number due to wrong or invalid payload. Erroxappde: %v", size)
}
return
}
+
+// Used by submgr
+func (c *E2ap) PackSubscriptionDeleteResponse(payload []byte, newSubscriptionid uint16) (newPayload []byte, err error) {
+ e2SubDelReq := packerif.NewPackerSubscriptionDeleteRequest()
+ packedData := &packer.PackedData{}
+ packedData.Buf = payload
+ err = e2SubDelReq.UnPack(packedData)
+ if err != nil {
+ return make([]byte, 0), fmt.Errorf("PackSubDelResp: UnPack() failed: %s", err.Error())
+ }
+ getErr, subDelReq := e2SubDelReq.Get()
+ if getErr != nil {
+ return make([]byte, 0), fmt.Errorf("PackSubDelResp: Get() failed: %s", getErr.Error())
+ }
+
+ e2SubDelResp := packerif.NewPackerSubscriptionDeleteResponse()
+ subDelResp := e2ap.E2APSubscriptionDeleteResponse{}
+ subDelResp.RequestId.Id = subDelReq.RequestId.Id
+ subDelResp.RequestId.Seq = uint32(newSubscriptionid)
+ subDelResp.FunctionId = subDelReq.FunctionId
+ err = e2SubDelResp.Set(&subDelResp)
+ if err != nil {
+ return make([]byte, 0), fmt.Errorf("PackSubDelResp: Set() failed: %s", err.Error())
+ }
+ err, packedData = e2SubDelResp.Pack(nil)
+ if err != nil {
+ return make([]byte, 0), fmt.Errorf("PackSubDelResp: Pack() failed: %s", err.Error())
+ }
+ return packedData.Buf, nil
+}
+
+// Used by submgr
+func (c *E2ap) PackSubscriptionDeleteRequest(payload []byte, newSubscriptionid uint16) (newPayload []byte, err error) {
+ e2SubReq := packerif.NewPackerSubscriptionRequest()
+ packedData := &packer.PackedData{}
+ packedData.Buf = payload
+ err = e2SubReq.UnPack(packedData)
+ if err != nil {
+ return make([]byte, 0), fmt.Errorf("PackSubDelReq: UnPack() failed: %s", err.Error())
+ }
+ getErr, subReq := e2SubReq.Get()
+ if getErr != nil {
+ return make([]byte, 0), fmt.Errorf("PackSubDelReq: Get() failed: %s", getErr.Error())
+ }
+
+ e2SubDel := packerif.NewPackerSubscriptionDeleteRequest()
+ subDelReq := e2ap.E2APSubscriptionDeleteRequest{}
+ subDelReq.RequestId.Id = subReq.RequestId.Id
+ subDelReq.RequestId.Seq = uint32(newSubscriptionid)
+ subDelReq.FunctionId = subReq.FunctionId
+ err = e2SubDel.Set(&subDelReq)
+ if err != nil {
+ return make([]byte, 0), fmt.Errorf("PackSubDelReq: Set() failed: %s", err.Error())
+ }
+ err, packedData = e2SubDel.Pack(nil)
+ if err != nil {
+ return make([]byte, 0), fmt.Errorf("PackSubDelReq: Pack() failed: %s", err.Error())
+ }
+ return packedData.Buf, nil
+}
Code Review / ric-plt / submgr.git / commitdiff