X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fnbi%2Fcontrol.go;h=5eff85263d892e26eeb4c11e70778707afb50397;hb=refs%2Fchanges%2F19%2F5019%2F1;hp=5483abac38609a3c15e29ea20009fc24b9c62256;hpb=2c131acf0418c45d9045a6a81baf3e7d047fcb38;p=ric-plt%2Frtmgr.git

diff --git a/pkg/nbi/control.go b/pkg/nbi/control.go
index 5483aba..5eff852 100644
--- a/pkg/nbi/control.go
+++ b/pkg/nbi/control.go
@@ -35,6 +35,7 @@ import (
 	"sync"
 	"time"
 	"os"
+	"fmt"
 )
 
 var m sync.Mutex
@@ -87,6 +88,8 @@ func initRtmgr() (nbiEngine Engine, sbiEngine sbi.Engine, sdlEngine sdl.Engine,
 func (c *Control) controlLoop() {
 	for {
 		msg := <-c.rcChan
+		c.recievermr(msg)
+		/*
 		xapp_msg := sbi.RMRParams{msg}
 		switch msg.Mtype {
 		case xapp.RICMessageTypes["RMRRM_REQ_TABLE"]:
@@ -103,10 +106,29 @@ func (c *Control) controlLoop() {
 			err := errors.New("Message Type " + strconv.Itoa(msg.Mtype) + " is discarded")
 			xapp.Logger.Error("Unknown message type: %v", err)
 		}
-		xapp.Rmr.Free(msg.Mbuf)
+		xapp.Rmr.Free(msg.Mbuf)*/
 	}
 }
 
+func (c *Control) recievermr(msg *xapp.RMRParams) {
+	xapp_msg := sbi.RMRParams{msg}
+        switch msg.Mtype {
+        case xapp.RICMessageTypes["RMRRM_REQ_TABLE"]:
+	if rtmgr.Rtmgr_ready == false {
+		xapp.Logger.Info("Update Route Table Request(RMR to RM), message discarded as routing manager is not ready")
+        } else {
+                xapp.Logger.Info("Update Route Table Request(RMR to RM)")
+                go c.handleUpdateToRoutingManagerRequest(msg)
+        }
+        case xapp.RICMessageTypes["RMRRM_TABLE_STATE"]:
+                xapp.Logger.Info("state of table to route mgr %s,payload %s", xapp_msg.String(), msg.Payload)
+        default:
+                err := errors.New("Message Type " + strconv.Itoa(msg.Mtype) + " is discarded")
+                xapp.Logger.Error("Unknown message type: %v", err)
+        }
+        xapp.Rmr.Free(msg.Mbuf)
+}
+
 func (c *Control) handleUpdateToRoutingManagerRequest(params *xapp.RMRParams) {
 
 	msg := sbi.RMRParams{params}
@@ -117,19 +139,32 @@ func (c *Control) handleUpdateToRoutingManagerRequest(params *xapp.RMRParams) {
 	m.Lock()
 	data, err := sdlEngine.ReadAll(xapp.Config.GetString("rtfile"))
 	m.Unlock()
-	if err != nil || data == nil {
-		xapp.Logger.Error("Cannot get data from sdl interface due to: " + err.Error())
-		return
-	}
+        if data == nil {
+                if err != nil {
+                        xapp.Logger.Error("Cannot get data from sdl interface due to: " + err.Error())
+                        return
+                } else {
+                        xapp.Logger.Debug("Cannot get data from sdl interface")
+                        return
+                }
+        }
 
-	ep := sbiEngine.CreateEndpoint(string(params.Payload))
+	ep := sbiEngine.CheckEndpoint(string(params.Payload))
 	if ep == nil {
 		xapp.Logger.Error("Update Routing Table Request can't handle due to end point %s is not avail in complete ep list: ", string(params.Payload))
 		return
 	}
+	epstr,whid := sbiEngine.CreateEndpoint(msg.String())
+	if epstr == nil || whid < 0 {
+		xapp.Logger.Error("Wormhole Id creation failed %d for %s",whid,msg.String() )
+		return
+	}
 
+	/*This is to ensure the latest routes are sent.
+	Assumption is that in this time interval the routes are built for this endpoint */
+        time.Sleep(100 * time.Millisecond)
 	policies := rpeEngine.GeneratePolicies(rtmgr.Eps, data)
-	err = sbiEngine.DistributeToEp(policies, ep)
+	err = sbiEngine.DistributeToEp(policies, *epstr, whid)
 	if err != nil {
 		xapp.Logger.Error("Routing table cannot be published due to: " + err.Error())
 		return
@@ -140,10 +175,20 @@ func sendRoutesToAll() (err error) {
 
         m.Lock()
         data, err := sdlEngine.ReadAll(xapp.Config.GetString("rtfile"))
+	fmt.Printf("data = %v,%v,%v",data,sdlEngine,sbiEngine)
         m.Unlock()
-        if err != nil || data == nil {
-                return errors.New("Cannot get data from sdl interface due to: " + err.Error())
-        }
+	if data == nil {
+	        if err != nil {
+			return errors.New("Cannot get data from sdl interface due to: " + err.Error())
+	        } else {
+	                xapp.Logger.Debug("Cannot get data from sdl interface, data is null")
+	                return errors.New("Cannot get data from sdl interface")
+	        }
+	}
+
+	if sbiEngine == nil {
+		fmt.Printf("SBI is nil")
+	}
         sbiEngine.UpdateEndpoints(data)
         policies := rpeEngine.GeneratePolicies(rtmgr.Eps, data)
         err = sbiEngine.DistributeAll(policies)