X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=E2Manager%2Fhandlers%2Frmrmsghandlers%2Fsetup_response_notification_handler.go;h=f6b63f3e86478f0f9eddcac7bac1044d2d74aa49;hb=e3623cf1310f8c8d2fd9b5842102516b9be3b441;hp=35957419c066e8670796a528261021c91b7d6680;hpb=85f45dfb650d026a83e17fc7a2f1fc5f277e8e5a;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler.go b/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler.go
index 3595741..f6b63f3 100644
--- a/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler.go
+++ b/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler.go
@@ -20,22 +20,19 @@ import (
 	"e2mgr/logger"
 	"e2mgr/managers"
 	"e2mgr/models"
-	"e2mgr/rNibWriter"
+	"e2mgr/services"
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
-	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
 )
 
 type SetupResponseNotificationHandler struct {
-	rnibReaderProvider   func() reader.RNibReader
-	rnibWriterProvider   func() rNibWriter.RNibWriter
+	rnibDataService      services.RNibDataService
 	setupResponseManager managers.ISetupResponseManager
 	notificationType     string
 }
 
-func NewSetupResponseNotificationHandler(rnibReaderProvider func() reader.RNibReader, rnibWriterProvider func() rNibWriter.RNibWriter, setupResponseManager managers.ISetupResponseManager, notificationType string) SetupResponseNotificationHandler {
+func NewSetupResponseNotificationHandler(rnibDataService services.RNibDataService, setupResponseManager managers.ISetupResponseManager, notificationType string) SetupResponseNotificationHandler {
 	return SetupResponseNotificationHandler{
-		rnibReaderProvider:   rnibReaderProvider,
-		rnibWriterProvider:   rnibWriterProvider,
+		rnibDataService:      rnibDataService,
 		setupResponseManager: setupResponseManager,
 		notificationType:     notificationType,
 	}
@@ -46,7 +43,7 @@ func (h SetupResponseNotificationHandler) Handle(logger *logger.Logger, request
 
 	inventoryName := request.RanName
 
-	nodebInfo, rnibErr := h.rnibReaderProvider().GetNodeb(inventoryName)
+	nodebInfo, rnibErr := h.rnibDataService.GetNodeb(inventoryName)
 
 	if rnibErr != nil {
 		logger.Errorf("#SetupResponseNotificationHandler - RAN name: %s - Error fetching RAN from rNib: %v", request.RanName, rnibErr)
@@ -66,7 +63,7 @@ func (h SetupResponseNotificationHandler) Handle(logger *logger.Logger, request
 		return
 	}
 
-	rnibErr = h.rnibWriterProvider().SaveNodeb(nbIdentity, nodebInfo)
+	rnibErr = h.rnibDataService.SaveNodeb(nbIdentity, nodebInfo)
 
 	if rnibErr != nil {
 		logger.Errorf("#SetupResponseNotificationHandler - RAN name: %s - Error saving RAN to rNib: %v", request.RanName, rnibErr)