v0.11.0 tag. Initial working version with dynamic routing

[ric-plt/submgr.git] / pkg / control / control.go

diff --git a/pkg/control/control.go b/pkg/control/control.go
index af629a1..d27844e 100644 (file)
--- a/pkg/control/control.go
+++ b/pkg/control/control.go
@@ -111,9 +111,10 @@ func (c *Control) Consume(rp *xapp.RMRParams) (err error) {
 func (c *Control) rmrSend(params *xapp.RMRParams) (err error) {
        status := false
        i := 1
-       rmrSendMutex.Lock()
        for ; i <= 10 && status == false; i++ { 
+               rmrSendMutex.Lock()
                status = xapp.Rmr.Send(params, false)
+               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)
@@ -123,7 +124,6 @@ func (c *Control) rmrSend(params *xapp.RMRParams) (err error) {
                err = errors.New("rmr.Send() failed")
                xapp.Rmr.Free(params.Mbuf)
        }
-       rmrSendMutex.Unlock()
        
        /*
        if !xapp.Rmr.Send(params, false) {
@@ -172,7 +172,7 @@ func (c *Control) handleSubscriptionRequest(params *xapp.RMRParams) (err error)
                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())
                return
@@ -214,7 +214,7 @@ func (c *Control) handleSubscriptionRequest(params *xapp.RMRParams) (err error)
 }
 
 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)
+       xapp.Logger.Info("Subscription Response 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
 
@@ -297,7 +297,7 @@ func (c *Control) handleSubscriptionFailure(params *xapp.RMRParams) (err error)
        time.Sleep(3 * time.Second)
 
        xapp.Logger.Info("Starting routing manager update")
-       subRouteAction := SubRouteInfo{DELETE, transaction.XappInstanceAddress, transaction.XappPort, payloadSeqNum}
+       subRouteAction := SubRouteInfo{CREATE, transaction.XappInstanceAddress, transaction.XappPort, payloadSeqNum}
        c.rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
 
        xapp.Logger.Info("Deleting trancaction record")