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

diff --git a/E2Manager/app/main.go b/E2Manager/app/main.go
old mode 100644
new mode 100755
index fa71c78..f8510ea
--- a/E2Manager/app/main.go
+++ b/E2Manager/app/main.go
@@ -35,19 +35,17 @@ 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 (
-	GeneralKey             = "GENERAL"
-	GeneralKeyDefaultValue = "{\"enableRic\":true}"
-)
+const GeneralKeyDefaultValue = "{\"enableRic\":true}"
 
-func initKeys(logger *logger.Logger, sdl *sdlgo.SdlInstance) error {
-	ok, err := sdl.SetIfNotExists(GeneralKey, GeneralKeyDefaultValue)
+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")
@@ -73,8 +71,7 @@ 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 {
@@ -82,7 +79,7 @@ func main() {
 	}
 
 	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)
 
@@ -123,5 +120,6 @@ func main() {
 	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)
 }