X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=pkg%2Fnbi%2Fcontrol.go;h=98d7821dd0412062fa309ae78d4734fa5a483eb3;hb=930db799fe886da7b2c80f89ed3f67c0433c4ed7;hp=d88f5b071670c17d887cdd95307831ad76d3668d;hpb=0770de6e47404e68fc9cbb59263648ac54864aef;p=ric-plt%2Frtmgr.git

diff --git a/pkg/nbi/control.go b/pkg/nbi/control.go
index d88f5b0..98d7821 100644
--- a/pkg/nbi/control.go
+++ b/pkg/nbi/control.go
@@ -30,16 +30,19 @@ import (
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 	"net/http"
 	"os"
+	"routing-manager/pkg/models"
 	"routing-manager/pkg/rpe"
 	"routing-manager/pkg/rtmgr"
 	"routing-manager/pkg/sbi"
 	"routing-manager/pkg/sdl"
 	"strconv"
+	"strings"
 	"sync"
 	"time"
 )
 
 var m sync.Mutex
+var EndpointLock sync.Mutex
 
 var nbiEngine Engine
 var sbiEngine sbi.Engine
@@ -71,7 +74,7 @@ func (c *Control) Run() {
 }
 
 func (c *Control) SymptomDataHandler(w http.ResponseWriter, r *http.Request) {
-	resp, _ := dumpDebugData()
+	resp, _ := DumpDebugData()
 	xapp.Resource.SendSymptomDataJson(w, r, resp, "platform/rttable.json")
 }
 
@@ -105,13 +108,13 @@ func (c *Control) recievermr(msg *xapp.RMRParams) {
 	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")
+			xapp.Logger.Info("Update route Table Request(RMR -> RM), message discarded as routing manager is not ready")
 		} else {
-			xapp.Logger.Info("Update Route Table Request(RMR to RM)")
+			xapp.Logger.Info("Update Route Table Request(RMR -> 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)
+		xapp.Logger.Info("State of route 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)
@@ -139,11 +142,15 @@ func (c *Control) handleUpdateToRoutingManagerRequest(params *xapp.RMRParams) {
 		}
 	}
 
-	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
+	/* hack with WA only for mcxapp in near future */
+	if strings.Contains(msg.String(), "ricxapp") {
+		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 available 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())
@@ -156,7 +163,7 @@ func (c *Control) handleUpdateToRoutingManagerRequest(params *xapp.RMRParams) {
 	policies := rpeEngine.GeneratePolicies(rtmgr.Eps, data)
 	err = sbiEngine.DistributeToEp(policies, *epstr, whid)
 	if err != nil {
-		xapp.Logger.Error("Routing table cannot be published due to: " + err.Error())
+		xapp.Logger.Error("Not able to publish the routing table due to: " + err.Error())
 		return
 	}
 }
@@ -171,7 +178,7 @@ func getConfigData() (*rtmgr.RicComponents, error) {
 		if err != nil {
 			return nil, 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")
+			xapp.Logger.Debug("Cannot get data from sdl interface due to data is null")
 			return nil, errors.New("Cannot get data from sdl interface")
 		}
 	}
@@ -184,7 +191,19 @@ func updateEp() (err error) {
 	if err != nil {
 		return errors.New("Routing table cannot be published due to: " + err.Error())
 	}
+	EndpointLock.Lock()
 	sbiEngine.UpdateEndpoints(data)
+	EndpointLock.Unlock()
+
+	return nil
+}
+
+func sendPartialRoutesToAll(xappSubData *models.XappSubscriptionData, updatetype rtmgr.RMRUpdateType) (err error) {
+	policies := rpeEngine.GeneratePartialPolicies(rtmgr.Eps, xappSubData, updatetype)
+	err = sbiEngine.DistributeAll(policies)
+	if err != nil {
+		return errors.New("Routing table cannot be published due to: " + err.Error())
+	}
 
 	return nil
 }
@@ -209,7 +228,7 @@ func Serve() {
 
 	nbiErr := nbiEngine.Initialize(xapp.Config.GetString("xmurl"), xapp.Config.GetString("nbiurl"), xapp.Config.GetString("rtfile"), xapp.Config.GetString("cfgfile"), xapp.Config.GetString("e2murl"), sdlEngine, rpeEngine, &m)
 	if nbiErr != nil {
-		xapp.Logger.Error("Failed to initialize nbi due to: " + nbiErr.Error())
+		xapp.Logger.Error("Initialization of nbi failed due to: " + nbiErr.Error())
 		return
 	}
 
@@ -224,9 +243,18 @@ func Serve() {
 	/* used for rtmgr restart case to connect to Endpoints */
 	go updateEp()
 	time.Sleep(5 * time.Second)
+	sendRoutesToAll()
+	/* Sometimes first message  fails, retry after 5 sec */
+	time.Sleep(5 * time.Second)
+	sendRoutesToAll()
 
 	for {
-		sendRoutesToAll()
+		xapp.Logger.Debug("Periodic Routes value = %s", xapp.Config.GetString("periodicroutes"))
+		if xapp.Config.GetString("periodicroutes") == "enable" {
+			go updateEp()
+			time.Sleep(5 * time.Second)
+			sendRoutesToAll()
+		}
 
 		rtmgr.Rtmgr_ready = true
 		time.Sleep(INTERVAL * time.Second)