X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fnbi%2Fcontrol.go;h=bd1bf4bd6af54112cbb5739e45a11c4760679995;hb=069353a1a5ce5c140612573976efa2600e7e0c37;hp=2ed63d8ae5ff8816c226bb62b884c38ad20e3dd1;hpb=505e2497ce651c1127ffbcefe396b3f8c0d0f9dd;p=ric-plt%2Frtmgr.git

diff --git a/pkg/nbi/control.go b/pkg/nbi/control.go
index 2ed63d8..bd1bf4b 100644
--- a/pkg/nbi/control.go
+++ b/pkg/nbi/control.go
@@ -74,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")
 }
 
@@ -108,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)
@@ -146,7 +146,7 @@ func (c *Control) handleUpdateToRoutingManagerRequest(params *xapp.RMRParams) {
 	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 avail in complete ep list: ", string(params.Payload))
+			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
 		}
 	}
@@ -163,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
 	}
 }
@@ -178,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")
 		}
 	}
@@ -228,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
 	}
 
@@ -244,9 +244,11 @@ func Serve() {
 	go updateEp()
 	time.Sleep(5 * time.Second)
 	sendRoutesToAll()
-	/* Sometimes first message  fails, retry after 5 sec */
-	time.Sleep(5 * time.Second)
-	sendRoutesToAll()
+	for i := 0; i <= 5; i++ {
+		/* Sometimes first message  fails, retry after 5 sec */
+		time.Sleep(10 * time.Second)
+		sendRoutesToAll()
+	}
 
 	for {
 		xapp.Logger.Debug("Periodic Routes value = %s", xapp.Config.GetString("periodicroutes"))