X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fcontrol.go;h=ef27530e14491858efea0884c01815d4d988f98b;hb=662f68d35c10fa67382235a20e1e08c50359989a;hp=b398daaf1488c882dc5422ca8ba9c34eb3d64595;hpb=c65f5b0d9ad73ce3f66eabc22e80244546e97238;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/control.go b/pkg/control/control.go old mode 100644 new mode 100755 index b398daa..ef27530 --- a/pkg/control/control.go +++ b/pkg/control/control.go @@ -19,10 +19,9 @@ package control -import "C" - import ( - "errors" + "fmt" + "gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap" rtmgrclient "gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/rtmgr_client" rtmgrhandle "gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/rtmgr_client/handle" "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp" @@ -34,16 +33,22 @@ import ( "time" ) +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- + 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 + msgCounter uint64 } type RMRMeid struct { @@ -62,7 +67,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) @@ -78,8 +83,16 @@ func init() { } func NewControl() *Control { + + transport := httptransport.New(viper.GetString("rtmgr.HostAddr")+":"+viper.GetString("rtmgr.port"), viper.GetString("rtmgr.baseUrl"), []string{"http"}) + client := rtmgrclient.New(transport, strfmt.Default) + handle := rtmgrhandle.NewProvideXappSubscriptionHandleParamsWithTimeout(10 * time.Second) + deleteHandle := rtmgrhandle.NewDeleteXappSubscriptionHandleParamsWithTimeout(10 * time.Second) + rtmgrClient := RtmgrClient{client, handle, deleteHandle} + registry := new(Registry) registry.Initialize(seedSN) + registry.rtmgrClient = &rtmgrClient tracker := new(Tracker) tracker.Init() @@ -87,17 +100,11 @@ func NewControl() *Control { timerMap := new(TimerMap) timerMap.Init() - transport := httptransport.New(viper.GetString("rtmgr.HostAddr")+":"+viper.GetString("rtmgr.port"), viper.GetString("rtmgr.baseUrl"), []string{"http"}) - client := rtmgrclient.New(transport, strfmt.Default) - handle := rtmgrhandle.NewProvideXappSubscriptionHandleParamsWithTimeout(10 * time.Second) - deleteHandle := rtmgrhandle.NewDeleteXappSubscriptionHandleParamsWithTimeout(10 * time.Second) - rtmgrClient := RtmgrClient{client, handle, deleteHandle} - return &Control{e2ap: new(E2ap), - registry: registry, - rtmgrClient: &rtmgrClient, - tracker: tracker, - timerMap: timerMap, + registry: registry, + tracker: tracker, + timerMap: timerMap, + msgCounter: 0, } } @@ -105,31 +112,61 @@ func (c *Control) Run() { xapp.Run(c) } -func (c *Control) rmrSend(params *xapp.RMRParams) (err error) { +func (c *Control) rmrSendRaw(desc string, params *RMRParams) (err error) { + + xapp.Logger.Info("%s: %s", desc, params.String()) status := false i := 1 for ; i <= 10 && status == false; i++ { c.rmrSendMutex.Lock() - status = xapp.Rmr.Send(params, false) + status = xapp.Rmr.Send(params.RMRParams, false) c.rmrSendMutex.Unlock() if status == false { - xapp.Logger.Info("rmr.Send() failed. Retry count %v, Mtype: %v, SubId: %v, Xid %s", i, params.Mtype, params.SubId, params.Xid) + xapp.Logger.Info("rmr.Send() failed. Retry count %d, %s", i, params.String()) time.Sleep(500 * time.Millisecond) } } if status == false { - err = errors.New("rmr.Send() failed") + err = fmt.Errorf("rmr.Send() failed. Retry count %d, %s", i, params.String()) + xapp.Logger.Error("%s: %s", desc, err.Error()) xapp.Rmr.Free(params.Mbuf) } return } -func (c *Control) rmrReplyToSender(params *xapp.RMRParams) (err error) { - c.rmrSend(params) - return +func (c *Control) rmrSend(desc string, subs *Subscription, trans *Transaction) (err error) { + params := &RMRParams{&xapp.RMRParams{}} + params.Mtype = trans.GetMtype() + params.SubId = int(subs.GetSubId()) + params.Xid = "" + params.Meid = subs.GetMeid() + params.Src = "" + params.PayloadLen = len(trans.Payload.Buf) + params.Payload = trans.Payload.Buf + params.Mbuf = nil + + return c.rmrSendRaw(desc, params) +} + +func (c *Control) rmrReplyToSender(desc string, subs *Subscription, trans *Transaction) (err error) { + params := &RMRParams{&xapp.RMRParams{}} + params.Mtype = trans.GetMtype() + params.SubId = int(subs.GetSubId()) + params.Xid = trans.GetXid() + params.Meid = trans.GetMeid() + params.Src = "" + params.PayloadLen = len(trans.Payload.Buf) + params.Payload = trans.Payload.Buf + params.Mbuf = nil + + return c.rmrSendRaw(desc, params) } -func (c *Control) Consume(msg *xapp.RMRParams) (err error) { +func (c *Control) Consume(params *xapp.RMRParams) (err error) { + xapp.Rmr.Free(params.Mbuf) + params.Mbuf = nil + msg := &RMRParams{params} + c.msgCounter++ switch msg.Mtype { case xapp.RICMessageTypes["RIC_SUB_REQ"]: go c.handleSubscriptionRequest(msg) @@ -146,472 +183,512 @@ func (c *Control) Consume(msg *xapp.RMRParams) (err error) { default: xapp.Logger.Info("Unknown Message Type '%d', discarding", msg.Mtype) } + return nil } -func (c *Control) handleSubscriptionRequest(params *xapp.RMRParams) { - xapp.Logger.Info("SubReq received from Src: %s, Mtype: %v, SubId: %v, Xid: %s, Meid: %v", params.Src, params.Mtype, params.SubId, params.Xid, params.Meid) - xapp.Rmr.Free(params.Mbuf) - params.Mbuf = nil +func (c *Control) handleSubscriptionRequest(params *RMRParams) { + xapp.Logger.Info("SubReq from xapp: %s", params.String()) + + // + // + // + trans, err := c.tracker.TrackTransaction(NewRmrEndpoint(params.Src), + params.Xid, + params.Meid, + false, + true) - /* Reserve a sequence number and set it in the payload */ - 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) + if err != nil { + xapp.Logger.Error("SubReq: %s, Dropping this msg. %s", err.Error(), params.String()) return } - err := c.e2ap.SetSubscriptionRequestSequenceNumber(params.Payload, newSubId) + // + // + // + trans.SubReqMsg, err = c.e2ap.UnpackSubscriptionRequest(params.Payload) 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: %s Dropping this msg. %s", err.Error(), trans) + trans.Release() return } - srcAddr, srcPort, err := c.rtmgrClient.SplitSource(params.Src) + // + // + // + subs, err := c.registry.ReserveSubscription(&trans.RmrEndpoint, trans.Meid) 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) + xapp.Logger.Error("SubReq: %s, Dropping this msg. %s", err.Error(), trans) + trans.Release() return } - /* Create transatcion records for every subscription request */ - xactKey := TransactionKey{newSubId, CREATE} - xactValue := Transaction{*srcAddr, *srcPort, params} - err = c.tracker.TrackTransaction(xactKey, xactValue) + err = subs.SetTransaction(trans) 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) + xapp.Logger.Error("SubReq: %s, Dropping this msg. %s", err.Error(), trans) + subs.Release() + trans.Release() return } - /* Update routing manager about the new subscription*/ - subRouteAction := SubRouteInfo{CREATE, *srcAddr, *srcPort, newSubId} - xapp.Logger.Info("SubReq: Starting routing manager update. SubId: %v, Xid: %s", params.SubId, params.Xid) + trans.SubReqMsg.RequestId.Seq = uint32(subs.GetSubId()) - err = c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) + // + // TODO: subscription create is in fact owned by subscription and not transaction. + // Transaction is toward xapp while Subscription is toward ran. + // In merge several xapps may wake transactions, while only one subscription + // toward ran occurs -> subscription owns subscription creation toward ran + // + // This is intermediate solution while improving message handling + // + trans.Mtype, trans.Payload, err = c.e2ap.PackSubscriptionRequest(trans.SubReqMsg) 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: %s for trans %s", err.Error(), trans) + subs.Release() + trans.Release() 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) - 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) - } - xapp.Logger.Debug("SubReq: Debugging transaction table = %v", c.tracker.transactionTable) + c.rmrSend("SubReq: SubReq to E2T", subs, trans) + + c.timerMap.StartTimer("RIC_SUB_REQ", int(subs.GetSubId()), subReqTime, FirstTry, c.handleSubscriptionRequestTimer) + xapp.Logger.Debug("SubReq: Debugging trans table = %v", c.tracker.transactionXappTable) return } -func (c *Control) handleSubscriptionResponse(params *xapp.RMRParams) { - xapp.Logger.Info("SubResp received from Src: %s, Mtype: %v, SubId: %v, Meid: %v", params.Src, params.Mtype, params.SubId, params.Meid) - xapp.Rmr.Free(params.Mbuf) - params.Mbuf = nil +func (c *Control) handleSubscriptionResponse(params *RMRParams) { + xapp.Logger.Info("SubResp from E2T: %s", params.String()) - payloadSeqNum, err := c.e2ap.GetSubscriptionResponseSequenceNumber(params.Payload) + // + // + // + SubRespMsg, err := c.e2ap.UnpackSubscriptionResponse(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: %s Dropping this msg. %s", err.Error(), params.String()) return } - xapp.Logger.Info("SubResp: Received payloadSeqNum: %v", payloadSeqNum) - if !c.registry.IsValidSequenceNumber(payloadSeqNum) { - xapp.Logger.Error("SubResp: Unknown payloadSeqNum. Dropping this msg. PayloadSeqNum: %v, SubId: %v", payloadSeqNum, params.SubId) - return + // + // + // + subs := c.registry.GetSubscription(uint16(SubRespMsg.RequestId.Seq)) + if subs == nil && params.SubId > 0 { + subs = c.registry.GetSubscription(uint16(params.SubId)) } - c.timerMap.StopTimer("RIC_SUB_REQ", int(payloadSeqNum)) + if subs == nil { + xapp.Logger.Error("SubResp: Not valid subscription found payloadSeqNum: %d, SubId: %d. Dropping this msg. %s", SubRespMsg.RequestId.Seq, params.SubId, params.String()) + return + } + xapp.Logger.Info("SubResp: subscription found payloadSeqNum: %d, SubId: %d", SubRespMsg.RequestId.Seq, subs.GetSubId()) - c.registry.setSubscriptionToConfirmed(payloadSeqNum) - var transaction Transaction - transaction, err = c.tracker.RetriveTransaction(payloadSeqNum, CREATE) - if err != nil { - xapp.Logger.Error("SubResp: Failed to retrive transaction record. Dropping this msg. Err: %v, SubId: %v", err, params.SubId) + // + // + // + trans := subs.GetTransaction() + if trans == nil { + xapp.Logger.Error("SubResp: Unknown trans. Dropping this msg. SubId: %d", subs.GetSubId()) return } - xapp.Logger.Info("SubResp: SubId: %v, from address: %v:%v. Retrieved old subId", int(payloadSeqNum), transaction.XappInstanceAddress, transaction.XappPort) - params.SubId = int(payloadSeqNum) - params.Xid = transaction.OrigParams.Xid + trans.SubRespMsg = SubRespMsg - xapp.Logger.Info("SubResp: Forwarding Subscription Response to xApp Mtype: %v, SubId: %v, Meid: %v", params.Mtype, params.SubId, params.Meid) - err = c.rmrReplyToSender(params) - if err != nil { - xapp.Logger.Error("SubResp: Failed to send response to xApp. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + // + // + // + c.timerMap.StopTimer("RIC_SUB_REQ", int(subs.GetSubId())) + + responseReceived := trans.CheckResponseReceived() + if responseReceived == true { + // Subscription timer already received + return } - 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) + trans.Mtype, trans.Payload, err = c.e2ap.PackSubscriptionResponse(trans.SubRespMsg) if err != nil { - xapp.Logger.Error("SubResp: Failed to delete transaction record. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + xapp.Logger.Error("SubResp: %s for trans %s", err.Error(), trans) + trans.Release() return } + + subs.Confirmed() + trans.Release() + c.rmrReplyToSender("SubResp: SubResp to xapp", subs, trans) return } -func (c *Control) handleSubscriptionFailure(params *xapp.RMRParams) { - xapp.Logger.Info("SubFail received from Src: %s, Mtype: %v, SubId: %v, Meid: %v", params.Src, params.Mtype, params.SubId, params.Meid) - xapp.Rmr.Free(params.Mbuf) - params.Mbuf = nil +func (c *Control) handleSubscriptionFailure(params *RMRParams) { + xapp.Logger.Info("SubFail from E2T: %s", params.String()) - payloadSeqNum, err := c.e2ap.GetSubscriptionFailureSequenceNumber(params.Payload) + // + // + // + SubFailMsg, err := c.e2ap.UnpackSubscriptionFailure(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: %s Dropping this msg. %s", err.Error(), params.String()) return } - xapp.Logger.Info("SubFail: Received payloadSeqNum: %v", payloadSeqNum) - c.timerMap.StopTimer("RIC_SUB_REQ", int(payloadSeqNum)) + // + // + // + subs := c.registry.GetSubscription(uint16(SubFailMsg.RequestId.Seq)) + if subs == nil && params.SubId > 0 { + subs = c.registry.GetSubscription(uint16(params.SubId)) + } - var transaction Transaction - transaction, err = c.tracker.RetriveTransaction(payloadSeqNum, CREATE) - if err != nil { - xapp.Logger.Error("SubFail: Failed to retrive transaction record. Dropping this msg. Err: %v, SubId: %v", err, params.SubId) + if subs == nil { + xapp.Logger.Error("SubFail: Not valid subscription found payloadSeqNum: %d, SubId: %d. Dropping this msg. %s", SubFailMsg.RequestId.Seq, params.SubId, params.String()) return } - xapp.Logger.Info("SubFail: SubId: %v, from address: %v:%v. Forwarding response to xApp", int(payloadSeqNum), transaction.XappInstanceAddress, transaction.XappPort) + xapp.Logger.Info("SubFail: subscription found payloadSeqNum: %d, SubId: %d", SubFailMsg.RequestId.Seq, subs.GetSubId()) - 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) + // + // + // + trans := subs.GetTransaction() + if trans == nil { + xapp.Logger.Error("SubFail: Unknown trans. Dropping this msg. SubId: %d", subs.GetSubId()) + return } + trans.SubFailMsg = SubFailMsg - time.Sleep(3 * time.Second) + // + // + // + c.timerMap.StopTimer("RIC_SUB_REQ", int(subs.GetSubId())) - 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) + responseReceived := trans.CheckResponseReceived() if err != nil { - xapp.Logger.Error("SubFail: Failed to update routing manager. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + return } - 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) - if err != nil { - xapp.Logger.Error("SubFail: Failed to delete transaction record. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) - return - } - } else { - xapp.Logger.Error("SubFail: Failed to release sequency number. SubId: %v, Xid: %s", params.SubId, params.Xid) + if responseReceived == true { + // Subscription timer already received return } + + trans.Mtype, trans.Payload, err = c.e2ap.PackSubscriptionFailure(trans.SubFailMsg) + if err == nil { + c.rmrReplyToSender("SubFail: SubFail to xapp", subs, trans) + time.Sleep(3 * time.Second) + } else { + //TODO error handling improvement + xapp.Logger.Error("SubFail: %s for trans %s (continuing cleaning)", err.Error(), trans) + } + + trans.Release() + subs.Release() 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) { + xapp.Logger.Info("SubReq timeout: subId: %v, tryCount: %v", nbrId, tryCount) -/* -func (c *Control) sendSubscriptionFailure(subId uint16, causeContent uint8, causeVal uint8) { + subs := c.registry.GetSubscription(uint16(nbrId)) + if subs == nil { + xapp.Logger.Error("SubReq timeout: Unknown payloadSeqNum. Dropping this msg. SubId: %v", nbrId) + return + } - transaction, err := c.tracker.completeTransaction(subId, CREATE) - if err != nil { - xapp.Logger.Error("SendSubFail: Failed to delete transaction record. Err:%v. SubId: %v", err, subId) + trans := subs.GetTransaction() + if trans == nil { + xapp.Logger.Error("SubReq timeout: Unknown trans. Dropping this msg. SubId: %v", subs.GetSubId()) 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 + responseReceived := trans.CheckResponseReceived() -// 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 responseReceived == true { + // Subscription Response or Failure already received + return + } - newPayload := []byte("40CA4018000003EA7E00050000010016EA6300020021EA74000200C0") // Temporary solution + if tryCount < maxSubReqTryCount { + xapp.Logger.Info("SubReq timeout: subs: %s trans: %s", subs, trans) - params.PayloadLen = len(newPayload) - params.Payload = newPayload + trans.RetryTransaction() - 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) - if err != nil { - xapp.Logger.Error("SendSubFail: Failed to send response to xApp. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + c.rmrSend("SubReq timeout: SubReq to E2T", subs, trans) + + tryCount++ + c.timerMap.StartTimer("RIC_SUB_REQ", int(subs.GetSubId()), subReqTime, tryCount, c.handleSubscriptionRequestTimer) + return } - time.Sleep(3 * time.Second) + // Release CREATE transaction + trans.Release() - xapp.Logger.Info("SendSubFail: SubId: %v, from address: %v:%v. Deleting transaction record", int(subId), transaction.XappInstanceAddress, transaction.XappPort) + // Create DELETE transaction (internal and no messages toward xapp) + deltrans, err := c.tracker.TrackTransaction(&trans.RmrEndpoint, + trans.GetXid(), + trans.GetMeid(), + false, + false) - 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) 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("SubReq timeout: %s, Dropping this msg.", err.Error()) + //TODO improve error handling. Important at least in merge + subs.Release() 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) + deltrans.SubDelReqMsg = &e2ap.E2APSubscriptionDeleteRequest{} + deltrans.SubDelReqMsg.RequestId.Id = trans.SubReqMsg.RequestId.Id + deltrans.SubDelReqMsg.RequestId.Seq = uint32(subs.GetSubId()) + deltrans.SubDelReqMsg.FunctionId = trans.SubReqMsg.FunctionId + deltrans.Mtype, deltrans.Payload, err = c.e2ap.PackSubscriptionDeleteRequest(deltrans.SubDelReqMsg) + if err != nil { + xapp.Logger.Error("SubReq timeout: Packing SubDelReq failed. Err: %v", err) + //TODO improve error handling. Important at least in merge + deltrans.Release() + subs.Release() + return } - return -} -*/ -func (act Action) String() string { - actions := [...]string{ - "CREATE", - "MERGE", - "NONE", - "DELETE", + err = subs.SetTransaction(deltrans) + if err != nil { + xapp.Logger.Error("SubReq timeout: %s, Dropping this msg.", err.Error()) + //TODO improve error handling. Important at least in merge + deltrans.Release() + return } - if act < CREATE || act > DELETE { - return "Unknown" - } - return actions[act] + c.rmrSend("SubReq timer: SubDelReq to E2T", subs, deltrans) + c.timerMap.StartTimer("RIC_SUB_DEL_REQ", int(subs.GetSubId()), subDelReqTime, FirstTry, c.handleSubscriptionDeleteRequestTimer) + return } -func (act Action) valid() bool { - switch act { - case CREATE, MERGE, DELETE: - return true - default: - return false - } -} +func (c *Control) handleSubscriptionDeleteRequest(params *RMRParams) { + xapp.Logger.Info("SubDelReq from xapp: %s", params.String()) -func (c *Control) handleSubscriptionDeleteRequest(params *xapp.RMRParams) { - xapp.Logger.Info("SubDelReq received from Src: %s, Mtype: %v, SubId: %v, Xid: %s, Meid: %v", params.Src, params.Mtype, params.SubId, params.Xid, params.Meid) - xapp.Rmr.Free(params.Mbuf) - params.Mbuf = nil + // + // + // + trans, err := c.tracker.TrackTransaction(NewRmrEndpoint(params.Src), + params.Xid, + params.Meid, + false, + true) - 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: %s, Dropping this msg. %s", err.Error(), params.String()) return } - xapp.Logger.Info("SubDelReq: Received payloadSeqNum: %v", payloadSeqNum) - if c.registry.IsValidSequenceNumber(payloadSeqNum) { - c.registry.deleteSubscription(payloadSeqNum) - err = c.trackDeleteTransaction(params, payloadSeqNum) - 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 - } - } else { - xapp.Logger.Error("SubDelReq: Not valid sequence number. Dropping this msg. SubId: %v, Xid: %s", params.SubId, params.Xid) + // + // + // + trans.SubDelReqMsg, err = c.e2ap.UnpackSubscriptionDeleteRequest(params.Payload) + if err != nil { + xapp.Logger.Error("SubDelReq: %s Dropping this msg. %s", err.Error(), trans) + trans.Release() + return + } + + // + // + // + subs := c.registry.GetSubscription(uint16(trans.SubDelReqMsg.RequestId.Seq)) + if subs == nil && params.SubId > 0 { + subs = c.registry.GetSubscription(uint16(params.SubId)) + } + + if subs == nil { + xapp.Logger.Error("SubDelReq: Not valid subscription found payloadSeqNum: %d, SubId: %d. Dropping this msg. %s", trans.SubDelReqMsg.RequestId.Seq, params.SubId, trans) + trans.Release() return } + xapp.Logger.Info("SubDelReq: subscription found payloadSeqNum: %d, SubId: %d. %s", trans.SubDelReqMsg.RequestId.Seq, params.SubId, trans) - xapp.Logger.Info("SubDelReq: Forwarding Request to E2T. Mtype: %v, SubId: %v, Xid: %s, Meid: %v", params.Mtype, params.SubId, params.Xid, params.Meid) - c.rmrSend(params) + err = subs.SetTransaction(trans) 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) + xapp.Logger.Error("SubDelReq: %s, Dropping this msg. %s", err.Error(), trans) + trans.Release() + return } - return -} -func (c *Control) trackDeleteTransaction(params *xapp.RMRParams, payloadSeqNum uint16) (err error) { - srcAddr, srcPort, err := c.rtmgrClient.SplitSource(params.Src) + // + // TODO: subscription delete is in fact owned by subscription and not transaction. + // Transaction is toward xapp while Subscription is toward ran. + // In merge several xapps may wake transactions, while only one subscription + // toward ran occurs -> subscription owns subscription creation toward ran + // + // This is intermediate solution while improving message handling + // + trans.Mtype, trans.Payload, err = c.e2ap.PackSubscriptionDeleteRequest(trans.SubDelReqMsg) 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("SubDelReq: %s for trans %s", err.Error(), trans) + trans.Release() + return } - xactKey := TransactionKey{payloadSeqNum, DELETE} - xactValue := Transaction{*srcAddr, *srcPort, params} - err = c.tracker.TrackTransaction(xactKey, xactValue) + + subs.UnConfirmed() + + c.rmrSend("SubDelReq: SubDelReq to E2T", subs, trans) + + c.timerMap.StartTimer("RIC_SUB_DEL_REQ", int(subs.GetSubId()), subDelReqTime, FirstTry, c.handleSubscriptionDeleteRequestTimer) return } -func (c *Control) handleSubscriptionDeleteResponse(params *xapp.RMRParams) (err error) { - xapp.Logger.Info("SubDelResp received from Src: %s, Mtype: %v, SubId: %v, Meid: %v", params.Src, params.Mtype, params.SubId, params.Meid) - xapp.Rmr.Free(params.Mbuf) - params.Mbuf = nil +func (c *Control) handleSubscriptionDeleteResponse(params *RMRParams) (err error) { + xapp.Logger.Info("SubDelResp from E2T:%s", params.String()) - payloadSeqNum, err := c.e2ap.GetSubscriptionDeleteResponseSequenceNumber(params.Payload) + // + // + // + SubDelRespMsg, err := c.e2ap.UnpackSubscriptionDeleteResponse(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: %s Dropping this msg. %s", err.Error(), params.String()) return } - xapp.Logger.Info("SubDelResp: Received payloadSeqNum: %v", payloadSeqNum) - c.timerMap.StopTimer("RIC_SUB_DEL_REQ", int(payloadSeqNum)) + // + // + // + subs := c.registry.GetSubscription(uint16(SubDelRespMsg.RequestId.Seq)) + if subs == nil && params.SubId > 0 { + subs = c.registry.GetSubscription(uint16(params.SubId)) + } - var transaction Transaction - transaction, err = c.tracker.RetriveTransaction(payloadSeqNum, DELETE) - if err != nil { - xapp.Logger.Error("SubDelResp: Failed to retrive transaction record. Dropping this msg. Err: %v, SubId: %v", err, params.SubId) + if subs == nil { + xapp.Logger.Error("SubDelResp: Not valid subscription found payloadSeqNum: %d, SubId: %d. Dropping this msg. %s", SubDelRespMsg.RequestId.Seq, params.SubId, params.String()) return } - xapp.Logger.Info("SubDelResp: SubId: %v, from address: %v:%v. Forwarding response to xApp", int(payloadSeqNum), transaction.XappInstanceAddress, transaction.XappPort) + xapp.Logger.Info("SubDelResp: subscription found payloadSeqNum: %d, SubId: %d", SubDelRespMsg.RequestId.Seq, subs.GetSubId()) - 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 + // + // + // + trans := subs.GetTransaction() + if trans == nil { + xapp.Logger.Error("SubDelResp: Unknown trans. Dropping this msg. SubId: %d", subs.GetSubId()) + return } - time.Sleep(3 * time.Second) + trans.SubDelRespMsg = SubDelRespMsg - 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 err != nil { - xapp.Logger.Error("SubDelResp: Failed to update routing manager. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) - return - } + // + // + // + c.timerMap.StopTimer("RIC_SUB_DEL_REQ", int(subs.GetSubId())) - 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) - if err != nil { - xapp.Logger.Error("SubDelResp: Failed to delete transaction record. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) - return - } - } else { - xapp.Logger.Error("SubDelResp: Failed to release sequency number. SubId: %v, Xid: %s", params.SubId, params.Xid) + responseReceived := trans.CheckResponseReceived() + if responseReceived == true { + // Subscription Delete timer already received return } + + c.sendSubscriptionDeleteResponse("SubDelResp", trans, subs) return } -func (c *Control) handleSubscriptionDeleteFailure(params *xapp.RMRParams) { - xapp.Logger.Info("SubDelFail received from Src: %s, Mtype: %v, SubId: %v, Meid: %v", params.Src, params.Mtype, params.SubId, params.Meid) - xapp.Rmr.Free(params.Mbuf) - params.Mbuf = nil +func (c *Control) handleSubscriptionDeleteFailure(params *RMRParams) { + xapp.Logger.Info("SubDelFail from E2T:%s", params.String()) - payloadSeqNum, err := c.e2ap.GetSubscriptionDeleteFailureSequenceNumber(params.Payload) + // + // + // + SubDelFailMsg, err := c.e2ap.UnpackSubscriptionDeleteFailure(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: %s Dropping this msg. %s", err.Error(), params.String()) return } - xapp.Logger.Info("SubDelFail: Received payloadSeqNum: %v", payloadSeqNum) - c.timerMap.StopTimer("RIC_SUB_DEL_REQ", int(payloadSeqNum)) + // + // + // + subs := c.registry.GetSubscription(uint16(SubDelFailMsg.RequestId.Seq)) + if subs == nil && params.SubId > 0 { + subs = c.registry.GetSubscription(uint16(params.SubId)) + } - var transaction Transaction - transaction, err = c.tracker.RetriveTransaction(payloadSeqNum, DELETE) - if err != nil { - xapp.Logger.Error("SubDelFail: Failed to retrive transaction record. Dropping msg. Err %v, SubId: %v", err, params.SubId) + if subs == nil { + xapp.Logger.Error("SubDelFail: Not valid subscription found payloadSeqNum: %d, SubId: %d. Dropping this msg. %s", SubDelFailMsg.RequestId.Seq, params.SubId, params.String()) return } - xapp.Logger.Info("SubDelFail: SubId: %v, from address: %v:%v. Forwarding response to xApp", int(payloadSeqNum), transaction.XappInstanceAddress, transaction.XappPort) + xapp.Logger.Info("SubDelFail: subscription found payloadSeqNum: %d, SubId: %d", SubDelFailMsg.RequestId.Seq, subs.GetSubId()) - 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 + // + // + // + trans := subs.GetTransaction() + if trans == nil { + xapp.Logger.Error("SubDelFail: Unknown trans. Dropping this msg. SubId: %d", subs.GetSubId()) + return } + trans.SubDelFailMsg = SubDelFailMsg - time.Sleep(3 * time.Second) + // + // + // + c.timerMap.StopTimer("RIC_SUB_DEL_REQ", int(subs.GetSubId())) - 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 err != nil { - xapp.Logger.Error("SubDelFail: Failed to update routing manager. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + responseReceived := trans.CheckResponseReceived() + if responseReceived == true { + // Subscription Delete timer already received 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) - if err != nil { - xapp.Logger.Error("SubDelFail: Failed to delete transaction record. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) - return - } - } else { - xapp.Logger.Error("SubDelFail: Failed to release sequency number. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) - return - } + c.sendSubscriptionDeleteResponse("SubDelFail", trans, subs) 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) { + xapp.Logger.Info("SubDelReq timeout: subId: %v, tryCount: %v", nbrId, tryCount) -/* -func (c *Control) sendSubscriptionDeleteFailure(subId uint16, causeContent uint8, causeVal uint8) { - transaction, err := c.tracker.completeTransaction(subId, DELETE) - if err != nil { - xapp.Logger.Error("SendSubDelFail: Failed to delete transaction record. Err: %v, newSubId: %v", err, subId) + subs := c.registry.GetSubscription(uint16(nbrId)) + if subs == nil { + xapp.Logger.Error("SubDelReq timeout: Unknown payloadSeqNum. Dropping this msg. SubId: %v", nbrId) 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 -// } - - newPayload := []byte("40CA4018000003EA7E00050000010016EA6300020021EA74000200C0") // Temporary solution - - params.PayloadLen = len(newPayload) - params.Payload = newPayload - - 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) + trans := subs.GetTransaction() + if trans == nil { + xapp.Logger.Error("SubDelReq timeout: Unknown trans. Dropping this msg. SubId: %v", subs.GetSubId()) + return } - time.Sleep(3 * time.Second) - - xapp.Logger.Info("SendSubDelFail: SubId: %v, from address: %v:%v. Deleting transaction record", int(subId), transaction.XappInstanceAddress, transaction.XappPort) + responseReceived := trans.CheckResponseReceived() + if responseReceived == true { + // Subscription Delete Response or Failure already received + return + } - xapp.Logger.Info("SendSubDelFail: 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) - if err != nil { - xapp.Logger.Error("SendSubDelFail: Failed to update routing manager. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + if tryCount < maxSubDelReqTryCount { + // Set possible to handle new response for the subId + trans.RetryTransaction() + c.rmrSend("SubDelReq timeout: SubDelReq to E2T", subs, trans) + tryCount++ + c.timerMap.StartTimer("RIC_SUB_DEL_REQ", int(subs.GetSubId()), subReqTime, tryCount, c.handleSubscriptionDeleteRequestTimer) return } - xapp.Logger.Info("SendSubDelFail: Deleting transaction record. SubId: %v, Xid: %s", params.SubId, params.Xid) - if c.registry.releaseSequenceNumber(subId) { - transaction, 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) - return + c.sendSubscriptionDeleteResponse("SubDelReq(timer)", trans, subs) + return +} + +func (c *Control) sendSubscriptionDeleteResponse(desc string, trans *Transaction, subs *Subscription) { + + if trans.ForwardRespToXapp == true { + //Always generate SubDelResp + trans.SubDelRespMsg = &e2ap.E2APSubscriptionDeleteResponse{} + trans.SubDelRespMsg.RequestId.Id = trans.SubDelReqMsg.RequestId.Id + trans.SubDelRespMsg.RequestId.Seq = uint32(subs.GetSubId()) + trans.SubDelRespMsg.FunctionId = trans.SubDelReqMsg.FunctionId + + var err error + trans.Mtype, trans.Payload, err = c.e2ap.PackSubscriptionDeleteResponse(trans.SubDelRespMsg) + if err == nil { + c.rmrReplyToSender(desc+": SubDelResp to xapp", subs, trans) + time.Sleep(3 * time.Second) + } else { + //TODO error handling improvement + xapp.Logger.Error("%s: %s for trans %s (continuing cleaning)", desc, err.Error(), trans) } - } else { - xapp.Logger.Error("SendSubDelFail: Failed to release sequency number. SubId: %v, Xid: %s", params.SubId, params.Xid) } - return + + trans.Release() + subs.Release() } -*/