X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=cmd%2Frtmgr.go;h=24b917c4ee696f05ded1c551cbdff4a7028c9883;hb=refs%2Fchanges%2F38%2F1838%2F1;hp=f2b39033f5f0c8563fa29846b1203aaa96f3346e;hpb=92162653c9741f2417d1a36ec1c211d6863d0a68;p=ric-plt%2Frtmgr.git

diff --git a/cmd/rtmgr.go b/cmd/rtmgr.go
index f2b3903..24b917c 100644
--- a/cmd/rtmgr.go
+++ b/cmd/rtmgr.go
@@ -26,6 +26,7 @@
 */
 package main
 
+//TODO: change flag to pflag (won't need any argument parse)
 import (
 	"flag"
 	"os"
@@ -50,29 +51,24 @@ func parseArgs() {
 	// TODO: arguments should be validated (filename; xm-url; sbi-if; rest-url; rest-port)
 	args = make(map[string]*string)
 	args["configfile"] = flag.String("configfile", "/etc/rtmgrcfg.json", "Routing manager's configuration file path")
-	args["nbi"] = flag.String("nbi", "httpGetter", "Northbound interface module to be used. Valid values are: 'httpGetter | httpRESTful'")
-	args["sbi"] = flag.String("sbi", "nngpush", "Southbound interface module to be used. Valid values are: 'nngpush | nngpub'")
-	args["rpe"] = flag.String("rpe", "rmrpush", "Route Policy Engine to be used. Valid values are: 'rmrpush | rmrpub'")
-	args["sdl"] = flag.String("sdl", "file", "Datastore enginge to be used. Valid values are: 'file'")
+	args["nbi"] = flag.String("nbi", "httpRESTful", "Northbound interface module to be used. Valid values are: 'httpGetter | httpRESTful'")
+	args["sbi"] = flag.String("sbi", "nngpush", "Southbound interface module to be used. Valid values are: 'nngpush")
+	args["rpe"] = flag.String("rpe", "rmrpush", "Route Policy Engine to be used. Valid values are: 'rmrpush'")
+	args["sdl"] = flag.String("sdl", "file", "Data store engine to be used. Valid values are: 'file'")
 	args["xm-url"] = flag.String("xm-url", "http://localhost:3000/xapps", "HTTP URL where xApp Manager exposes the entire xApp List")
 	args["nbi-if"] = flag.String("nbi-if", "http://localhost:8888", "Base HTTP URL where routing manager will be listening on")
 	args["sbi-if"] = flag.String("sbi-if", "0.0.0.0", "IPv4 address of interface where Southbound socket to be opened")
 	args["filename"] = flag.String("filename", "/db/rt.json", "Absolute path of file where the route information to be stored")
-	args["loglevel"] = flag.String("loglevel", "INFO", "INFO | WARN | ERROR | DEBUG")
+	args["loglevel"] = flag.String("loglevel", "INFO", "INFO | WARN | ERROR | DEBUG | TRACE")
 	flag.Parse()
 }
 
-func initRtmgr() (nbi.NbiEngine, sbi.SbiEngine, sdl.SdlEngine, rpe.RpeEngine, error) {
-	var err error
-	var nbii nbi.NbiEngine
-	var sbii sbi.SbiEngine
-	var sdli sdl.SdlEngine
-	var rpei rpe.RpeEngine
-	if nbii, err = nbi.GetNbi(*args["nbi"]); err == nil && nbii != nil {
-		if sbii, err = sbi.GetSbi(*args["sbi"]); err == nil && sbii != nil {
-			if sdli, err = sdl.GetSdl(*args["sdl"]); err == nil && sdli != nil {
-				if rpei, err = rpe.GetRpe(*args["rpe"]); err == nil && rpei != nil {
-					return nbii, sbii, sdli, rpei, nil
+func initRtmgr() (nbiEngine nbi.Engine, sbiEngine sbi.Engine, sdlEngine sdl.Engine, rpeEngine rpe.Engine, err error) {
+	if nbiEngine, err = nbi.GetNbi(*args["nbi"]); err == nil && nbiEngine != nil {
+		if sbiEngine, err = sbi.GetSbi(*args["sbi"]); err == nil && sbiEngine != nil {
+			if sdlEngine, err = sdl.GetSdl(*args["sdl"]); err == nil && sdlEngine != nil {
+				if rpeEngine, err = rpe.GetRpe(*args["rpe"]); err == nil && rpeEngine != nil {
+					return nbiEngine, sbiEngine, sdlEngine, rpeEngine, nil
 				}
 			}
 		}
@@ -80,38 +76,38 @@ func initRtmgr() (nbi.NbiEngine, sbi.SbiEngine, sdl.SdlEngine, rpe.RpeEngine, er
 	return nil, nil, nil, nil, err
 }
 
-func serveSBI(triggerSBI <-chan bool, sbiEngine sbi.SbiEngine, sdlEngine sdl.SdlEngine, rpeEngine rpe.RpeEngine) {
+func serveSBI(triggerSBI <-chan bool, sbiEngine sbi.Engine, sdlEngine sdl.Engine, rpeEngine rpe.Engine) {
 	for {
 		if <-triggerSBI {
 			data, err := sdlEngine.ReadAll(*args["filename"])
 			if err != nil || data == nil {
-				rtmgr.Logger.Error("cannot get data from sdl interface due to: " + err.Error())
+				rtmgr.Logger.Error("Cannot get data from sdl interface due to: " + err.Error())
 				continue
 			}
 			sbiEngine.UpdateEndpoints(data)
 			policies := rpeEngine.GeneratePolicies(rtmgr.Eps)
 			err = sbiEngine.DistributeAll(policies)
 			if err != nil {
-				rtmgr.Logger.Error("routing rable cannot be published due to: " + err.Error())
+				rtmgr.Logger.Error("Routing table cannot be published due to: " + err.Error())
 			}
 		}
 	}
 }
 
-func serve(nbiEngine nbi.NbiEngine, sbiEngine sbi.SbiEngine, sdlEngine sdl.SdlEngine, rpeEngine rpe.RpeEngine) {
+func serve(nbiEngine nbi.Engine, sbiEngine sbi.Engine, sdlEngine sdl.Engine, rpeEngine rpe.Engine) {
 
 	triggerSBI := make(chan bool)
 
 	nbiErr := nbiEngine.Initialize(*args["xm-url"], *args["nbi-if"], *args["filename"], *args["configfile"],
-					sdlEngine, rpeEngine, triggerSBI)
+		sdlEngine, rpeEngine, triggerSBI)
 	if nbiErr != nil {
-		rtmgr.Logger.Error("fail to initialize nbi due to: " + nbiErr.Error())
+		rtmgr.Logger.Error("Failed to initialize nbi due to: " + nbiErr.Error())
 		return
 	}
 
 	err := sbiEngine.Initialize(*args["sbi-if"])
 	if err != nil {
-		rtmgr.Logger.Info("fail to open pub socket due to: " + err.Error())
+		rtmgr.Logger.Info("Failed to open push socket due to: " + err.Error())
 		return
 	}
 	defer nbiEngine.Terminate()
@@ -123,11 +119,11 @@ func serve(nbiEngine nbi.NbiEngine, sbiEngine sbi.SbiEngine, sdlEngine sdl.SdlEn
 	for {
 		time.Sleep(INTERVAL * time.Second)
 		if *args["nbi"] == "httpGetter" {
-			data, err := nbiEngine.(*nbi.HttpGetter).FetchAllXapps(*args["xm-url"])
+			data, err := nbiEngine.(*nbi.HttpGetter).FetchAllXApps(*args["xm-url"])
 			if err != nil {
-				rtmgr.Logger.Error("cannot fetch xapp data dute to: " + err.Error())
+				rtmgr.Logger.Error("Cannot fetch xapp data due to: " + err.Error())
 			} else if data != nil {
-				sdlEngine.WriteXapps(*args["filename"], data)
+				sdlEngine.WriteXApps(*args["filename"], data)
 			}
 		}