X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fnbi%2Fcontrol.go;h=bd1bf4bd6af54112cbb5739e45a11c4760679995;hb=069353a1a5ce5c140612573976efa2600e7e0c37;hp=02899c6fd045d7c7db448a18bf4eb63fb30d1749;hpb=8c690b8970f4409ddf6fee547b6246839b88c247;p=ric-plt%2Frtmgr.git diff --git a/pkg/nbi/control.go b/pkg/nbi/control.go index 02899c6..bd1bf4b 100644 --- a/pkg/nbi/control.go +++ b/pkg/nbi/control.go @@ -28,17 +28,21 @@ import ( "errors" //"fmt" "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 @@ -63,9 +67,17 @@ func (c *Control) Run() { xapp.Logger.Error(err.Error()) os.Exit(1) } + + xapp.Resource.InjectRoute("/ric/v1/symptomdata", c.SymptomDataHandler, "GET") + xapp.Run(c) } +func (c *Control) SymptomDataHandler(w http.ResponseWriter, r *http.Request) { + resp, _ := DumpDebugData() + xapp.Resource.SendSymptomDataJson(w, r, resp, "platform/rttable.json") +} + func (c *Control) Consume(rp *xapp.RMRParams) (err error) { c.rcChan <- rp return @@ -88,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)*/ } } @@ -114,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) @@ -148,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()) @@ -165,30 +163,58 @@ 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 } } -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") + xapp.Logger.Debug("Cannot get data from sdl interface due to data is null") + 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 { @@ -202,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 } @@ -214,8 +240,23 @@ func Serve() { defer nbiEngine.Terminate() defer sbiEngine.Terminate() - for { + /* used for rtmgr restart case to connect to Endpoints */ + go updateEp() + 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")) + if xapp.Config.GetString("periodicroutes") == "enable" { + go updateEp() + time.Sleep(5 * time.Second) + sendRoutesToAll() + } rtmgr.Rtmgr_ready = true time.Sleep(INTERVAL * time.Second)