X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fapp%2Fmain.go;h=f8510eaf47de6ec4e62adb7fa5eef49b49e36012;hb=31f9dc43d6efaa269670a1cfdbf0bf004a52e48a;hp=eebd7730317006d7681125ec92dcd0f61695fbc2;hpb=a269db89a144d3f041eb265c9aa2e7633142429f;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/app/main.go b/E2Manager/app/main.go
old mode 100644
new mode 100755
index eebd773..f8510ea
--- a/E2Manager/app/main.go
+++ b/E2Manager/app/main.go
@@ -35,12 +35,33 @@ import (
 	"e2mgr/services/rmrreceiver"
 	"e2mgr/services/rmrsender"
 	"fmt"
+	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
 	"gerrit.o-ran-sc.org/r/ric-plt/sdlgo"
 	"os"
 	"strconv"
 )
 
+const GeneralKeyDefaultValue = "{\"enableRic\":true}"
+
+func initKeys(logger *logger.Logger, sdl *sdlgo.SyncStorage) error {
+	ok, err := sdl.SetIfNotExists(common.GetRNibNamespace(), common.BuildGeneralConfigurationKey(), GeneralKeyDefaultValue)
+
+	if err != nil {
+		logger.Errorf("#app.main - Failed setting GENERAL key")
+		return err
+	}
+
+	if ok {
+		logger.Infof("#app.main - Successfully set GENERAL key")
+	} else {
+		logger.Infof("#app.main - GENERAL key exists, no need to set")
+	}
+
+	return nil
+
+}
+
 func main() {
 	config := configuration.ParseConfiguration()
 	logLevel, _ := logger.LogLevelTokenToLevel(config.Logging.LogLevel)
@@ -50,10 +71,15 @@ func main() {
 		os.Exit(1)
 	}
 	logger.Infof("#app.main - Configuration %s", config)
-	db := sdlgo.NewDatabase()
-	sdl := sdlgo.NewSdlInstance("e2Manager", db)
+	sdl := sdlgo.NewSyncStorage()
+	err = initKeys(logger, sdl)
+
+	if err != nil {
+		os.Exit(1)
+	}
+
 	defer sdl.Close()
-	rnibDataService := services.NewRnibDataService(logger, config, reader.GetRNibReader(sdl), rNibWriter.GetRNibWriter(sdl, config.RnibWriter))
+	rnibDataService := services.NewRnibDataService(logger, config, reader.GetNewRNibReader(sdl), rNibWriter.GetRNibWriter(sdl, config.RnibWriter))
 
 	ranListManager := managers.NewRanListManager(logger, rnibDataService)
 
@@ -81,6 +107,7 @@ func main() {
 	rmrReceiver := rmrreceiver.NewRmrReceiver(logger, rmrMessenger, notificationManager)
 	nodebValidator := managers.NewNodebValidator()
 	updateEnbManager := managers.NewUpdateEnbManager(logger, rnibDataService, nodebValidator)
+	updateGnbManager := managers.NewUpdateGnbManager(logger, rnibDataService, nodebValidator)
 
 	e2tInstancesManager.ResetKeepAliveTimestampsForAllE2TInstances()
 
@@ -89,9 +116,10 @@ func main() {
 	go rmrReceiver.ListenAndHandle()
 	go e2tKeepAliveWorker.Execute()
 
-	httpMsgHandlerProvider := httpmsghandlerprovider.NewIncomingRequestHandlerProvider(logger, rmrSender, config, rnibDataService, e2tInstancesManager, routingManagerClient, ranConnectStatusChangeManager, nodebValidator, updateEnbManager, ranListManager)
+	httpMsgHandlerProvider := httpmsghandlerprovider.NewIncomingRequestHandlerProvider(logger, rmrSender, config, rnibDataService, e2tInstancesManager, routingManagerClient, ranConnectStatusChangeManager, nodebValidator, updateEnbManager, updateGnbManager, ranListManager)
 	rootController := controllers.NewRootController(rnibDataService)
 	nodebController := controllers.NewNodebController(logger, httpMsgHandlerProvider)
 	e2tController := controllers.NewE2TController(logger, httpMsgHandlerProvider)
-	_ = httpserver.Run(logger, config.Http.Port, rootController, nodebController, e2tController)
+	symptomController := controllers.NewSymptomdataController(logger, httpMsgHandlerProvider, rnibDataService, ranListManager)
+	_ = httpserver.Run(logger, config.Http.Port, rootController, nodebController, e2tController, symptomController)
 }