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

diff --git a/pkg/nbi/control.go b/pkg/nbi/control.go
index a1e9c77..2ed63d8 100644
--- a/pkg/nbi/control.go
+++ b/pkg/nbi/control.go
@@ -27,19 +27,22 @@ import "C"
 import (
 	"errors"
 	//"fmt"
-	"net/http"
 	"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
@@ -97,24 +100,6 @@ 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"]:
-				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)*/
 	}
 }
 
@@ -157,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 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())
@@ -179,25 +168,53 @@ func (c *Control) handleUpdateToRoutingManagerRequest(params *xapp.RMRParams) {
 	}
 }
 
-func sendRoutesToAll() (err error) {
-
+func getConfigData() (*rtmgr.RicComponents, error) {
+	var data *rtmgr.RicComponents
 	m.Lock()
 	data, err := sdlEngine.ReadAll(xapp.Config.GetString("rtfile"))
-	//fmt.Printf("data = %v,%v,%v",data,sdlEngine,sbiEngine)
+
 	m.Unlock()
 	if data == nil {
 		if err != nil {
-			return errors.New("Cannot get data from sdl interface due to: " + err.Error())
+			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")
-			return errors.New("Cannot get data from sdl interface")
+			return nil, errors.New("Cannot get data from sdl interface")
 		}
 	}
 
-	/*	if sbiEngine == nil {
-		fmt.Printf("SBI is nil")
-	}*/
+	return data, nil
+}
+
+func updateEp() (err error) {
+	data, err := getConfigData()
+	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
+}
+
+func sendRoutesToAll() (err error) {
+
+	data, err := getConfigData()
+	if err != nil {
+		return errors.New("Routing table cannot be published due to: " + err.Error())
+	}
+
 	policies := rpeEngine.GeneratePolicies(rtmgr.Eps, data)
 	err = sbiEngine.DistributeAll(policies)
 	if err != nil {
@@ -223,8 +240,21 @@ func Serve() {
 	defer nbiEngine.Terminate()
 	defer sbiEngine.Terminate()
 
+	/* 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)