Replace deprecated SDL APIs

[ric-plt/e2mgr.git] / E2Manager / app / main.go

diff --git a/E2Manager/app/main.go b/E2Manager/app/main.go
old mode 100644 (file)
new mode 100755 (executable)
index 109a0da..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)
 
@@ -75,12 +101,13 @@ func main() {
        e2tShutdownManager := managers.NewE2TShutdownManager(logger, config, rnibDataService, e2tInstancesManager, e2tAssociationManager, ranConnectStatusChangeManager)
        e2tKeepAliveWorker := managers.NewE2TKeepAliveWorker(logger, rmrSender, e2tInstancesManager, e2tShutdownManager, config)
        rmrNotificationHandlerProvider := rmrmsghandlerprovider.NewNotificationHandlerProvider()
-       rmrNotificationHandlerProvider.Init(logger, config, rnibDataService, rmrSender, e2tInstancesManager, routingManagerClient, e2tAssociationManager, ranConnectStatusChangeManager)
+       rmrNotificationHandlerProvider.Init(logger, config, rnibDataService, rmrSender, e2tInstancesManager, routingManagerClient, e2tAssociationManager, ranConnectStatusChangeManager, ranListManager)
 
        notificationManager := notificationmanager.NewNotificationManager(logger, rmrNotificationHandlerProvider)
        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)
+       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)
 }