X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=cmd%2Frtmgr.go;h=834df26d15bfb386a2e00676b565d962cc923a8e;hb=bfeca7737cc003f149ca8b01d1aaf484dcb762d7;hp=2bb7f8d06e3314405e9557244a247aa622ce7a0c;hpb=cb93dbf2fac19dd49332847327b364be27d8bb71;p=ric-plt%2Frtmgr.git

diff --git a/cmd/rtmgr.go b/cmd/rtmgr.go
index 2bb7f8d..834df26 100644
--- a/cmd/rtmgr.go
+++ b/cmd/rtmgr.go
@@ -32,96 +32,18 @@
 */
 package main
 
-//TODO: change flag to pflag (won't need any argument parse)
-
 import (
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 	"os"
 	"os/signal"
 	"routing-manager/pkg/nbi"
-	"routing-manager/pkg/rpe"
+	"routing-manager/pkg/nbi/restful"
 	"routing-manager/pkg/rtmgr"
-	"routing-manager/pkg/sbi"
-	"routing-manager/pkg/sdl"
 	"syscall"
 	"time"
-	"sync"
 )
 
 const SERVICENAME = "rtmgr"
-const INTERVAL time.Duration = 60
-
-func initRtmgr() (nbiEngine nbi.Engine, sbiEngine sbi.Engine, sdlEngine sdl.Engine, rpeEngine rpe.Engine, err error) {
-	if nbiEngine, err = nbi.GetNbi(xapp.Config.GetString("nbi")); err == nil && nbiEngine != nil {
-		if sbiEngine, err = sbi.GetSbi(xapp.Config.GetString("sbi")); err == nil && sbiEngine != nil {
-			if sdlEngine, err = sdl.GetSdl(xapp.Config.GetString("sdl")); err == nil && sdlEngine != nil {
-				if rpeEngine, err = rpe.GetRpe(xapp.Config.GetString("rpe")); err == nil && rpeEngine != nil {
-					return nbiEngine, sbiEngine, sdlEngine, rpeEngine, nil
-				}
-			}
-		}
-	}
-	return nil, nil, nil, nil, err
-}
-
-func serveSBI(triggerSBI <-chan bool, sbiEngine sbi.Engine, sdlEngine sdl.Engine, rpeEngine rpe.Engine, m *sync.Mutex) {
-	for {
-		if <-triggerSBI {
-			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())
-				continue
-			}
-			sbiEngine.UpdateEndpoints(data)
-			policies := rpeEngine.GeneratePolicies(rtmgr.Eps, data)
-			err = sbiEngine.DistributeAll(policies)
-			if err != nil {
-				xapp.Logger.Error("Routing table cannot be published due to: " + err.Error())
-			}
-		}
-	}
-}
-
-func serve(nbiEngine nbi.Engine, sbiEngine sbi.Engine, sdlEngine sdl.Engine, rpeEngine rpe.Engine, m *sync.Mutex) {
-
-	triggerSBI := make(chan bool)
-
-	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, triggerSBI, m)
-	if nbiErr != nil {
-		xapp.Logger.Error("Failed to initialize nbi due to: " + nbiErr.Error())
-		return
-	}
-
-	err := sbiEngine.Initialize(xapp.Config.GetString("sbiurl"))
-	if err != nil {
-		xapp.Logger.Info("Failed to open push socket due to: " + err.Error())
-		return
-	}
-	defer nbiEngine.Terminate()
-	defer sbiEngine.Terminate()
-
-	// This SBI Go routine is trtiggered by periodic main loop and when data is recieved on REST interface.
-	go serveSBI(triggerSBI, sbiEngine, sdlEngine, rpeEngine, m)
-
-	for {
-		if xapp.Config.GetString("nbi") == "httpGetter" {
-			data, err := nbiEngine.(*nbi.HttpGetter).FetchAllXApps(xapp.Config.GetString("xmurl"))
-			if err != nil {
-				xapp.Logger.Error("Cannot fetch xapp data due to: " + err.Error())
-			} else if data != nil {
-				sdlEngine.WriteXApps(xapp.Config.GetString("rtfile"), data)
-			}
-		}
-
-		triggerSBI <- true
-
-		time.Sleep(INTERVAL * time.Second)
-		xapp.Logger.Debug("Periodic loop timed out. Setting triggerSBI flag to distribute updated routes.")
-	}
-}
 
 func SetupCloseHandler() {
 	c := make(chan os.Signal, 2)
@@ -134,20 +56,32 @@ func SetupCloseHandler() {
 }
 
 func main() {
-	nbiEngine, sbiEngine, sdlEngine, rpeEngine, err := initRtmgr()
-	if err != nil {
-		xapp.Logger.Error(err.Error())
-		os.Exit(1)
-	}
+
 	SetupCloseHandler()
+
 	xapp.Logger.Info("Start " + SERVICENAME + " service")
 	rtmgr.Eps = make(rtmgr.Endpoints)
+	rtmgr.Mtype = make(rtmgr.MessageTypeList)
+	rtmgr.Rtmgr_ready = false
+	rtmgr.RMRConnStatus = make(map[string]bool)
 
-	var m sync.Mutex
-
-	c := sbi.NewControl()
+	// RMR thread is starting port: 4560
+	c := nbi.NewControl()
 	go c.Run()
 
-	serve(nbiEngine, sbiEngine, sdlEngine, rpeEngine, &m)
+	// Waiting for RMR to be ready
+	time.Sleep(time.Duration(2) * time.Second)
+	for xapp.Rmr.IsReady() == false {
+		time.Sleep(time.Duration(2) * time.Second)
+	}
+
+	dummy_whid := int(xapp.Rmr.Openwh("rtmgr:4560"))
+	xapp.Logger.Info("created dummy Wormhole ID for routingmanager and dummy_whid :%d", dummy_whid)
+
+	go func() {
+		restful.LaunchRest(xapp.Config.GetString("nbiurl"))
+	}()
+
+	nbi.Serve()
 	os.Exit(0)
 }