X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhandlers%2Fhttpmsghandlers%2Fx2_reset_request_handler.go;h=3d02272f115e5a68a70ec7d489857e4d44ba826f;hb=refs%2Fchanges%2F43%2F943%2F1;hp=72f7ccbc8cf58d8825129aef40fdc6f50fb860e8;hpb=33f84e1a0998af025880be3e8eb087fac34af731;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/handlers/httpmsghandlers/x2_reset_request_handler.go b/E2Manager/handlers/httpmsghandlers/x2_reset_request_handler.go
index 72f7ccb..3d02272 100644
--- a/E2Manager/handlers/httpmsghandlers/x2_reset_request_handler.go
+++ b/E2Manager/handlers/httpmsghandlers/x2_reset_request_handler.go
@@ -22,12 +22,10 @@ import (
 	"e2mgr/e2pdus"
 	"e2mgr/logger"
 	"e2mgr/models"
-	"e2mgr/rNibWriter"
 	"e2mgr/rmrCgo"
 	"e2mgr/services"
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
-	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
 )
 
 const (
@@ -35,17 +33,14 @@ const (
 )
 
 type X2ResetRequestHandler struct {
-	readerProvider func() reader.RNibReader
-	writerProvider func() rNibWriter.RNibWriter
+	rNibDataService services.RNibDataService
 	rmrService     *services.RmrService
 	logger         *logger.Logger
 }
 
-func NewX2ResetRequestHandler(logger *logger.Logger, rmrService *services.RmrService, writerProvider func() rNibWriter.RNibWriter,
-	readerProvider func() reader.RNibReader) *X2ResetRequestHandler {
+func NewX2ResetRequestHandler(logger *logger.Logger, rmrService *services.RmrService, rNibDataService services.RNibDataService) *X2ResetRequestHandler {
 	return &X2ResetRequestHandler{
-		readerProvider: readerProvider,
-		writerProvider: writerProvider,
+		rNibDataService: rNibDataService,
 		rmrService:     rmrService,
 		logger:         logger,
 	}
@@ -63,7 +58,7 @@ func (handler *X2ResetRequestHandler) Handle(request models.Request) error {
 		return e2managererrors.NewRequestValidationError()
 	}
 
-	nodeb, err := handler.readerProvider().GetNodeb(resetRequest.RanName)
+	nodeb, err := handler.rNibDataService.GetNodeb(resetRequest.RanName)
 	if err != nil {
 		handler.logger.Errorf("#reset_request_handler.Handle - failed to get status of RAN: %s from RNIB. Error: %s", resetRequest.RanName, err.Error())
 		_, ok := err.(*common.ResourceNotFoundError)