X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fcontrol.go;h=b398daaf1488c882dc5422ca8ba9c34eb3d64595;hb=refs%2Fchanges%2F25%2F2125%2F1;hp=d27844eea4e99e049b2834b841fff7e92c8b1383;hpb=1a50344b88201d4620b74d50d658a51117173636;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/control.go b/pkg/control/control.go index d27844e..b398daa 100644 --- a/pkg/control/control.go +++ b/pkg/control/control.go @@ -30,28 +30,25 @@ import ( "github.com/go-openapi/strfmt" "github.com/spf13/viper" "math/rand" - "strconv" + "sync" "time" - "sync" ) -var rmrSendMutex = &sync.Mutex{} - -var subReqTime time.Duration = 2 * time.Second -var SubDelReqTime time.Duration = 2 * time.Second +var subReqTime time.Duration = 5 * time.Second +var SubDelReqTime time.Duration = 5 * time.Second type Control struct { - e2ap *E2ap - registry *Registry - rtmgrClient *RtmgrClient - tracker *Tracker - rcChan chan *xapp.RMRParams - timerMap *TimerMap + e2ap *E2ap + registry *Registry + rtmgrClient *RtmgrClient + tracker *Tracker + timerMap *TimerMap + rmrSendMutex sync.Mutex } type RMRMeid struct { - PlmnID string - EnbID string + PlmnID string + EnbID string RanName string } @@ -60,11 +57,12 @@ var seedSN uint16 const ( CREATE Action = 0 MERGE Action = 1 + NONE Action = 2 DELETE Action = 3 ) func init() { - xapp.Logger.Info("SUBMGR /ric-plt-submgr:r3-test-v2") + xapp.Logger.Info("SUBMGR /ric-plt-submgr:r3-test-v4") viper.AutomaticEnv() viper.SetEnvPrefix("submgr") viper.AllowEmptyEnv(true) @@ -79,7 +77,7 @@ func init() { xapp.Logger.Info("SUBMGR: Initial Sequence Number: %v", seedSN) } -func NewControl() Control { +func NewControl() *Control { registry := new(Registry) registry.Initialize(seedSN) @@ -95,28 +93,27 @@ func NewControl() Control { deleteHandle := rtmgrhandle.NewDeleteXappSubscriptionHandleParamsWithTimeout(10 * time.Second) rtmgrClient := RtmgrClient{client, handle, deleteHandle} - return Control{new(E2ap), registry, &rtmgrClient, tracker, make(chan *xapp.RMRParams),timerMap} + return &Control{e2ap: new(E2ap), + registry: registry, + rtmgrClient: &rtmgrClient, + tracker: tracker, + timerMap: timerMap, + } } func (c *Control) Run() { - go c.controlLoop() xapp.Run(c) } -func (c *Control) Consume(rp *xapp.RMRParams) (err error) { - c.rcChan <- rp - return -} - func (c *Control) rmrSend(params *xapp.RMRParams) (err error) { status := false i := 1 - for ; i <= 10 && status == false; i++ { - rmrSendMutex.Lock() + for ; i <= 10 && status == false; i++ { + c.rmrSendMutex.Lock() status = xapp.Rmr.Send(params, false) - rmrSendMutex.Unlock() + 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 %v, Mtype: %v, SubId: %v, Xid %s", i, params.Mtype, params.SubId, params.Xid) time.Sleep(500 * time.Millisecond) } } @@ -124,13 +121,6 @@ func (c *Control) rmrSend(params *xapp.RMRParams) (err error) { err = errors.New("rmr.Send() failed") xapp.Rmr.Free(params.Mbuf) } - - /* - if !xapp.Rmr.Send(params, false) { - err = errors.New("rmr.Send() failed") - xapp.Rmr.Free(params.Mbuf) - } - */ return } @@ -139,48 +129,47 @@ func (c *Control) rmrReplyToSender(params *xapp.RMRParams) (err error) { return } -func (c *Control) controlLoop() { - for { - msg := <-c.rcChan - switch msg.Mtype { - case xapp.RICMessageTypes["RIC_SUB_REQ"]: - go c.handleSubscriptionRequest(msg) - case xapp.RICMessageTypes["RIC_SUB_RESP"]: - go c.handleSubscriptionResponse(msg) - case xapp.RICMessageTypes["RIC_SUB_FAILURE"]: - go c.handleSubscriptionFailure(msg) - case xapp.RICMessageTypes["RIC_SUB_DEL_REQ"]: - go c.handleSubscriptionDeleteRequest(msg) - case xapp.RICMessageTypes["RIC_SUB_DEL_RESP"]: - go c.handleSubscriptionDeleteResponse(msg) - default: - err := errors.New("Message Type " + strconv.Itoa(msg.Mtype) + " is discarded") - xapp.Logger.Error("Unknown message type: %v", err) - } +func (c *Control) Consume(msg *xapp.RMRParams) (err error) { + switch msg.Mtype { + case xapp.RICMessageTypes["RIC_SUB_REQ"]: + go c.handleSubscriptionRequest(msg) + case xapp.RICMessageTypes["RIC_SUB_RESP"]: + go c.handleSubscriptionResponse(msg) + case xapp.RICMessageTypes["RIC_SUB_FAILURE"]: + go c.handleSubscriptionFailure(msg) + case xapp.RICMessageTypes["RIC_SUB_DEL_REQ"]: + go c.handleSubscriptionDeleteRequest(msg) + case xapp.RICMessageTypes["RIC_SUB_DEL_RESP"]: + go c.handleSubscriptionDeleteResponse(msg) + case xapp.RICMessageTypes["RIC_SUB_DEL_FAILURE"]: + go c.handleSubscriptionDeleteFailure(msg) + default: + xapp.Logger.Info("Unknown Message Type '%d', discarding", msg.Mtype) } + return nil } -func (c *Control) handleSubscriptionRequest(params *xapp.RMRParams) (err error) { - xapp.Logger.Info("Subscription Request Received from Src: %s, Mtype: %v, SubId: %v, Xid: %s, Meid: %v",params.Src, params.Mtype, params.SubId, params.Xid, params.Meid) +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 /* Reserve a sequence number and set it in the payload */ newSubId, isIdValid := c.registry.ReserveSequenceNumber() if isIdValid != true { - xapp.Logger.Info("Further processing of this SubscriptionRequest stopped. SubId: %v, Xid: %s",params.SubId, params.Xid) - return + xapp.Logger.Error("SubReq: Failed to reserve sequence number. Dropping this msg. SubId: %v, Xid: %s", params.SubId, params.Xid) + return } - err = c.e2ap.SetSubscriptionRequestSequenceNumber(params.Payload, newSubId) + err := c.e2ap.SetSubscriptionRequestSequenceNumber(params.Payload, newSubId) if err != nil { - err = errors.New("Unable to set Subscription Sequence Number in Payload due to: " + err.Error()) + 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) return } srcAddr, srcPort, err := c.rtmgrClient.SplitSource(params.Src) if err != nil { - xapp.Logger.Error("Failed to update routing-manager about the subscription request with reason: %s", err) + xapp.Logger.Error("SubReq: Failed to update routing-manager. Dropping this msg. Err: %s, SubId: %v, Xid: %s", err, params.SubId, params.Xid) return } @@ -189,178 +178,205 @@ func (c *Control) handleSubscriptionRequest(params *xapp.RMRParams) (err error) xactValue := Transaction{*srcAddr, *srcPort, params} err = c.tracker.TrackTransaction(xactKey, xactValue) if err != nil { - xapp.Logger.Error("Failed to create a Subscription Request transaction record due to %v", err) + xapp.Logger.Error("SubReq: Failed to create transaction record. Dropping this msg. Err: %v SubId: %v, Xid: %s", err, params.SubId, params.Xid) return } /* Update routing manager about the new subscription*/ subRouteAction := SubRouteInfo{CREATE, *srcAddr, *srcPort, newSubId} - xapp.Logger.Info("Starting routing manager update") - c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) + xapp.Logger.Info("SubReq: Starting routing manager update. SubId: %v, Xid: %s", params.SubId, params.Xid) - //time.Sleep(3 * time.Second) + err = c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) + if err != nil { + xapp.Logger.Error("SubReq: Failed to update routing manager. Dropping this SubReq msg. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + return + } // Setting new subscription ID in the RMR header params.SubId = int(newSubId) - xapp.Logger.Info("Forwarding Subscription Request to E2T: Mtype: %v, SubId: %v, Xid %s, Meid %v",params.Mtype, params.SubId, params.Xid, params.Meid) + 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("Failed to send request to E2T %v. SubId: %v, Xid: %s", err, params.SubId, params.Xid) - } /*else { - c.timerMap.StartTimer(newSubId, subReqTime, c.handleSubscriptionRequestTimer) - }*/ - xapp.Logger.Debug("--- Debugging transaction table = %v", c.tracker.transactionTable) + 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) return } -func (c *Control) handleSubscriptionResponse(params *xapp.RMRParams) (err error) { - xapp.Logger.Info("Subscription Response Received from Src: %s, Mtype: %v, SubId: %v, Meid: %v",params.Src, params.Mtype, params.SubId, params.Meid) +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 payloadSeqNum, err := c.e2ap.GetSubscriptionResponseSequenceNumber(params.Payload) if err != nil { - err = errors.New("Unable to get Subscription Sequence Number from Payload due to: " + err.Error()) + xapp.Logger.Error("SubResp: Unable to get Sequence Number from Payload. Dropping this msg. Err: %v, SubId: %v", err, params.SubId) return } + xapp.Logger.Info("SubResp: Received payloadSeqNum: %v", payloadSeqNum) - xapp.Logger.Info("Received payloadSeqNum: %v",payloadSeqNum) if !c.registry.IsValidSequenceNumber(payloadSeqNum) { - err = errors.New("Unknown Subscription ID: " + strconv.Itoa(int(payloadSeqNum)) + " in Subscritpion Response. Message discarded.") + xapp.Logger.Error("SubResp: Unknown payloadSeqNum. Dropping this msg. PayloadSeqNum: %v, SubId: %v", payloadSeqNum, params.SubId) return } -// c.timerMap.StopTimer(payloadSeqNum) + c.timerMap.StopTimer("RIC_SUB_REQ", int(payloadSeqNum)) c.registry.setSubscriptionToConfirmed(payloadSeqNum) var transaction Transaction transaction, err = c.tracker.RetriveTransaction(payloadSeqNum, CREATE) if err != nil { - xapp.Logger.Error("Failed to retrive transaction record. Err: %v", err) - xapp.Logger.Info("Further processing of this Subscription Response stopped. SubId: %v, Xid: %s",params.SubId, params.Xid) + xapp.Logger.Error("SubResp: Failed to retrive transaction record. Dropping this msg. Err: %v, SubId: %v", err, params.SubId) return } - xapp.Logger.Info("Subscription ID: %v, from address: %v:%v. Retrieved old subId...", int(payloadSeqNum), transaction.XappInstanceAddress, transaction.XappPort) + 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 - - xapp.Logger.Info("Forwarding Subscription Response to UEEC: Mtype: %v, SubId: %v, Xid: %s, Meid: %v",params.Mtype, params.SubId, params.Xid, params.Meid) + params.SubId = int(payloadSeqNum) + params.Xid = transaction.OrigParams.Xid + + 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("Failed to send response to requestor %v. SubId: %v, Xid: %s", err, params.SubId, params.Xid) + xapp.Logger.Error("SubResp: Failed to send response to xApp. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) } - xapp.Logger.Info("Subscription ID: %v, from address: %v:%v. Deleting transaction record", int(payloadSeqNum), transaction.XappInstanceAddress, transaction.XappPort) + 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) if err != nil { - xapp.Logger.Error("Failed to delete a Subscription Request transaction record due to %v", err) + xapp.Logger.Error("SubResp: Failed to delete transaction record. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) return } return } -func (c *Control) handleSubscriptionFailure(params *xapp.RMRParams) (err error) { - xapp.Logger.Info("Subscription Failure Received from Src: %s, Mtype: %v, SubId: %v, Meid: %v",params.Src, params.Mtype, params.SubId, params.Meid) +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 payloadSeqNum, err := c.e2ap.GetSubscriptionFailureSequenceNumber(params.Payload) if err != nil { - err = errors.New("Unable to get Subscription Sequence Number from Payload due to: " + err.Error()) + xapp.Logger.Error("SubFail: Unable to get Sequence Number from Payload. Dropping this msg. Err: %v, SubId: %v", err, params.SubId) return } - xapp.Logger.Info("Received payloadSeqNum: %v", payloadSeqNum) - - // should here be IsValidSequenceNumber check? + xapp.Logger.Info("SubFail: Received payloadSeqNum: %v", payloadSeqNum) -// c.timerMap.StopTimer(payloadSeqNum) + c.timerMap.StopTimer("RIC_SUB_REQ", int(payloadSeqNum)) var transaction Transaction transaction, err = c.tracker.RetriveTransaction(payloadSeqNum, CREATE) - if err != nil { - xapp.Logger.Error("Failed to retrive transaction record. Err %v", err) - xapp.Logger.Info("Further processing of this Subscription Failure stopped. SubId: %v, Xid: %s",params.SubId, params.Xid) + if err != nil { + xapp.Logger.Error("SubFail: Failed to retrive transaction record. Dropping this msg. Err: %v, SubId: %v", err, params.SubId) return } - xapp.Logger.Info("Subscription ID: %v, from address: %v:%v. Forwarding response to requestor...", int(payloadSeqNum), transaction.XappInstanceAddress, transaction.XappPort) + xapp.Logger.Info("SubFail: SubId: %v, from address: %v:%v. Forwarding response to xApp", int(payloadSeqNum), transaction.XappInstanceAddress, transaction.XappPort) params.SubId = int(payloadSeqNum) params.Xid = transaction.OrigParams.Xid - xapp.Logger.Info("Forwarding Subscription Failure to UEEC: Mtype: %v, SubId: %v, Xid: %v, Meid: %v",params.Mtype, params.SubId, params.Xid, params.Meid) + 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 requestor %v. SubId: %v, Xid: %s", err, params.SubId, params.Xid) + xapp.Logger.Error("Failed to send response to xApp. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) } time.Sleep(3 * time.Second) - xapp.Logger.Info("Starting routing manager update") + xapp.Logger.Info("SubFail: Starting routing manager update. SubId: %v, Xid: %s", params.SubId, params.Xid) subRouteAction := SubRouteInfo{CREATE, transaction.XappInstanceAddress, transaction.XappPort, payloadSeqNum} - c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) + err = c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) + if err != nil { + xapp.Logger.Error("SubFail: Failed to update routing manager. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + } - xapp.Logger.Info("Deleting trancaction record") + 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("Failed to delete a Subscription Request transaction record due to %v", err) + 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) + return } return } -func (c *Control) handleSubscriptionRequestTimer(subId uint16) { - xapp.Logger.Info("Subscription Request timer expired. SubId: %v",subId) -/* +func (c *Control) handleSubscriptionRequestTimer(strId string, nbrId int) { + newSubId := uint16(nbrId) + xapp.Logger.Info("SubReq timer expired. newSubId: %v", newSubId) + // var causeContent uint8 = 1 // just some random cause. To be checked later. Should be no respose or something + // var causeVal uint8 = 1 // just some random val. To be checked later. Should be no respose or something + // c.sendSubscriptionFailure(newSubId, causeContent, causeVal) +} + +/* +func (c *Control) sendSubscriptionFailure(subId uint16, causeContent uint8, causeVal uint8) { + transaction, err := c.tracker.completeTransaction(subId, CREATE) if err != nil { - xapp.Logger.Error("Failed to delete a Subscription Request transaction record due to %v", err) + xapp.Logger.Error("SendSubFail: Failed to delete transaction record. Err:%v. SubId: %v", err, subId) return } - xapp.Logger.Info("SubId: %v, Xid %v, Meid: %v",subId, transaction.OrigParams.Xid, transaction.OrigParams.Meid) + 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 - payload := []byte("40C9408098000003EA7E00050000010016EA6300020021EA6E00808180EA6F000400000000EA6F000400010040EA6F000400020080EA6F0004000300C0EA6F000400040100EA6F000400050140EA6F000400060180EA6F0004000701C0EA6F000400080200EA6F000400090240EA6F0004000A0280EA6F0004000B02C0EA6F0004000C0300EA6F0004000D0340EA6F0004000E0380EA6F0004000F03C0") - params.PayloadLen = len(payload) - params.Payload = payload - xapp.Logger.Info("Forwarding Subscription Failure to UEEC: Mtype: %v, SubId: %v, Xid: %s, Meid: %v",params.Mtype, params.SubId, params.Xid, params.Meid) +// newPayload, packErr := c.e2ap.PackSubscriptionFailure(transaction.OrigParams.Payload, subId, causeContent, causeVal) +// if packErr != nil { +// xapp.Logger.Error("SendSubFail: PackSubscriptionFailure() due to %v", packErr) +// return +// } + + newPayload := []byte("40CA4018000003EA7E00050000010016EA6300020021EA74000200C0") // Temporary solution + + params.PayloadLen = len(newPayload) + params.Payload = newPayload + + 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("Failed to send response to requestor %v. SubId: %v, Xid: %s", err, params.SubId, params.Xid) + xapp.Logger.Error("SendSubFail: Failed to send response to xApp. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) } -*/ -/* + time.Sleep(3 * time.Second) - xapp.Logger.Info("Subscription ID: %v, from address: %v:%v. Deleting transaction record", int(subId), transaction.XappInstanceAddress, transaction.XappPort) + xapp.Logger.Info("SendSubFail: SubId: %v, from address: %v:%v. Deleting transaction record", int(subId), transaction.XappInstanceAddress, transaction.XappPort) - xapp.Logger.Info("Starting routing manager update") - subRouteAction := SubRouteInfo{DELETE, transaction.XappInstanceAddress, transaction.XappPort, payloadSeqNum} - c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) + 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) + return + } - xapp.Logger.Info("Deleting trancaction record") - if c.registry.releaseSequenceNumber(payloadSeqNum) { - transaction, err = c.tracker.completeTransaction(payloadSeqNum, CREATE) + 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("Failed to delete a Subscription Request transaction record due to %v", err) + 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) } -*/ return } +*/ func (act Action) String() string { actions := [...]string{ "CREATE", "MERGE", + "NONE", "DELETE", } @@ -379,40 +395,44 @@ func (act Action) valid() bool { } } -func (c *Control) handleSubscriptionDeleteRequest(params *xapp.RMRParams) (err error) { - xapp.Logger.Info("Subscription Delete Request Received from Src: %s, Mtype: %v, SubId: %v, Xid: %s, Meid: %v",params.Src, params.Mtype, params.SubId, params.Xid, params.Meid) +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 payloadSeqNum, err := c.e2ap.GetSubscriptionDeleteRequestSequenceNumber(params.Payload) if err != nil { - err = errors.New("Unable to get Subscription Sequence Number from Payload due to: " + err.Error()) + 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) return } - xapp.Logger.Info("Received payloadSeqNum: %v", payloadSeqNum) + xapp.Logger.Info("SubDelReq: Received payloadSeqNum: %v", payloadSeqNum) + if c.registry.IsValidSequenceNumber(payloadSeqNum) { c.registry.deleteSubscription(payloadSeqNum) - trackErr := c.trackDeleteTransaction(params, payloadSeqNum) - if trackErr != nil { - xapp.Logger.Error("Failed to create a Subscription Delete Request transaction record due to %v", trackErr) - return trackErr + 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) + return } - xapp.Logger.Info("Forwarding Delete Subscription Request to E2T: Mtype: %v, SubId: %v, Xid: %s, Meid: %v",params.Mtype, params.SubId, params.Xid, params.Meid) + 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) if err != nil { - xapp.Logger.Error("Failed to send request to E2T %v. SubId: %v, Xid: %s", err, params.SubId, params.Xid) - } /*else { - c.timerMap.StartTimer(payloadSeqNum, SubDelReqTime, c.handleSubscriptionDeleteRequestTimer) - }*/ + 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) + } return } func (c *Control) trackDeleteTransaction(params *xapp.RMRParams, payloadSeqNum uint16) (err error) { srcAddr, srcPort, err := c.rtmgrClient.SplitSource(params.Src) if err != nil { - xapp.Logger.Error("Failed to update routing-manager about the subscription delete request with reason: %s", err) + xapp.Logger.Error("SubDelReq: Failed to update routing-manager. Err: %s, SubId: %v, Xid: %s", err, params.SubId, params.Xid) } xactKey := TransactionKey{payloadSeqNum, DELETE} xactValue := Transaction{*srcAddr, *srcPort, params} @@ -421,146 +441,177 @@ func (c *Control) trackDeleteTransaction(params *xapp.RMRParams, payloadSeqNum u } func (c *Control) handleSubscriptionDeleteResponse(params *xapp.RMRParams) (err error) { - xapp.Logger.Info("Subscription Delete Response Received from Src: %s, Mtype: %v, SubId: %v, Meid: %v",params.Src, params.Mtype, params.SubId, params.Meid) + 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 payloadSeqNum, err := c.e2ap.GetSubscriptionDeleteResponseSequenceNumber(params.Payload) if err != nil { - err = errors.New("Unable to get Subscription Sequence Number from Payload due to: " + err.Error()) + xapp.Logger.Error("SubDelResp: Unable to get Sequence Number from Payload. Dropping this msg. Err: %v, SubId: %v", err, params.SubId) return } - xapp.Logger.Info("Received payloadSeqNum: %v", payloadSeqNum) + xapp.Logger.Info("SubDelResp: Received payloadSeqNum: %v", payloadSeqNum) + + c.timerMap.StopTimer("RIC_SUB_DEL_REQ", int(payloadSeqNum)) - // should here be IsValidSequenceNumber check? -// c.timerMap.StopTimer(payloadSeqNum) - var transaction Transaction transaction, err = c.tracker.RetriveTransaction(payloadSeqNum, DELETE) - if err != nil { - xapp.Logger.Error("Failed to retrive transaction record. Err %v", err) - xapp.Logger.Info("Further processing of this Subscription Delete Response stopped. SubId: %v, Xid: %s",params.SubId, params.Xid) + if err != nil { + xapp.Logger.Error("SubDelResp: Failed to retrive transaction record. Dropping this msg. Err: %v, SubId: %v", err, params.SubId) return } - xapp.Logger.Info("Subscription ID: %v, from address: %v:%v. Forwarding response to requestor...", int(payloadSeqNum), transaction.XappInstanceAddress, transaction.XappPort) + xapp.Logger.Info("SubDelResp: SubId: %v, from address: %v:%v. Forwarding response to xApp", int(payloadSeqNum), transaction.XappInstanceAddress, transaction.XappPort) - params.SubId = int(payloadSeqNum) - params.Xid = transaction.OrigParams.Xid - xapp.Logger.Info("Forwarding Subscription Delete Response to UEEC: Mtype: %v, SubId: %v, Xid: %v, Meid: %v",params.Mtype, params.SubId, params.Xid, params.Meid) + 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("Failed to send response to requestor %v. SubId: %v, Xid: %s", err, params.SubId, params.Xid) -// return + xapp.Logger.Error("SubDelResp: Failed to send response to xApp. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + // return } time.Sleep(3 * time.Second) - xapp.Logger.Info("Starting routing manager update") + xapp.Logger.Info("SubDelResp: Starting routing manager update. SubId: %v, Xid: %s", params.SubId, params.Xid) subRouteAction := SubRouteInfo{DELETE, transaction.XappInstanceAddress, transaction.XappPort, payloadSeqNum} - c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) + err = c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) + if err != nil { + xapp.Logger.Error("SubDelResp: Failed to update routing manager. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + return + } - xapp.Logger.Info("Deleting trancaction record") + 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("Failed to delete a Subscription Delete Request transaction record due to %v", err) + 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) + return } return } -func (c *Control) handleSubscriptionDeleteFailure(params *xapp.RMRParams) (err error) { - xapp.Logger.Info("Subscription Delete Failure Received from Src: %s, Mtype: %v, SubId: %v, Meid: %v",params.Src, params.Mtype, params.SubId, params.Meid) +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 payloadSeqNum, err := c.e2ap.GetSubscriptionDeleteFailureSequenceNumber(params.Payload) if err != nil { - err = errors.New("Unable to get Subscription Sequence Number from Payload due to: " + err.Error()) + xapp.Logger.Error("SubDelFail: Unable to get Sequence Number from Payload. Dropping this msg. Err: %v, SubId: %v", err, params.SubId) return } - xapp.Logger.Info("Received payloadSeqNum: %v", payloadSeqNum) + xapp.Logger.Info("SubDelFail: Received payloadSeqNum: %v", payloadSeqNum) - // should here be IsValidSequenceNumber check? -// c.timerMap.StopTimer(payloadSeqNum) + c.timerMap.StopTimer("RIC_SUB_DEL_REQ", int(payloadSeqNum)) var transaction Transaction transaction, err = c.tracker.RetriveTransaction(payloadSeqNum, DELETE) - if err != nil { - xapp.Logger.Error("Failed to retrive transaction record. Err %v", err) - xapp.Logger.Info("Further processing of this Subscription Delete Failure stopped. SubId: %v, Xid: %s",params.SubId, params.Xid) + if err != nil { + xapp.Logger.Error("SubDelFail: Failed to retrive transaction record. Dropping msg. Err %v, SubId: %v", err, params.SubId) return } - xapp.Logger.Info("Subscription ID: %v, from address: %v:%v. Forwarding response to requestor...", int(payloadSeqNum), transaction.XappInstanceAddress, transaction.XappPort) + xapp.Logger.Info("SubDelFail: SubId: %v, from address: %v:%v. Forwarding response to xApp", int(payloadSeqNum), transaction.XappInstanceAddress, transaction.XappPort) - params.SubId = int(payloadSeqNum) - params.Xid = transaction.OrigParams.Xid - xapp.Logger.Info("Forwarding Subscription Delete Failure to UEEC: Mtype: %v, SubId: %v, Xid: %v, Meid: %v",params.Mtype, params.SubId, params.Xid, params.Meid) + 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 response to requestor %v. SubId: %v, Xid: %s", err, params.SubId, params.Xid) -// return + xapp.Logger.Error("Failed to send SubDelFail to xApp. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) + // return } time.Sleep(3 * time.Second) - xapp.Logger.Info("Starting routing manager update") + 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) + return + } - xapp.Logger.Info("Deleting trancaction record") + 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("Failed to delete a Subscription Delete Request transaction record due to %v", err) + 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 } return } -func (c *Control) handleSubscriptionDeleteRequestTimer(subId uint16) { - xapp.Logger.Info("Subscription Delete Request timer expired. SubId: %v",subId) -/* +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) sendSubscriptionDeleteFailure(subId uint16, causeContent uint8, causeVal uint8) { transaction, err := c.tracker.completeTransaction(subId, DELETE) if err != nil { - xapp.Logger.Error("Failed to delete a Subscription Delete Request transaction record due to %v", err) + xapp.Logger.Error("SendSubDelFail: Failed to delete transaction record. Err: %v, newSubId: %v", err, subId) return } - xapp.Logger.Info("SubId: %v, Xid %v, Meid: %v",subId, transaction.OrigParams.Xid, transaction.OrigParams.Meid) + 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 - payload := []byte("40CA4018000003EA7E00050000010016EA6300020021EA74000200C0") - params.PayloadLen = len(payload) - params.Payload = payload - xapp.Logger.Info("Forwarding Subscription Delete Failure to UEEC: Mtype: %v, SubId: %v, Xid: %s, Meid: %v",params.Mtype, params.SubId, params.Xid, params.Meid) +// 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("Failed to send response to requestor %v. SubId: %v, Xid: %s", err, params.SubId, params.Xid) + xapp.Logger.Error("SendSubDelFail: Failed to send response to xApp: Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) } -*/ -/* + time.Sleep(3 * time.Second) - xapp.Logger.Info("Subscription ID: %v, from address: %v:%v. Deleting transaction record", int(subId), transaction.XappInstanceAddress, transaction.XappPort) - xapp.Logger.Info("Starting routing manager update") - subRouteAction := SubRouteInfo{DELETE, transaction.XappInstanceAddress, transaction.XappPort, payloadSeqNum} - c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) + xapp.Logger.Info("SendSubDelFail: SubId: %v, from address: %v:%v. Deleting transaction record", int(subId), transaction.XappInstanceAddress, transaction.XappPort) - xapp.Logger.Info("Deleting trancaction record") - if c.registry.releaseSequenceNumber(payloadSeqNum) { - transaction, err = c.tracker.completeTransaction(payloadSeqNum, DELETE) + 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) + 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("Failed to delete a Subscription Delete Request transaction record due to %v", err) + xapp.Logger.Error("SendSubDelFail: Failed to delete transaction record. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid) return } + } else { + xapp.Logger.Error("SendSubDelFail: Failed to release sequency number. SubId: %v, Xid: %s", params.SubId, params.Xid) } -*/ return - } +} +*/