X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fcontrol.go;h=98a2474e8920f122671f46c0ae8c237641613461;hb=7348625b9ef03d41dd5a0ca0f6c508376259717e;hp=a2c8b0d5d84acb812c6154ae237d2848a7ca0392;hpb=422d018f94aedd9f4c001176b5ff06c786de28eb;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/control.go b/pkg/control/control.go index a2c8b0d..98a2474 100755 --- a/pkg/control/control.go +++ b/pkg/control/control.go @@ -23,12 +23,12 @@ 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/submgr/pkg/xapptweaks" + "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/models" "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" - "sync" "time" ) @@ -36,6 +36,25 @@ import ( // //----------------------------------------------------------------------------- +func idstring(err error, entries ...fmt.Stringer) string { + var retval string = "" + var filler string = "" + for _, entry := range entries { + retval += filler + entry.String() + filler = " " + } + if err != nil { + retval += filler + "err(" + err.Error() + ")" + filler = " " + + } + return retval +} + +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- + var e2tSubReqTimeout time.Duration = 5 * time.Second var e2tSubDelReqTime time.Duration = 5 * time.Second var e2tMaxSubReqTryCount uint64 = 2 // Initial try + retry @@ -44,12 +63,11 @@ var e2tMaxSubDelReqTryCount uint64 = 2 // Initial try + retry var e2tRecvMsgTimeout time.Duration = 5 * time.Second type Control struct { - e2ap *E2ap - registry *Registry - tracker *Tracker - timerMap *TimerMap - rmrSendMutex sync.Mutex - msgCounter uint64 + xapptweaks.XappWrapper + e2ap *E2ap + registry *Registry + tracker *Tracker + //subscriber *xapp.Subscriber } type RMRMeid struct { @@ -58,13 +76,6 @@ type RMRMeid struct { RanName string } -const ( - CREATE Action = 0 - MERGE Action = 1 - NONE Action = 2 - DELETE Action = 3 -) - func init() { xapp.Logger.Info("SUBMGR") viper.AutomaticEnv() @@ -75,10 +86,7 @@ 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} + rtmgrClient := RtmgrClient{rtClient: rtmgrclient.New(transport, strfmt.Default)} registry := new(Registry) registry.Initialize() @@ -87,142 +95,150 @@ func NewControl() *Control { tracker := new(Tracker) tracker.Init() - timerMap := new(TimerMap) - timerMap.Init() + //subscriber := xapp.NewSubscriber(viper.GetString("subscription.host"), viper.GetInt("subscription.timeout")) + + c := &Control{e2ap: new(E2ap), + registry: registry, + tracker: tracker, + //subscriber: subscriber, + } + c.XappWrapper.Init("") + go xapp.Subscription.Listen(c.SubscriptionHandler, c.QueryHandler, c.SubscriptionDeleteHandler) + //go c.subscriber.Listen(c.SubscriptionHandler, c.QueryHandler) + return c +} - return &Control{e2ap: new(E2ap), - registry: registry, - tracker: tracker, - timerMap: timerMap, - msgCounter: 0, +func (c *Control) ReadyCB(data interface{}) { + if c.Rmr == nil { + c.Rmr = xapp.Rmr } } func (c *Control) Run() { + xapp.SetReadyCB(c.ReadyCB, nil) xapp.Run(c) } -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.RMRParams, false) - c.rmrSendMutex.Unlock() - if status == false { - xapp.Logger.Info("rmr.Send() failed. Retry count %d, %s", i, params.String()) - time.Sleep(500 * time.Millisecond) - } - } - if status == false { - 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) SubscriptionHandler(stype models.SubscriptionType, params interface{}) (*models.SubscriptionResponse, error) { + /* + switch p := params.(type) { + case *models.ReportParams: + trans := c.tracker.NewXappTransaction(NewRmrEndpoint(p.ClientEndpoint),"" , 0, &xapp.RMRMeid{RanName: p.Meid}) + if trans == nil { + xapp.Logger.Error("XAPP-SubReq: %s", idstring(fmt.Errorf("transaction not created"), params)) + return + } + defer trans.Release() + case *models.ControlParams: + case *models.PolicyParams: + } + */ + return &models.SubscriptionResponse{}, fmt.Errorf("Subscription rest interface not implemented") +} + +func (c *Control) SubscriptionDeleteHandler(string) error { + return fmt.Errorf("Subscription rest interface not implemented") +} + +func (c *Control) QueryHandler() (models.SubscriptionList, error) { + return c.registry.QueryHandler() } -func (c *Control) rmrSend(desc string, subs *Subscription, trans *Transaction) (err error) { - params := &RMRParams{&xapp.RMRParams{}} +//------------------------------------------------------------------- +// +//------------------------------------------------------------------- + +func (c *Control) rmrSendToE2T(desc string, subs *Subscription, trans *TransactionSubs) (err error) { + params := xapptweaks.NewParams(nil) params.Mtype = trans.GetMtype() - params.SubId = int(subs.GetSubId()) + params.SubId = int(subs.GetReqId().Seq) 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) + xapp.Logger.Info("MSG to E2T: %s %s %s", desc, trans.String(), params.String()) + return c.RmrSend(params, 5) } -func (c *Control) rmrReplyToSender(desc string, subs *Subscription, trans *Transaction) (err error) { - params := &RMRParams{&xapp.RMRParams{}} +func (c *Control) rmrSendToXapp(desc string, subs *Subscription, trans *TransactionXapp) (err error) { + + params := xapptweaks.NewParams(nil) params.Mtype = trans.GetMtype() - params.SubId = int(subs.GetSubId()) + params.SubId = int(subs.GetReqId().Seq) 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) + xapp.Logger.Info("MSG to XAPP: %s %s %s", desc, trans.String(), params.String()) + return c.RmrSend(params, 5) } func (c *Control) Consume(params *xapp.RMRParams) (err error) { - xapp.Rmr.Free(params.Mbuf) - params.Mbuf = nil - msg := &RMRParams{params} - c.msgCounter++ + msg := xapptweaks.NewParams(params) + if c.Rmr == nil { + err = fmt.Errorf("Rmr object nil can handle %s", msg.String()) + xapp.Logger.Error("%s", err.Error()) + return + } + c.CntRecvMsg++ + + defer c.Rmr.Free(msg.Mbuf) + switch msg.Mtype { - case xapp.RICMessageTypes["RIC_SUB_REQ"]: + case xapp.RIC_SUB_REQ: go c.handleXAPPSubscriptionRequest(msg) - case xapp.RICMessageTypes["RIC_SUB_RESP"]: + case xapp.RIC_SUB_RESP: go c.handleE2TSubscriptionResponse(msg) - case xapp.RICMessageTypes["RIC_SUB_FAILURE"]: + case xapp.RIC_SUB_FAILURE: go c.handleE2TSubscriptionFailure(msg) - case xapp.RICMessageTypes["RIC_SUB_DEL_REQ"]: + case xapp.RIC_SUB_DEL_REQ: go c.handleXAPPSubscriptionDeleteRequest(msg) - case xapp.RICMessageTypes["RIC_SUB_DEL_RESP"]: + case xapp.RIC_SUB_DEL_RESP: go c.handleE2TSubscriptionDeleteResponse(msg) - case xapp.RICMessageTypes["RIC_SUB_DEL_FAILURE"]: + case xapp.RIC_SUB_DEL_FAILURE: go c.handleE2TSubscriptionDeleteFailure(msg) default: xapp.Logger.Info("Unknown Message Type '%d', discarding", msg.Mtype) } - - return nil -} -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 = " " - } - if subs != nil { - retval += filler + subs.String() - filler = " " - } - if err != nil { - retval += filler + "err(" + err.Error() + ")" - filler = " " - - } - return retval + return } //------------------------------------------------------------------- // handle from XAPP Subscription Request //------------------------------------------------------------------ -func (c *Control) handleXAPPSubscriptionRequest(params *RMRParams) { - xapp.Logger.Info("XAPP-SubReq from xapp: %s", params.String()) +func (c *Control) handleXAPPSubscriptionRequest(params *xapptweaks.RMRParams) { + xapp.Logger.Info("MSG from XAPP: %s", params.String()) subReqMsg, err := c.e2ap.UnpackSubscriptionRequest(params.Payload) if err != nil { - xapp.Logger.Error("XAPP-SubReq: %s", idstring(params, nil, err)) + xapp.Logger.Error("XAPP-SubReq: %s", idstring(err, params)) return } - trans, err := c.tracker.TrackTransaction(NewRmrEndpoint(params.Src), params.Xid, params.Meid) - if err != nil { - xapp.Logger.Error("XAPP-SubReq: %s", idstring(params, nil, err)) + trans := c.tracker.NewXappTransaction(xapptweaks.NewRmrEndpoint(params.Src), params.Xid, subReqMsg.RequestId.Seq, params.Meid) + if trans == nil { + xapp.Logger.Error("XAPP-SubReq: %s", idstring(fmt.Errorf("transaction not created"), params)) return } defer trans.Release() - subs, err := c.registry.AssignToSubscription(trans, subReqMsg) + err = c.tracker.Track(trans) if err != nil { - xapp.Logger.Error("XAPP-SubReq: %s", idstring(trans, nil, err)) + xapp.Logger.Error("XAPP-SubReq: %s", idstring(err, trans)) return } - if subs.IsTransactionReserved() { - err := fmt.Errorf("Currently parallel or queued transactions are not allowed") - xapp.Logger.Error("XAPP-SubReq: %s", idstring(trans, subs, err)) + //TODO handle subscription toward e2term inside AssignToSubscription / hide handleSubscriptionCreate in it? + subs, err := c.registry.AssignToSubscription(trans, subReqMsg) + if err != nil { + xapp.Logger.Error("XAPP-SubReq: %s", idstring(err, trans)) return } @@ -238,50 +254,51 @@ func (c *Control) handleXAPPSubscriptionRequest(params *RMRParams) { case *e2ap.E2APSubscriptionResponse: trans.Mtype, trans.Payload, err = c.e2ap.PackSubscriptionResponse(themsg) if err == nil { - c.rmrReplyToSender("XAPP-SubReq: SubResp to xapp", subs, trans) + trans.Release() + c.rmrSendToXapp("", 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) + c.rmrSendToXapp("", subs, trans) } - return default: break } } - xapp.Logger.Info("XAPP-SubReq: failed %s", idstring(trans, subs, err)) + xapp.Logger.Info("XAPP-SubReq: failed %s", idstring(err, trans, subs)) + //c.registry.RemoveFromSubscription(subs, trans, 5*time.Second) } //------------------------------------------------------------------- // handle from XAPP Subscription Delete Request //------------------------------------------------------------------ -func (c *Control) handleXAPPSubscriptionDeleteRequest(params *RMRParams) { - xapp.Logger.Info("XAPP-SubDelReq from xapp: %s", params.String()) +func (c *Control) handleXAPPSubscriptionDeleteRequest(params *xapptweaks.RMRParams) { + xapp.Logger.Info("MSG from XAPP: %s", params.String()) subDelReqMsg, err := c.e2ap.UnpackSubscriptionDeleteRequest(params.Payload) if err != nil { - xapp.Logger.Error("XAPP-SubDelReq %s", idstring(params, nil, err)) + xapp.Logger.Error("XAPP-SubDelReq %s", idstring(err, params)) return } - 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)) + trans := c.tracker.NewXappTransaction(xapptweaks.NewRmrEndpoint(params.Src), params.Xid, subDelReqMsg.RequestId.Seq, params.Meid) + if trans == nil { + xapp.Logger.Error("XAPP-SubDelReq: %s", idstring(fmt.Errorf("transaction not created"), params)) return } defer trans.Release() - subs, err := c.registry.GetSubscriptionFirstMatch([]uint16{uint16(subDelReqMsg.RequestId.Seq), uint16(params.SubId)}) + err = c.tracker.Track(trans) if err != nil { - xapp.Logger.Error("XAPP-SubDelReq: %s", idstring(trans, nil, err)) + xapp.Logger.Error("XAPP-SubReq: %s", idstring(err, trans)) return } - if subs.IsTransactionReserved() { - err := fmt.Errorf("Currently parallel or queued transactions are not allowed") - xapp.Logger.Error("XAPP-SubDelReq: %s", idstring(trans, subs, err)) + subs, err := c.registry.GetSubscriptionFirstMatch([]uint32{trans.GetSubId()}) + if err != nil { + xapp.Logger.Error("XAPP-SubDelReq: %s", idstring(err, trans)) return } @@ -291,98 +308,134 @@ func (c *Control) handleXAPPSubscriptionDeleteRequest(params *RMRParams) { go c.handleSubscriptionDelete(subs, trans) trans.WaitEvent(0) //blocked wait as timeout is handled in subs side + xapp.Logger.Debug("XAPP-SubDelReq: Handling event %s ", idstring(nil, trans, subs)) + // Whatever is received send ok delete response subDelRespMsg := &e2ap.E2APSubscriptionDeleteResponse{} - subDelRespMsg.RequestId.Id = subs.SubReqMsg.RequestId.Id - subDelRespMsg.RequestId.Seq = uint32(subs.GetSubId()) + subDelRespMsg.RequestId = subs.GetReqId().RequestId subDelRespMsg.FunctionId = subs.SubReqMsg.FunctionId trans.Mtype, trans.Payload, err = c.e2ap.PackSubscriptionDeleteResponse(subDelRespMsg) if err == nil { - c.rmrReplyToSender("XAPP-SubDelReq: SubDelResp to xapp", subs, trans) + c.rmrSendToXapp("", subs, trans) } + + //TODO handle subscription toward e2term insiged RemoveFromSubscription / hide handleSubscriptionDelete in it? + //c.registry.RemoveFromSubscription(subs, trans, 5*time.Second) } //------------------------------------------------------------------- // SUBS CREATE Handling //------------------------------------------------------------------- -func (c *Control) handleSubscriptionCreate(subs *Subscription, parentTrans *Transaction) { +func (c *Control) handleSubscriptionCreate(subs *Subscription, parentTrans *TransactionXapp) { - trans := c.tracker.NewTransaction(subs.GetMeid()) + trans := c.tracker.NewSubsTransaction(subs) subs.WaitTransactionTurn(trans) defer subs.ReleaseTransactionTurn(trans) defer trans.Release() - xapp.Logger.Debug("SUBS-SubReq: Handling %s parent %s", idstring(trans, subs, nil), parentTrans.String()) + xapp.Logger.Debug("SUBS-SubReq: Handling %s ", idstring(nil, trans, subs, parentTrans)) + + subRfMsg, valid := subs.GetCachedResponse() + if subRfMsg == nil && valid == true { + + // + // In case of failure + // - make internal delete + // - in case duplicate cause, retry (currently max 1 retry) + // + maxRetries := uint64(1) + doRetry := true + for retries := uint64(0); retries <= maxRetries && doRetry; retries++ { + doRetry = false + + event := c.sendE2TSubscriptionRequest(subs, trans, parentTrans) + switch themsg := event.(type) { + case *e2ap.E2APSubscriptionResponse: + subRfMsg, valid = subs.SetCachedResponse(event, true) + case *e2ap.E2APSubscriptionFailure: + subRfMsg, valid = subs.SetCachedResponse(event, false) + doRetry = true + for _, item := range themsg.ActionNotAdmittedList.Items { + if item.Cause.Content != e2ap.E2AP_CauseContent_Ric || (item.Cause.Value != e2ap.E2AP_CauseValue_Ric_duplicate_action && item.Cause.Value != e2ap.E2AP_CauseValue_Ric_duplicate_event) { + doRetry = false + break + } + } + xapp.Logger.Info("SUBS-SubReq: internal delete and possible retry due event(%s) retry(%t,%d/%d) %s", typeofSubsMessage(event), doRetry, retries, maxRetries, idstring(nil, trans, subs, parentTrans)) + c.sendE2TSubscriptionDeleteRequest(subs, trans, parentTrans) + default: + xapp.Logger.Info("SUBS-SubReq: internal delete due event(%s) %s", typeofSubsMessage(event), idstring(nil, trans, subs, parentTrans)) + subRfMsg, valid = subs.SetCachedResponse(nil, false) + c.sendE2TSubscriptionDeleteRequest(subs, trans, parentTrans) + } + } - 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 + xapp.Logger.Debug("SUBS-SubReq: Handling (e2t response %s) %s", typeofSubsMessage(subRfMsg), idstring(nil, trans, subs, parentTrans)) + } else { + xapp.Logger.Debug("SUBS-SubReq: Handling (cached response %s) %s", typeofSubsMessage(subRfMsg), idstring(nil, trans, subs, parentTrans)) } - 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) + //Now RemoveFromSubscription in here to avoid race conditions (mostly concerns delete) + if valid == false { + c.registry.RemoveFromSubscription(subs, parentTrans, 5*time.Second) } - - subs.DelEndpoint(parentTrans.GetEndpoint()) + parentTrans.SendEvent(subRfMsg, 0) } //------------------------------------------------------------------- // SUBS DELETE Handling //------------------------------------------------------------------- -func (c *Control) handleSubscriptionDelete(subs *Subscription, parentTrans *Transaction) { - trans := c.tracker.NewTransaction(subs.GetMeid()) +func (c *Control) handleSubscriptionDelete(subs *Subscription, parentTrans *TransactionXapp) { + + trans := c.tracker.NewSubsTransaction(subs) subs.WaitTransactionTurn(trans) defer subs.ReleaseTransactionTurn(trans) defer trans.Release() - xapp.Logger.Debug("SUBS-SubDelReq: Handling %s parent %s", idstring(trans, subs, nil), parentTrans.String()) + xapp.Logger.Debug("SUBS-SubDelReq: Handling %s", idstring(nil, trans, subs, parentTrans)) - event := c.sendE2TSubscriptionDeleteRequest(subs, trans, parentTrans) - - parentTrans.SendEvent(event, 0) - subs.DelEndpoint(parentTrans.GetEndpoint()) + subs.mutex.Lock() + if subs.valid && subs.EpList.HasEndpoint(parentTrans.GetEndpoint()) && subs.EpList.Size() == 1 { + subs.valid = false + subs.mutex.Unlock() + c.sendE2TSubscriptionDeleteRequest(subs, trans, parentTrans) + } else { + subs.mutex.Unlock() + } + //Now RemoveFromSubscription in here to avoid race conditions (mostly concerns delete) + // If parallel deletes ongoing both might pass earlier sendE2TSubscriptionDeleteRequest(...) if + // RemoveFromSubscription locates in caller side (now in handleXAPPSubscriptionDeleteRequest(...)) + c.registry.RemoveFromSubscription(subs, parentTrans, 5*time.Second) + parentTrans.SendEvent(nil, 0) } //------------------------------------------------------------------- // send to E2T Subscription Request //------------------------------------------------------------------- -func (c *Control) sendE2TSubscriptionRequest(subs *Subscription, trans *Transaction, parentTrans *Transaction) interface{} { +func (c *Control) sendE2TSubscriptionRequest(subs *Subscription, trans *TransactionSubs, parentTrans *TransactionXapp) 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()) + subReqMsg.RequestId = subs.GetReqId().RequestId trans.Mtype, trans.Payload, err = c.e2ap.PackSubscriptionRequest(subReqMsg) if err != nil { - xapp.Logger.Error("SUBS-SubReq: %s parent %s", idstring(trans, subs, err), parentTrans.String()) + xapp.Logger.Error("SUBS-SubReq: %s", idstring(err, trans, subs, parentTrans)) return event } for retries := uint64(0); retries < e2tMaxSubReqTryCount; retries++ { - desc := fmt.Sprintf("SUBS-SubReq: SubReq to E2T (retry %d)", retries) - c.rmrSend(desc, subs, trans) + desc := fmt.Sprintf("(retry %d)", retries) + c.rmrSendToE2T(desc, subs, trans) event, timedOut = trans.WaitEvent(e2tSubReqTimeout) if timedOut { continue } break } - xapp.Logger.Debug("SUBS-SubReq: Response handling event(%s) %s parent %s", typeofSubsMessage(event), idstring(trans, subs, nil), parentTrans.String()) + xapp.Logger.Debug("SUBS-SubReq: Response handling event(%s) %s", typeofSubsMessage(event), idstring(nil, trans, subs, parentTrans)) return event } @@ -390,59 +443,58 @@ func (c *Control) sendE2TSubscriptionRequest(subs *Subscription, trans *Transact // send to E2T Subscription Delete Request //------------------------------------------------------------------- -func (c *Control) sendE2TSubscriptionDeleteRequest(subs *Subscription, trans *Transaction, parentTrans *Transaction) interface{} { +func (c *Control) sendE2TSubscriptionDeleteRequest(subs *Subscription, trans *TransactionSubs, parentTrans *TransactionXapp) 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 = 0 + subDelReqMsg.RequestId = subs.GetReqId().RequestId + subDelReqMsg.FunctionId = subs.SubReqMsg.FunctionId trans.Mtype, trans.Payload, err = c.e2ap.PackSubscriptionDeleteRequest(subDelReqMsg) if err != nil { - xapp.Logger.Error("SUBS-SubDelReq: %s parent %s", idstring(trans, subs, err), parentTrans.String()) + xapp.Logger.Error("SUBS-SubDelReq: %s", idstring(err, trans, subs, parentTrans)) return event } for retries := uint64(0); retries < e2tMaxSubDelReqTryCount; retries++ { - desc := fmt.Sprintf("SUBS-SubDelReq: SubDelReq to E2T (retry %d)", retries) - c.rmrSend(desc, subs, trans) + desc := fmt.Sprintf("(retry %d)", retries) + c.rmrSendToE2T(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()) + xapp.Logger.Debug("SUBS-SubDelReq: Response handling event(%s) %s", typeofSubsMessage(event), idstring(nil, trans, subs, parentTrans)) return event } //------------------------------------------------------------------- // handle from E2T Subscription Reponse //------------------------------------------------------------------- -func (c *Control) handleE2TSubscriptionResponse(params *RMRParams) { - xapp.Logger.Info("MSG-SubResp from E2T: %s", params.String()) +func (c *Control) handleE2TSubscriptionResponse(params *xapptweaks.RMRParams) { + xapp.Logger.Info("MSG 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)) + xapp.Logger.Error("MSG-SubResp %s", idstring(err, params)) return } - subs, err := c.registry.GetSubscriptionFirstMatch([]uint16{uint16(subRespMsg.RequestId.Seq), uint16(params.SubId)}) + subs, err := c.registry.GetSubscriptionFirstMatch([]uint32{subRespMsg.RequestId.Seq}) if err != nil { - xapp.Logger.Error("MSG-SubResp: %s", idstring(params, nil, err)) + xapp.Logger.Error("MSG-SubResp: %s", idstring(err, params)) return } trans := subs.GetTransaction() if trans == nil { err = fmt.Errorf("Ongoing transaction not found") - xapp.Logger.Error("MSG-SubResp: %s", idstring(params, subs, err)) + xapp.Logger.Error("MSG-SubResp: %s", idstring(err, params, subs)) return } 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)) + xapp.Logger.Error("MSG-SubResp: %s", idstring(err, trans, subs)) } return } @@ -450,28 +502,28 @@ func (c *Control) handleE2TSubscriptionResponse(params *RMRParams) { //------------------------------------------------------------------- // handle from E2T Subscription Failure //------------------------------------------------------------------- -func (c *Control) handleE2TSubscriptionFailure(params *RMRParams) { - xapp.Logger.Info("MSG-SubFail from E2T: %s", params.String()) +func (c *Control) handleE2TSubscriptionFailure(params *xapptweaks.RMRParams) { + xapp.Logger.Info("MSG from E2T: %s", params.String()) subFailMsg, err := c.e2ap.UnpackSubscriptionFailure(params.Payload) if err != nil { - xapp.Logger.Error("MSG-SubFail %s", idstring(params, nil, err)) + xapp.Logger.Error("MSG-SubFail %s", idstring(err, params)) return } - subs, err := c.registry.GetSubscriptionFirstMatch([]uint16{uint16(subFailMsg.RequestId.Seq), uint16(params.SubId)}) + subs, err := c.registry.GetSubscriptionFirstMatch([]uint32{subFailMsg.RequestId.Seq}) if err != nil { - xapp.Logger.Error("MSG-SubFail: %s", idstring(params, nil, err)) + xapp.Logger.Error("MSG-SubFail: %s", idstring(err, params)) return } trans := subs.GetTransaction() if trans == nil { err = fmt.Errorf("Ongoing transaction not found") - xapp.Logger.Error("MSG-SubFail: %s", idstring(params, subs, err)) + xapp.Logger.Error("MSG-SubFail: %s", idstring(err, params, subs)) 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)) + xapp.Logger.Error("MSG-SubFail: %s", idstring(err, trans, subs)) } return } @@ -479,28 +531,28 @@ func (c *Control) handleE2TSubscriptionFailure(params *RMRParams) { //------------------------------------------------------------------- // handle from E2T Subscription Delete Response //------------------------------------------------------------------- -func (c *Control) handleE2TSubscriptionDeleteResponse(params *RMRParams) (err error) { - xapp.Logger.Info("SUBS-SubDelResp from E2T:%s", params.String()) +func (c *Control) handleE2TSubscriptionDeleteResponse(params *xapptweaks.RMRParams) (err error) { + xapp.Logger.Info("MSG from E2T: %s", params.String()) subDelRespMsg, err := c.e2ap.UnpackSubscriptionDeleteResponse(params.Payload) if err != nil { - xapp.Logger.Error("SUBS-SubDelResp: %s", idstring(params, nil, err)) + xapp.Logger.Error("MSG-SubDelResp: %s", idstring(err, params)) return } - subs, err := c.registry.GetSubscriptionFirstMatch([]uint16{uint16(subDelRespMsg.RequestId.Seq), uint16(params.SubId)}) + subs, err := c.registry.GetSubscriptionFirstMatch([]uint32{subDelRespMsg.RequestId.Seq}) if err != nil { - xapp.Logger.Error("SUBS-SubDelResp: %s", idstring(params, nil, err)) + xapp.Logger.Error("MSG-SubDelResp: %s", idstring(err, params)) return } trans := subs.GetTransaction() if trans == nil { err = fmt.Errorf("Ongoing transaction not found") - xapp.Logger.Error("SUBS-SubDelResp: %s", idstring(params, subs, err)) + xapp.Logger.Error("MSG-SubDelResp: %s", idstring(err, params, subs)) 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)) + xapp.Logger.Error("MSG-SubDelResp: %s", idstring(err, trans, subs)) } return } @@ -508,28 +560,28 @@ func (c *Control) handleE2TSubscriptionDeleteResponse(params *RMRParams) (err er //------------------------------------------------------------------- // handle from E2T Subscription Delete Failure //------------------------------------------------------------------- -func (c *Control) handleE2TSubscriptionDeleteFailure(params *RMRParams) { - xapp.Logger.Info("MSG-SubDelFail from E2T:%s", params.String()) +func (c *Control) handleE2TSubscriptionDeleteFailure(params *xapptweaks.RMRParams) { + xapp.Logger.Info("MSG 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)) + xapp.Logger.Error("MSG-SubDelFail: %s", idstring(err, params)) return } - subs, err := c.registry.GetSubscriptionFirstMatch([]uint16{uint16(subDelFailMsg.RequestId.Seq), uint16(params.SubId)}) + subs, err := c.registry.GetSubscriptionFirstMatch([]uint32{subDelFailMsg.RequestId.Seq}) if err != nil { - xapp.Logger.Error("MSG-SubDelFail: %s", idstring(params, nil, err)) + xapp.Logger.Error("MSG-SubDelFail: %s", idstring(err, params)) return } trans := subs.GetTransaction() if trans == nil { err = fmt.Errorf("Ongoing transaction not found") - xapp.Logger.Error("MSG-SubDelFail: %s", idstring(params, subs, err)) + xapp.Logger.Error("MSG-SubDelFail: %s", idstring(err, params, subs)) 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)) + xapp.Logger.Error("MSG-SubDelFail: %s", idstring(err, trans, subs)) } return }