Fixed function id handling and improved ut fail handling
[ric-plt/submgr.git] / pkg / control / control.go
index 614ac9b..c2b33b7 100755 (executable)
@@ -23,12 +23,10 @@ import (
        "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"
        httptransport "github.com/go-openapi/runtime/client"
        "github.com/go-openapi/strfmt"
        "github.com/spf13/viper"
-       "math/rand"
        "sync"
        "time"
 )
@@ -37,10 +35,12 @@ import (
 //
 //-----------------------------------------------------------------------------
 
-var subReqTime 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
+var e2tSubReqTimeout time.Duration = 5 * time.Second
+var e2tSubDelReqTime time.Duration = 5 * time.Second
+var e2tMaxSubReqTryCount uint64 = 2    // Initial try + retry
+var e2tMaxSubDelReqTryCount uint64 = 2 // Initial try + retry
+
+var e2tRecvMsgTimeout time.Duration = 5 * time.Second
 
 type Control struct {
        e2ap         *E2ap
@@ -57,11 +57,9 @@ type RMRMeid struct {
        RanName string
 }
 
-var seedSN uint16
-
 const (
        CREATE Action = 0
-       MERGE  Action = 1
+       UPDATE Action = 1
        NONE   Action = 2
        DELETE Action = 3
 )
@@ -71,27 +69,15 @@ func init() {
        viper.AutomaticEnv()
        viper.SetEnvPrefix("submgr")
        viper.AllowEmptyEnv(true)
-       seedSN = uint16(viper.GetInt("seed_sn"))
-       if seedSN == 0 {
-               rand.Seed(time.Now().UnixNano())
-               seedSN = uint16(rand.Intn(65535))
-       }
-       if seedSN > 65535 {
-               seedSN = 0
-       }
-       xapp.Logger.Info("SUBMGR: Initial Sequence Number: %v", seedSN)
 }
 
 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}
+       rtmgrClient := RtmgrClient{rtClient: rtmgrclient.New(transport, strfmt.Default)}
 
        registry := new(Registry)
-       registry.Initialize(seedSN)
+       registry.Initialize()
        registry.rtmgrClient = &rtmgrClient
 
        tracker := new(Tracker)
@@ -134,29 +120,29 @@ func (c *Control) rmrSendRaw(desc string, params *RMRParams) (err error) {
        return
 }
 
-func (c *Control) rmrSend(desc string, subs *Subscription, trans *Transaction, payload []byte, payloadLen int) (err error) {
+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 = payloadLen
-       params.Payload = payload
+       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, mType int, payload []byte, payloadLen int) (err error) {
+func (c *Control) rmrReplyToSender(desc string, subs *Subscription, trans *Transaction) (err error) {
        params := &RMRParams{&xapp.RMRParams{}}
-       params.Mtype = mType
+       params.Mtype = trans.GetMtype()
        params.SubId = int(subs.GetSubId())
        params.Xid = trans.GetXid()
        params.Meid = trans.GetMeid()
        params.Src = ""
-       params.PayloadLen = payloadLen
-       params.Payload = payload
+       params.PayloadLen = len(trans.Payload.Buf)
+       params.Payload = trans.Payload.Buf
        params.Mbuf = nil
 
        return c.rmrSendRaw(desc, params)
@@ -169,547 +155,402 @@ func (c *Control) Consume(params *xapp.RMRParams) (err error) {
        c.msgCounter++
        switch msg.Mtype {
        case xapp.RICMessageTypes["RIC_SUB_REQ"]:
-               go c.handleSubscriptionRequest(msg)
+               go c.handleXAPPSubscriptionRequest(msg)
        case xapp.RICMessageTypes["RIC_SUB_RESP"]:
-               go c.handleSubscriptionResponse(msg)
+               go c.handleE2TSubscriptionResponse(msg)
        case xapp.RICMessageTypes["RIC_SUB_FAILURE"]:
-               go c.handleSubscriptionFailure(msg)
+               go c.handleE2TSubscriptionFailure(msg)
        case xapp.RICMessageTypes["RIC_SUB_DEL_REQ"]:
-               go c.handleSubscriptionDeleteRequest(msg)
+               go c.handleXAPPSubscriptionDeleteRequest(msg)
        case xapp.RICMessageTypes["RIC_SUB_DEL_RESP"]:
-               go c.handleSubscriptionDeleteResponse(msg)
+               go c.handleE2TSubscriptionDeleteResponse(msg)
        case xapp.RICMessageTypes["RIC_SUB_DEL_FAILURE"]:
-               go c.handleSubscriptionDeleteFailure(msg)
+               go c.handleE2TSubscriptionDeleteFailure(msg)
        default:
                xapp.Logger.Info("Unknown Message Type '%d', discarding", msg.Mtype)
        }
 
        return 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.Mtype,
-               params.Xid,
-               params.Meid,
-               false,
-               true)
-
-       if err != nil {
-               xapp.Logger.Error("SubReq: %s, Dropping this msg. %s", err.Error(), params.String())
-               return
+func idstring(trans fmt.Stringer, subs fmt.Stringer, err error) string {
+       var retval string = ""
+       var filler string = ""
+       if trans != nil {
+               retval += filler + trans.String()
+               filler = " "
        }
-
-       //
-       //
-       //
-       trans.SubReqMsg, err = c.e2ap.UnpackSubscriptionRequest(params.Payload)
-       if err != nil {
-               xapp.Logger.Error("SubReq: %s Dropping this msg. %s", err.Error(), trans)
-               trans.Release()
-               return
+       if subs != nil {
+               retval += filler + subs.String()
+               filler = " "
        }
-
-       //
-       //
-       //
-       subs, err := c.registry.ReserveSubscription(&trans.RmrEndpoint, trans.Meid)
        if err != nil {
-               xapp.Logger.Error("SubReq: %s, Dropping this msg. %s", err.Error(), trans)
-               trans.Release()
-               return
-       }
+               retval += filler + "err(" + err.Error() + ")"
+               filler = " "
 
-       err = subs.SetTransaction(trans)
-       if err != nil {
-               xapp.Logger.Error("SubReq: %s, Dropping this msg. %s", err.Error(), trans)
-               subs.Release()
-               trans.Release()
-               return
        }
+       return retval
+}
 
-       trans.SubReqMsg.RequestId.Seq = uint32(subs.GetSubId())
+//-------------------------------------------------------------------
+// handle from XAPP Subscription Request
+//------------------------------------------------------------------
+func (c *Control) handleXAPPSubscriptionRequest(params *RMRParams) {
+       xapp.Logger.Info("XAPP-SubReq from xapp: %s", params.String())
 
-       //
-       // 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
-       //
-       packedData, err := c.e2ap.PackSubscriptionRequest(trans.SubReqMsg)
+       subReqMsg, err := c.e2ap.UnpackSubscriptionRequest(params.Payload)
        if err != nil {
-               xapp.Logger.Error("SubReq: %s for trans %s", err.Error(), trans)
-               subs.Release()
-               trans.Release()
+               xapp.Logger.Error("XAPP-SubReq: %s", idstring(params, nil, err))
                return
        }
 
-       //Optimize and store packed message to be sent (for retransmission). Again owned by subscription?
-       trans.Payload = packedData.Buf
-       trans.PayloadLen = len(packedData.Buf)
-
-       c.rmrSend("SubReq: SubReq to E2T", subs, trans, trans.Payload, trans.PayloadLen)
-
-       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 *RMRParams) {
-       xapp.Logger.Info("SubResp from E2T: %s", params.String())
-
-       //
-       //
-       //
-       SubRespMsg, err := c.e2ap.UnpackSubscriptionResponse(params.Payload)
+       trans, err := c.tracker.TrackTransaction(NewRmrEndpoint(params.Src), params.Xid, params.Meid)
        if err != nil {
-               xapp.Logger.Error("SubDelReq: %s Dropping this msg. %s", err.Error(), params.String())
+               xapp.Logger.Error("XAPP-SubReq: %s", idstring(params, nil, err))
                return
        }
+       defer trans.Release()
 
-       //
-       //
-       //
-       subs := c.registry.GetSubscription(uint16(SubRespMsg.RequestId.Seq))
-       if subs == nil && params.SubId > 0 {
-               subs = c.registry.GetSubscription(uint16(params.SubId))
-       }
-
-       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())
+       subs, err := c.registry.AssignToSubscription(trans, subReqMsg)
+       if err != nil {
+               xapp.Logger.Error("XAPP-SubReq: %s", idstring(trans, nil, err))
                return
        }
-       xapp.Logger.Info("SubResp: subscription found payloadSeqNum: %d, SubId: %d", SubRespMsg.RequestId.Seq, subs.GetSubId())
 
-       //
-       //
-       //
-       trans := subs.GetTransaction()
-       if trans == nil {
-               xapp.Logger.Error("SubResp: Unknown trans. Dropping this msg. SubId: %d", subs.GetSubId())
+       if subs.IsTransactionReserved() {
+               err := fmt.Errorf("Currently parallel or queued transactions are not allowed")
+               xapp.Logger.Error("XAPP-SubReq: %s", idstring(trans, subs, err))
                return
        }
 
-       trans.SubRespMsg = SubRespMsg
-
        //
+       // Wake subs request
        //
-       //
-       c.timerMap.StopTimer("RIC_SUB_REQ", int(subs.GetSubId()))
+       go c.handleSubscriptionCreate(subs, trans)
+       event, _ := trans.WaitEvent(0) //blocked wait as timeout is handled in subs side
 
-       responseReceived := trans.CheckResponseReceived()
-       if responseReceived == true {
-               // Subscription timer already received
-               return
-       }
-
-       packedData, err := c.e2ap.PackSubscriptionResponse(trans.SubRespMsg)
-       if err != nil {
-               xapp.Logger.Error("SubResp: %s for trans %s", err.Error(), trans)
-               trans.Release()
-               return
+       err = nil
+       if event != nil {
+               switch themsg := event.(type) {
+               case *e2ap.E2APSubscriptionResponse:
+                       trans.Mtype, trans.Payload, err = c.e2ap.PackSubscriptionResponse(themsg)
+                       if err == nil {
+                               c.rmrReplyToSender("XAPP-SubReq: SubResp to xapp", subs, trans)
+                               return
+                       }
+               case *e2ap.E2APSubscriptionFailure:
+                       trans.Mtype, trans.Payload, err = c.e2ap.PackSubscriptionFailure(themsg)
+                       if err == nil {
+                               c.rmrReplyToSender("XAPP-SubReq: SubFail to xapp", subs, trans)
+                       }
+                       return
+               default:
+                       break
+               }
        }
-
-       //Optimize and store packed message to be sent.
-       trans.Payload = packedData.Buf
-       trans.PayloadLen = len(packedData.Buf)
-
-       subs.Confirmed()
-       trans.Release()
-       c.rmrReplyToSender("SubResp: SubResp to xapp", subs, trans, 12011, trans.Payload, trans.PayloadLen)
-       return
+       xapp.Logger.Info("XAPP-SubReq: failed %s", idstring(trans, subs, err))
 }
 
-func (c *Control) handleSubscriptionFailure(params *RMRParams) {
-       xapp.Logger.Info("SubFail from E2T: %s", params.String())
+//-------------------------------------------------------------------
+// handle from XAPP Subscription Delete Request
+//------------------------------------------------------------------
+func (c *Control) handleXAPPSubscriptionDeleteRequest(params *RMRParams) {
+       xapp.Logger.Info("XAPP-SubDelReq from xapp: %s", params.String())
 
-       //
-       //
-       //
-       SubFailMsg, err := c.e2ap.UnpackSubscriptionFailure(params.Payload)
+       subDelReqMsg, err := c.e2ap.UnpackSubscriptionDeleteRequest(params.Payload)
        if err != nil {
-               xapp.Logger.Error("SubFail: %s Dropping this msg. %s", err.Error(), params.String())
+               xapp.Logger.Error("XAPP-SubDelReq %s", idstring(params, nil, err))
                return
        }
 
-       //
-       //
-       //
-       subs := c.registry.GetSubscription(uint16(SubFailMsg.RequestId.Seq))
-       if subs == nil && params.SubId > 0 {
-               subs = c.registry.GetSubscription(uint16(params.SubId))
+       trans, err := c.tracker.TrackTransaction(NewRmrEndpoint(params.Src), params.Xid, params.Meid)
+       if err != nil {
+               xapp.Logger.Error("XAPP-SubDelReq %s", idstring(params, nil, err))
+               return
        }
+       defer trans.Release()
 
-       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())
+       subs, err := c.registry.GetSubscriptionFirstMatch([]uint16{uint16(subDelReqMsg.RequestId.Seq), uint16(params.SubId)})
+       if err != nil {
+               xapp.Logger.Error("XAPP-SubDelReq: %s", idstring(trans, nil, err))
                return
        }
-       xapp.Logger.Info("SubFail: subscription found payloadSeqNum: %d, SubId: %d", SubFailMsg.RequestId.Seq, subs.GetSubId())
 
-       //
-       //
-       //
-       trans := subs.GetTransaction()
-       if trans == nil {
-               xapp.Logger.Error("SubFail: Unknown trans. Dropping this msg. SubId: %d", subs.GetSubId())
+       if subs.IsTransactionReserved() {
+               err := fmt.Errorf("Currently parallel or queued transactions are not allowed")
+               xapp.Logger.Error("XAPP-SubDelReq: %s", idstring(trans, subs, err))
                return
        }
-       trans.SubFailMsg = SubFailMsg
 
        //
+       // Wake subs delete
        //
-       //
-       c.timerMap.StopTimer("RIC_SUB_REQ", int(subs.GetSubId()))
-
-       responseReceived := trans.CheckResponseReceived()
-       if err != nil {
-               return
-       }
+       go c.handleSubscriptionDelete(subs, trans)
+       trans.WaitEvent(0) //blocked wait as timeout is handled in subs side
 
-       if responseReceived == true {
-               // Subscription timer already received
-               return
-       }
-
-       packedData, err := c.e2ap.PackSubscriptionFailure(trans.SubFailMsg)
+       // Whatever is received send ok delete response
+       subDelRespMsg := &e2ap.E2APSubscriptionDeleteResponse{}
+       subDelRespMsg.RequestId.Id = subs.SubReqMsg.RequestId.Id
+       subDelRespMsg.RequestId.Seq = uint32(subs.GetSubId())
+       subDelRespMsg.FunctionId = subs.SubReqMsg.FunctionId
+       trans.Mtype, trans.Payload, err = c.e2ap.PackSubscriptionDeleteResponse(subDelRespMsg)
        if err == nil {
-               //Optimize and store packed message to be sent.
-               trans.Payload = packedData.Buf
-               trans.PayloadLen = len(packedData.Buf)
-               c.rmrReplyToSender("SubFail: SubFail to xapp", subs, trans, 12012, trans.Payload, trans.PayloadLen)
-               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
+               c.rmrReplyToSender("XAPP-SubDelReq: SubDelResp to xapp", subs, trans)
+       }
 }
 
-func (c *Control) handleSubscriptionRequestTimer(strId string, nbrId int, tryCount uint64) {
-       xapp.Logger.Info("SubReq timeout: subId: %v,  tryCount: %v", nbrId, tryCount)
+//-------------------------------------------------------------------
+// SUBS CREATE Handling
+//-------------------------------------------------------------------
+func (c *Control) handleSubscriptionCreate(subs *Subscription, parentTrans *Transaction) {
 
-       subs := c.registry.GetSubscription(uint16(nbrId))
-       if subs == nil {
-               xapp.Logger.Error("SubReq timeout: Unknown payloadSeqNum. Dropping this msg. SubId: %v", nbrId)
-               return
-       }
+       trans := c.tracker.NewTransaction(subs.GetMeid())
+       subs.WaitTransactionTurn(trans)
+       defer subs.ReleaseTransactionTurn(trans)
+       defer trans.Release()
 
-       trans := subs.GetTransaction()
-       if trans == nil {
-               xapp.Logger.Error("SubReq timeout: Unknown trans. Dropping this msg. SubId: %v", subs.GetSubId())
+       xapp.Logger.Debug("SUBS-SubReq: Handling %s parent %s", idstring(trans, subs, nil), parentTrans.String())
+
+       if subs.SubRespMsg != nil {
+               xapp.Logger.Debug("SUBS-SubReq: Handling (immediate response) %s parent %s", idstring(nil, subs, nil), parentTrans.String())
+               parentTrans.SendEvent(subs.SubRespMsg, 0)
                return
        }
 
-       responseReceived := trans.CheckResponseReceived()
-
-       if responseReceived == true {
-               // Subscription Response or Failure already received
+       event := c.sendE2TSubscriptionRequest(subs, trans, parentTrans)
+       switch themsg := event.(type) {
+       case *e2ap.E2APSubscriptionResponse:
+               subs.SubRespMsg = themsg
+               parentTrans.SendEvent(event, 0)
                return
+       case *e2ap.E2APSubscriptionFailure:
+               //TODO: Possible delete and one retry for subs req
+               parentTrans.SendEvent(event, 0)
+       default:
+               xapp.Logger.Info("SUBS-SubReq: internal delete due event(%s) %s", typeofSubsMessage(event), idstring(trans, subs, nil))
+               c.sendE2TSubscriptionDeleteRequest(subs, trans, parentTrans)
+               parentTrans.SendEvent(nil, 0)
        }
 
-       if tryCount < maxSubReqTryCount {
-               xapp.Logger.Info("SubReq timeout: Resending SubReq to E2T: Mtype: %v, SubId: %v, Xid %s, Meid %v", trans.GetMtype(), subs.GetSubId(), trans.GetXid(), trans.GetMeid())
-
-               trans.RetryTransaction()
+       go c.registry.RemoveFromSubscription(subs, parentTrans, 5*time.Second)
+}
 
-               c.rmrSend("SubReq timeout: SubReq to E2T", subs, trans, trans.Payload, trans.PayloadLen)
+//-------------------------------------------------------------------
+// SUBS DELETE Handling
+//-------------------------------------------------------------------
+func (c *Control) handleSubscriptionDelete(subs *Subscription, parentTrans *Transaction) {
 
-               tryCount++
-               c.timerMap.StartTimer("RIC_SUB_REQ", int(subs.GetSubId()), subReqTime, tryCount, c.handleSubscriptionRequestTimer)
-               return
-       }
+       trans := c.tracker.NewTransaction(subs.GetMeid())
+       subs.WaitTransactionTurn(trans)
+       defer subs.ReleaseTransactionTurn(trans)
+       defer trans.Release()
 
-       // Release CREATE transaction
-       trans.Release()
+       xapp.Logger.Debug("SUBS-SubDelReq: Handling %s parent %s", idstring(trans, subs, nil), parentTrans.String())
 
-       // Create DELETE transaction (internal and no messages toward xapp)
-       deltrans, err := c.tracker.TrackTransaction(&trans.RmrEndpoint,
-               12020, // RIC SUBSCRIPTION DELETE
-               trans.GetXid(),
-               trans.GetMeid(),
-               false,
-               false)
+       event := c.sendE2TSubscriptionDeleteRequest(subs, trans, parentTrans)
 
-       if err != nil {
-               xapp.Logger.Error("SubReq timeout: %s, Dropping this msg.", err.Error())
-               //TODO improve error handling. Important at least in merge
-               subs.Release()
-               return
-       }
+       parentTrans.SendEvent(event, 0)
+       go c.registry.RemoveFromSubscription(subs, parentTrans, 5*time.Second)
+}
 
-       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
-       packedData, err := c.e2ap.PackSubscriptionDeleteRequest(deltrans.SubDelReqMsg)
+//-------------------------------------------------------------------
+// send to E2T Subscription Request
+//-------------------------------------------------------------------
+func (c *Control) sendE2TSubscriptionRequest(subs *Subscription, trans *Transaction, parentTrans *Transaction) interface{} {
+       var err error
+       var event interface{} = nil
+       var timedOut bool = false
+
+       subReqMsg := subs.SubReqMsg
+       subReqMsg.RequestId.Id = 123
+       subReqMsg.RequestId.Seq = uint32(subs.GetSubId())
+       trans.Mtype, trans.Payload, err = c.e2ap.PackSubscriptionRequest(subReqMsg)
        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
+               xapp.Logger.Error("SUBS-SubReq: %s parent %s", idstring(trans, subs, err), parentTrans.String())
+               return event
        }
-       deltrans.PayloadLen = len(packedData.Buf)
-       deltrans.Payload = packedData.Buf
 
-       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
+       for retries := uint64(0); retries < e2tMaxSubReqTryCount; retries++ {
+               desc := fmt.Sprintf("SUBS-SubReq: SubReq to E2T (retry %d)", retries)
+               c.rmrSend(desc, subs, trans)
+               event, timedOut = trans.WaitEvent(e2tSubReqTimeout)
+               if timedOut {
+                       continue
+               }
+               break
        }
-
-       c.rmrSend("SubReq timer: SubDelReq to E2T", subs, deltrans, deltrans.Payload, deltrans.PayloadLen)
-       c.timerMap.StartTimer("RIC_SUB_DEL_REQ", int(subs.GetSubId()), subDelReqTime, FirstTry, c.handleSubscriptionDeleteRequestTimer)
-       return
+       xapp.Logger.Debug("SUBS-SubReq: Response handling event(%s) %s parent %s", typeofSubsMessage(event), idstring(trans, subs, nil), parentTrans.String())
+       return event
 }
 
-func (c *Control) handleSubscriptionDeleteRequest(params *RMRParams) {
-       xapp.Logger.Info("SubDelReq from xapp: %s", params.String())
+//-------------------------------------------------------------------
+// send to E2T Subscription Delete Request
+//-------------------------------------------------------------------
 
-       //
-       //
-       //
-       trans, err := c.tracker.TrackTransaction(NewRmrEndpoint(params.Src),
-               params.Mtype,
-               params.Xid,
-               params.Meid,
-               false,
-               true)
+func (c *Control) sendE2TSubscriptionDeleteRequest(subs *Subscription, trans *Transaction, parentTrans *Transaction) interface{} {
+       var err error
+       var event interface{}
+       var timedOut bool
 
+       subDelReqMsg := &e2ap.E2APSubscriptionDeleteRequest{}
+       subDelReqMsg.RequestId.Id = 123
+       subDelReqMsg.RequestId.Seq = uint32(subs.GetSubId())
+       subDelReqMsg.FunctionId = subs.SubReqMsg.FunctionId
+       trans.Mtype, trans.Payload, err = c.e2ap.PackSubscriptionDeleteRequest(subDelReqMsg)
        if err != nil {
-               xapp.Logger.Error("SubDelReq: %s, Dropping this msg. %s", err.Error(), params.String())
-               return
+               xapp.Logger.Error("SUBS-SubDelReq: %s parent %s", idstring(trans, subs, err), parentTrans.String())
+               return event
        }
 
-       //
-       //
-       //
-       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))
+       for retries := uint64(0); retries < e2tMaxSubDelReqTryCount; retries++ {
+               desc := fmt.Sprintf("SUBS-SubDelReq: SubDelReq to E2T (retry %d)", retries)
+               c.rmrSend(desc, subs, trans)
+               event, timedOut = trans.WaitEvent(e2tSubDelReqTime)
+               if timedOut {
+                       continue
+               }
+               break
        }
+       xapp.Logger.Debug("SUBS-SubDelReq: Response handling event(%s) %s parent %s", typeofSubsMessage(event), idstring(trans, subs, nil), parentTrans.String())
+       return event
+}
 
-       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()
+//-------------------------------------------------------------------
+// handle from E2T Subscription Reponse
+//-------------------------------------------------------------------
+func (c *Control) handleE2TSubscriptionResponse(params *RMRParams) {
+       xapp.Logger.Info("MSG-SubResp from E2T: %s", params.String())
+       subRespMsg, err := c.e2ap.UnpackSubscriptionResponse(params.Payload)
+       if err != nil {
+               xapp.Logger.Error("MSG-SubResp %s", idstring(params, nil, err))
                return
        }
-       xapp.Logger.Info("SubDelReq: subscription found payloadSeqNum: %d, SubId: %d. %s", trans.SubDelReqMsg.RequestId.Seq, params.SubId, trans)
-
-       err = subs.SetTransaction(trans)
+       subs, err := c.registry.GetSubscriptionFirstMatch([]uint16{uint16(subRespMsg.RequestId.Seq), uint16(params.SubId)})
        if err != nil {
-               xapp.Logger.Error("SubDelReq: %s, Dropping this msg. %s", err.Error(), trans)
-               trans.Release()
+               xapp.Logger.Error("MSG-SubResp: %s", idstring(params, nil, err))
                return
        }
-
-       //
-       // 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
-       //
-       packedData, err := c.e2ap.PackSubscriptionDeleteRequest(trans.SubDelReqMsg)
-       if err != nil {
-               xapp.Logger.Error("SubDelReq: %s for trans %s", err.Error(), trans)
-               trans.Release()
+       trans := subs.GetTransaction()
+       if trans == nil {
+               err = fmt.Errorf("Ongoing transaction not found")
+               xapp.Logger.Error("MSG-SubResp: %s", idstring(params, subs, err))
                return
        }
-
-       //Optimize and store packed message to be sent (for retransmission). Again owned by subscription?
-       trans.Payload = packedData.Buf
-       trans.PayloadLen = len(packedData.Buf)
-
-       subs.UnConfirmed()
-
-       c.rmrSend("SubDelReq: SubDelReq to E2T", subs, trans, trans.Payload, trans.PayloadLen)
-
-       c.timerMap.StartTimer("RIC_SUB_DEL_REQ", int(subs.GetSubId()), subDelReqTime, FirstTry, c.handleSubscriptionDeleteRequestTimer)
+       sendOk, timedOut := trans.SendEvent(subRespMsg, e2tRecvMsgTimeout)
+       if sendOk == false {
+               err = fmt.Errorf("Passing event to transaction failed: sendOk(%t) timedOut(%t)", sendOk, timedOut)
+               xapp.Logger.Error("MSG-SubResp: %s", idstring(trans, subs, err))
+       }
        return
 }
 
-func (c *Control) handleSubscriptionDeleteResponse(params *RMRParams) (err error) {
-       xapp.Logger.Info("SubDelResp from E2T:%s", params.String())
-
-       //
-       //
-       //
-       SubDelRespMsg, err := c.e2ap.UnpackSubscriptionDeleteResponse(params.Payload)
+//-------------------------------------------------------------------
+// handle from E2T Subscription Failure
+//-------------------------------------------------------------------
+func (c *Control) handleE2TSubscriptionFailure(params *RMRParams) {
+       xapp.Logger.Info("MSG-SubFail from E2T: %s", params.String())
+       subFailMsg, err := c.e2ap.UnpackSubscriptionFailure(params.Payload)
        if err != nil {
-               xapp.Logger.Error("SubDelResp: %s Dropping this msg. %s", err.Error(), params.String())
+               xapp.Logger.Error("MSG-SubFail %s", idstring(params, nil, err))
                return
        }
-
-       //
-       //
-       //
-       subs := c.registry.GetSubscription(uint16(SubDelRespMsg.RequestId.Seq))
-       if subs == nil && params.SubId > 0 {
-               subs = c.registry.GetSubscription(uint16(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())
+       subs, err := c.registry.GetSubscriptionFirstMatch([]uint16{uint16(subFailMsg.RequestId.Seq), uint16(params.SubId)})
+       if err != nil {
+               xapp.Logger.Error("MSG-SubFail: %s", idstring(params, nil, err))
                return
        }
-       xapp.Logger.Info("SubDelResp: subscription found payloadSeqNum: %d, SubId: %d", SubDelRespMsg.RequestId.Seq, subs.GetSubId())
-
-       //
-       //
-       //
        trans := subs.GetTransaction()
        if trans == nil {
-               xapp.Logger.Error("SubDelResp: Unknown trans. Dropping this msg. SubId: %d", subs.GetSubId())
+               err = fmt.Errorf("Ongoing transaction not found")
+               xapp.Logger.Error("MSG-SubFail: %s", idstring(params, subs, err))
                return
        }
-
-       trans.SubDelRespMsg = SubDelRespMsg
-
-       //
-       //
-       //
-       c.timerMap.StopTimer("RIC_SUB_DEL_REQ", int(subs.GetSubId()))
-
-       responseReceived := trans.CheckResponseReceived()
-       if responseReceived == true {
-               // Subscription Delete timer already received
-               return
+       sendOk, timedOut := trans.SendEvent(subFailMsg, e2tRecvMsgTimeout)
+       if sendOk == false {
+               err = fmt.Errorf("Passing event to transaction failed: sendOk(%t) timedOut(%t)", sendOk, timedOut)
+               xapp.Logger.Error("MSG-SubFail: %s", idstring(trans, subs, err))
        }
-
-       c.sendSubscriptionDeleteResponse("SubDelResp", trans, subs)
        return
 }
 
-func (c *Control) handleSubscriptionDeleteFailure(params *RMRParams) {
-       xapp.Logger.Info("SubDelFail from E2T:%s", params.String())
-
-       //
-       //
-       //
-       SubDelFailMsg, err := c.e2ap.UnpackSubscriptionDeleteFailure(params.Payload)
+//-------------------------------------------------------------------
+// handle from E2T Subscription Delete Response
+//-------------------------------------------------------------------
+func (c *Control) handleE2TSubscriptionDeleteResponse(params *RMRParams) (err error) {
+       xapp.Logger.Info("SUBS-SubDelResp from E2T:%s", params.String())
+       subDelRespMsg, err := c.e2ap.UnpackSubscriptionDeleteResponse(params.Payload)
        if err != nil {
-               xapp.Logger.Error("SubDelFail: %s Dropping this msg. %s", err.Error(), params.String())
+               xapp.Logger.Error("SUBS-SubDelResp: %s", idstring(params, nil, err))
                return
        }
-
-       //
-       //
-       //
-       subs := c.registry.GetSubscription(uint16(SubDelFailMsg.RequestId.Seq))
-       if subs == nil && params.SubId > 0 {
-               subs = c.registry.GetSubscription(uint16(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())
+       subs, err := c.registry.GetSubscriptionFirstMatch([]uint16{uint16(subDelRespMsg.RequestId.Seq), uint16(params.SubId)})
+       if err != nil {
+               xapp.Logger.Error("SUBS-SubDelResp: %s", idstring(params, nil, err))
                return
        }
-       xapp.Logger.Info("SubDelFail: subscription found payloadSeqNum: %d, SubId: %d", SubDelFailMsg.RequestId.Seq, subs.GetSubId())
-
-       //
-       //
-       //
        trans := subs.GetTransaction()
        if trans == nil {
-               xapp.Logger.Error("SubDelFail: Unknown trans. Dropping this msg. SubId: %d", subs.GetSubId())
+               err = fmt.Errorf("Ongoing transaction not found")
+               xapp.Logger.Error("SUBS-SubDelResp: %s", idstring(params, subs, err))
                return
        }
-       trans.SubDelFailMsg = SubDelFailMsg
-
-       //
-       //
-       //
-       c.timerMap.StopTimer("RIC_SUB_DEL_REQ", int(subs.GetSubId()))
-
-       responseReceived := trans.CheckResponseReceived()
-       if responseReceived == true {
-               // Subscription Delete timer already received
-               return
+       sendOk, timedOut := trans.SendEvent(subDelRespMsg, e2tRecvMsgTimeout)
+       if sendOk == false {
+               err = fmt.Errorf("Passing event to transaction failed: sendOk(%t) timedOut(%t)", sendOk, timedOut)
+               xapp.Logger.Error("MSG-SubDelResp: %s", idstring(trans, subs, err))
        }
-
-       c.sendSubscriptionDeleteResponse("SubDelFail", trans, subs)
        return
 }
 
-func (c *Control) handleSubscriptionDeleteRequestTimer(strId string, nbrId int, tryCount uint64) {
-       xapp.Logger.Info("SubDelReq timeout: subId: %v, tryCount: %v", nbrId, tryCount)
-
-       subs := c.registry.GetSubscription(uint16(nbrId))
-       if subs == nil {
-               xapp.Logger.Error("SubDelReq timeout: Unknown payloadSeqNum. Dropping this msg. SubId: %v", nbrId)
+//-------------------------------------------------------------------
+// handle from E2T Subscription Delete Failure
+//-------------------------------------------------------------------
+func (c *Control) handleE2TSubscriptionDeleteFailure(params *RMRParams) {
+       xapp.Logger.Info("MSG-SubDelFail from E2T:%s", params.String())
+       subDelFailMsg, err := c.e2ap.UnpackSubscriptionDeleteFailure(params.Payload)
+       if err != nil {
+               xapp.Logger.Error("MSG-SubDelFail: %s", idstring(params, nil, err))
                return
        }
-
-       trans := subs.GetTransaction()
-       if trans == nil {
-               xapp.Logger.Error("SubDelReq timeout: Unknown trans. Dropping this msg. SubId: %v", subs.GetSubId())
+       subs, err := c.registry.GetSubscriptionFirstMatch([]uint16{uint16(subDelFailMsg.RequestId.Seq), uint16(params.SubId)})
+       if err != nil {
+               xapp.Logger.Error("MSG-SubDelFail: %s", idstring(params, nil, err))
                return
        }
-
-       responseReceived := trans.CheckResponseReceived()
-       if responseReceived == true {
-               // Subscription Delete Response or Failure already received
+       trans := subs.GetTransaction()
+       if trans == nil {
+               err = fmt.Errorf("Ongoing transaction not found")
+               xapp.Logger.Error("MSG-SubDelFail: %s", idstring(params, subs, err))
                return
        }
-
-       if tryCount < maxSubDelReqTryCount {
-               // Set possible to handle new response for the subId
-               trans.RetryTransaction()
-               c.rmrSend("SubDelReq timeout: SubDelReq to E2T", subs, trans, trans.Payload, trans.PayloadLen)
-               tryCount++
-               c.timerMap.StartTimer("RIC_SUB_DEL_REQ", int(subs.GetSubId()), subReqTime, tryCount, c.handleSubscriptionDeleteRequestTimer)
-               return
+       sendOk, timedOut := trans.SendEvent(subDelFailMsg, e2tRecvMsgTimeout)
+       if sendOk == false {
+               err = fmt.Errorf("Passing event to transaction failed: sendOk(%t) timedOut(%t)", sendOk, timedOut)
+               xapp.Logger.Error("MSG-SubDelFail: %s", idstring(trans, subs, err))
        }
-
-       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
-
-               packedData, err := c.e2ap.PackSubscriptionDeleteResponse(trans.SubDelRespMsg)
-               if err == nil {
-                       trans.Payload = packedData.Buf
-                       trans.PayloadLen = len(packedData.Buf)
-                       c.rmrReplyToSender(desc+": SubDelResp to xapp", subs, trans, 12021, trans.Payload, trans.PayloadLen)
-                       time.Sleep(3 * time.Second)
-               } else {
-                       //TODO error handling improvement
-                       xapp.Logger.Error("%s: %s for trans %s (continuing cleaning)", desc, err.Error(), trans)
-               }
+//-------------------------------------------------------------------
+//
+//-------------------------------------------------------------------
+func typeofSubsMessage(v interface{}) string {
+       if v == nil {
+               return "NIL"
+       }
+       switch v.(type) {
+       case *e2ap.E2APSubscriptionRequest:
+               return "SubReq"
+       case *e2ap.E2APSubscriptionResponse:
+               return "SubResp"
+       case *e2ap.E2APSubscriptionFailure:
+               return "SubFail"
+       case *e2ap.E2APSubscriptionDeleteRequest:
+               return "SubDelReq"
+       case *e2ap.E2APSubscriptionDeleteResponse:
+               return "SubDelResp"
+       case *e2ap.E2APSubscriptionDeleteFailure:
+               return "SubDelFail"
+       default:
+               return "Unknown"
        }
-
-       trans.Release()
-       subs.Release()
 }