"github.com/go-openapi/strfmt"
"github.com/spf13/viper"
"math/rand"
- "strconv"
"time"
"sync"
)
-var rmrSendMutex = &sync.Mutex{}
-
var subReqTime time.Duration = 2 * time.Second
var SubDelReqTime time.Duration = 2 * time.Second
registry *Registry
rtmgrClient *RtmgrClient
tracker *Tracker
- rcChan chan *xapp.RMRParams
timerMap *TimerMap
+ rmrSendMutex *sync.Mutex
}
type RMRMeid struct {
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)
timerMap := new(TimerMap)
timerMap.Init()
+ rmrSendMutex := &sync.Mutex{}
+
transport := httptransport.New(viper.GetString("rtmgr.HostAddr")+":"+viper.GetString("rtmgr.port"), viper.GetString("rtmgr.baseUrl"), []string{"http"})
client := rtmgrclient.New(transport, strfmt.Default)
handle := rtmgrhandle.NewProvideXappSubscriptionHandleParamsWithTimeout(10 * time.Second)
deleteHandle := rtmgrhandle.NewDeleteXappSubscriptionHandleParamsWithTimeout(10 * time.Second)
rtmgrClient := RtmgrClient{client, handle, deleteHandle}
- return Control{new(E2ap), registry, &rtmgrClient, tracker, make(chan *xapp.RMRParams),timerMap}
+ return Control{new(E2ap), registry, &rtmgrClient, tracker, timerMap, rmrSendMutex}
}
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
- rmrSendMutex.Lock()
for ; i <= 10 && status == false; i++ {
+ c.rmrSendMutex.Lock()
status = xapp.Rmr.Send(params, false)
+ c.rmrSendMutex.Unlock()
if status == false {
xapp.Logger.Info("rmr.Send() failed. Retry count %v, Mtype: %v, SubId: %v, Xid %s",i, params.Mtype, params.SubId, params.Xid)
time.Sleep(500 * time.Millisecond)
err = errors.New("rmr.Send() failed")
xapp.Rmr.Free(params.Mbuf)
}
- rmrSendMutex.Unlock()
-
- /*
- if !xapp.Rmr.Send(params, false) {
- err = errors.New("rmr.Send() failed")
- xapp.Rmr.Free(params.Mbuf)
- }
- */
return
}
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)
+ 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)
+ 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
}
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)
-
- //time.Sleep(3 * time.Second)
+ xapp.Logger.Info("SubReq: Starting routing manager update. SubId: %v, Xid: %s", params.SubId, params.Xid)
+ err = c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
+ if err != nil {
+ xapp.Logger.Error("SubReq: Failed to update routing manager. Dropping this SubReq msg. Err: %v, SubId: %v, Xid: %s", err, params.SubId, params.Xid)
+ 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)
+ xapp.Logger.Error("SubReq: 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.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.Xid, 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
}
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)
+ 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)
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)
+ xapp.Logger.Error("SubFail: Failed to retrive transaction record. Dropping this msg. Err: %v, SubId: %v: %s", 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")
- subRouteAction := SubRouteInfo{DELETE, transaction.XappInstanceAddress, transaction.XappPort, payloadSeqNum}
- c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
+ xapp.Logger.Info("SubFail: Starting routing manager update. SubId: %v, Xid: %s", params.SubId, params.Xid)
+ subRouteAction := SubRouteInfo{CREATE, transaction.XappInstanceAddress, transaction.XappPort, payloadSeqNum}
+ err = c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
+ 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 trancaction 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
}
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)
+ xapp.Logger.Info("Forwarding Subscription 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)
actions := [...]string{
"CREATE",
"MERGE",
+ "NONE",
"DELETE",
}
}
}
-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)
+ 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(payloadSeqNum, SubDelReqTime, c.handleSubscriptionDeleteRequestTimer)
}*/
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}
}
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: %, SubId: %v", err, params.SubId)
return
}
- xapp.Logger.Info("Received payloadSeqNum: %v", payloadSeqNum)
+ xapp.Logger.Info("SubDelResp: Received payloadSeqNum: %v", 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)
+ 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)
+ 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)
+ 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 trancaction 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: %, 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)
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)
+ 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)
+ 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)
+ 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 trancaction 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. SubId: %v, Xid: %s", err, params.SubId, params.Xid)
+ return
}
return
}
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)
+ xapp.Logger.Info("Forwarding Subscription Delete 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)
Code Review / ric-plt / submgr.git / blobdiff