[RICPLT-2837] Fix UT to use real E2tInstanceManager instead of mock

[ric-plt/e2mgr.git] / E2Manager / handlers / httpmsghandlers / delete_all_request_handler.go

diff --git a/E2Manager/handlers/httpmsghandlers/delete_all_request_handler.go b/E2Manager/handlers/httpmsghandlers/delete_all_request_handler.go
index c25235c..fc6b3c4 100644 (file)
--- a/E2Manager/handlers/httpmsghandlers/delete_all_request_handler.go
+++ b/E2Manager/handlers/httpmsghandlers/delete_all_request_handler.go
@@ -23,50 +23,45 @@ import (
        "e2mgr/e2managererrors"
        "e2mgr/logger"
        "e2mgr/models"
-       "e2mgr/rNibWriter"
        "e2mgr/rmrCgo"
        "e2mgr/services"
+       "e2mgr/services/rmrsender"
        "e2mgr/stateMachine"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
-       "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
        "time"
 )
 
 type DeleteAllRequestHandler struct {
-       readerProvider func() reader.RNibReader
-       writerProvider func() rNibWriter.RNibWriter
-       rmrService     *services.RmrService
-       config         *configuration.Configuration
-       logger         *logger.Logger
+       rnibDataService services.RNibDataService
+       rmrSender       *rmrsender.RmrSender
+       config          *configuration.Configuration
+       logger          *logger.Logger
 }
 
-func NewDeleteAllRequestHandler(logger *logger.Logger, rmrService *services.RmrService, config *configuration.Configuration, writerProvider func() rNibWriter.RNibWriter,
-       readerProvider func() reader.RNibReader) *DeleteAllRequestHandler {
+func NewDeleteAllRequestHandler(logger *logger.Logger, rmrSender *rmrsender.RmrSender, config *configuration.Configuration, rnibDataService services.RNibDataService) *DeleteAllRequestHandler {
        return &DeleteAllRequestHandler{
-               logger:         logger,
-               readerProvider: readerProvider,
-               writerProvider: writerProvider,
-               rmrService:     rmrService,
-               config:         config,
+               logger:          logger,
+               rnibDataService: rnibDataService,
+               rmrSender:       rmrSender,
+               config:          config,
        }
 }
 
-func (handler *DeleteAllRequestHandler) Handle(request models.Request) error {
+func (handler *DeleteAllRequestHandler) Handle(request models.Request) (models.IResponse, error) {
 
        err, continueFlow := handler.updateNodebStates(false)
        if err != nil {
-               return err
+               return nil, err
        }
 
        if continueFlow == false {
-               return nil
+               return nil, nil
        }
 
-       //TODO change to rmr_request
-       response := models.NotificationResponse{MgsType: rmrCgo.RIC_SCTP_CLEAR_ALL}
-       if err := handler.rmrService.SendRmrMessage(&response); err != nil {
+       response := models.RmrMessage{MsgType: rmrCgo.RIC_SCTP_CLEAR_ALL}
+       if err := handler.rmrSender.Send(&response); err != nil {
                handler.logger.Errorf("#DeleteAllRequestHandler.Handle - failed to send sctp clear all message to RMR: %s", err)
-               return e2managererrors.NewRmrError()
+               return nil, e2managererrors.NewRmrError()
        }
 
        time.Sleep(time.Duration(handler.config.BigRedButtonTimeoutSec) * time.Second)
@@ -74,14 +69,14 @@ func (handler *DeleteAllRequestHandler) Handle(request models.Request) error {
 
        err, _ = handler.updateNodebStates(true)
        if err != nil {
-               return err
+               return nil, err
        }
 
-       return nil
+       return nil, nil
 }
 
 func (handler *DeleteAllRequestHandler) updateNodebStates(timeoutExpired bool) (error, bool) {
-       nbIdentityList, err := handler.readerProvider().GetListNodebIds()
+       nbIdentityList, err := handler.rnibDataService.GetListNodebIds()
 
        if err != nil {
                handler.logger.Errorf("#DeleteAllRequestHandler.updateNodebStates - failed to get nodes list from RNIB. Error: %s", err.Error())
@@ -95,7 +90,7 @@ func (handler *DeleteAllRequestHandler) updateNodebStates(timeoutExpired bool) (
        numOfRanToShutDown := 0
        for _, nbIdentity := range nbIdentityList {
 
-               node, err := handler.readerProvider().GetNodeb((*nbIdentity).GetInventoryName())
+               node, err := handler.rnibDataService.GetNodeb((*nbIdentity).GetInventoryName())
 
                if err != nil {
                        handler.logger.Errorf("#DeleteAllRequestHandler.updateNodebStates - failed to get nodeB entity for ran name: %v from RNIB. Error: %s",
@@ -138,7 +133,7 @@ func (handler *DeleteAllRequestHandler) saveNodebNextState(nbIdentity *entities.
 
        node.ConnectionStatus = nextStatus
 
-       err := handler.writerProvider().SaveNodeb(nbIdentity, node)
+       err := handler.rnibDataService.SaveNodeb(nbIdentity, node)
 
        if err != nil {
                handler.logger.Errorf("#DeleteAllRequestHandler.saveNodebNextState - failed to save nodeB entity for inventory name: %v to RNIB. Error: %s",
@@ -166,7 +161,7 @@ func (handler *DeleteAllRequestHandler) saveNodebShutDownState(nbIdentity *entit
 
        node.ConnectionStatus = entities.ConnectionStatus_SHUT_DOWN
 
-       err := handler.writerProvider().SaveNodeb(nbIdentity, node)
+       err := handler.rnibDataService.SaveNodeb(nbIdentity, node)
 
        if err != nil {
                handler.logger.Errorf("#DeleteAllRequestHandler.saveNodebShutDownState - failed to save nodeB entity for inventory name: %v to RNIB. Error: %s",