X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=RSM%2Fapp%2Fmain.go;fp=RSM%2Fapp%2Fmain.go;h=17a4ed9e8ab97a7b2323f8ecdec58a88bdb294cb;hb=60652d98d51ee23c1eaca2e8bc2bf19c74c57658;hp=22eb9e6dddecb94d5afa8904af3f4415ea34b08e;hpb=b8d3ff3abf409da49ecab244cd6d2c2124dbce7c;p=ric-plt%2Fresource-status-manager.git

diff --git a/RSM/app/main.go b/RSM/app/main.go
index 22eb9e6..17a4ed9 100644
--- a/RSM/app/main.go
+++ b/RSM/app/main.go
@@ -23,23 +23,24 @@ package main
 import (
 	"fmt"
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
+	"gerrit.o-ran-sc.org/r/ric-plt/sdlgo"
 	"os"
 	"rsm/configuration"
 	"rsm/controllers"
 	"rsm/converters"
+	"rsm/e2pdus"
 	"rsm/httpserver"
 	"rsm/logger"
-	"rsm/managers"
 	"rsm/managers/rmrmanagers"
+	"rsm/providers/httpmsghandlerprovider"
 	"rsm/rmrcgo"
+	"rsm/rsmdb"
 	"rsm/services"
 	"rsm/services/rmrreceiver"
 	"rsm/services/rmrsender"
 	"strconv"
 )
 
-const MaxRnibPoolInstances = 4
-
 func main() {
 	config, err := configuration.ParseConfiguration()
 	if err != nil {
@@ -52,23 +53,29 @@ func main() {
 		fmt.Printf("#app.main - failed to initialize logger, error: %s", err)
 		os.Exit(1)
 	}
-	reader.Init("e2Manager", MaxRnibPoolInstances)
+	db := sdlgo.NewDatabase()
+	e2mSdl := sdlgo.NewSdlInstance("e2Manager", db)
+	rsmSdl := sdlgo.NewSdlInstance("rsm", db)
+
+	defer e2mSdl.Close()
+	defer rsmSdl.Close()
+
 	logger.Infof("#app.main - Configuration %s", config)
-	defer reader.Close()
-	rnibDataService := services.NewRnibDataService(logger, config, reader.GetRNibReader)
+	rnibDataService := services.NewRnibDataService(logger, config, reader.GetRNibReader(e2mSdl), rsmdb.GetRsmReader(rsmSdl), rsmdb.GetRsmWriter(rsmSdl))
 	var msgImpl *rmrcgo.Context
 	rmrMessenger := msgImpl.Init(config.Rmr.ReadyIntervalSec, "tcp:"+strconv.Itoa(config.Rmr.Port), config.Rmr.MaxMsgSize, 0, logger)
 	rmrSender := rmrsender.NewRmrSender(logger, rmrMessenger)
 
-	resourceStatusInitiateManager := managers.NewResourceStatusInitiateManager(logger, rnibDataService, rmrSender)
-	var rmrManager = rmrmanagers.NewRmrMessageManager(logger, config, rnibDataService, rmrSender, resourceStatusInitiateManager,converters.NewX2apPduUnpacker(logger))
+	resourceStatusService := services.NewResourceStatusService(logger, rmrSender)
+	unpacker := converters.NewX2apPduUnpacker(logger, e2pdus.MaxAsn1CodecMessageBufferSize)
+	var rmrManager = rmrmanagers.NewRmrMessageManager(logger, config, rnibDataService, rmrSender, resourceStatusService, converters.NewResourceStatusResponseConverter(unpacker), converters.NewResourceStatusFailureConverter(unpacker))
 
 	rmrReceiver := rmrreceiver.NewRmrReceiver(logger, rmrMessenger, rmrManager)
 	defer rmrMessenger.Close()
 	go rmrReceiver.ListenAndHandle()
 
-	//handlerProvider := httpmsghandlerprovider.NewRequestHandlerProvider(logger, rmrSender, config, rnibDataService)
+	handlerProvider := httpmsghandlerprovider.NewRequestHandlerProvider(logger, rnibDataService, resourceStatusService)
 	rootController := controllers.NewRootController(rnibDataService)
-	//controller := controllers.NewController(logger, handlerProvider)
-	_ = httpserver.Run(config.Http.Port, rootController)
-}
+	controller := controllers.NewController(logger, handlerProvider)
+	_ = httpserver.Run(config.Http.Port, rootController, controller)
+}
\ No newline at end of file