X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhandlers%2Fhttpmsghandlers%2Fdelete_all_request_handler.go;h=80f1a043f639f170257851b144e99f23466ce23b;hb=a590417b434ba8e556f1a9b26ff7b6edbb2097ce;hp=4e4142e6fe0332776f86b65609bb008a5f4e41c5;hpb=5aa1fb82b4f7433cd841165b1010bae714f7907f;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/handlers/httpmsghandlers/delete_all_request_handler.go b/E2Manager/handlers/httpmsghandlers/delete_all_request_handler.go index 4e4142e..80f1a04 100644 --- a/E2Manager/handlers/httpmsghandlers/delete_all_request_handler.go +++ b/E2Manager/handlers/httpmsghandlers/delete_all_request_handler.go @@ -43,11 +43,12 @@ type DeleteAllRequestHandler struct { e2tInstancesManager managers.IE2TInstancesManager rmClient clients.IRoutingManagerClient ranConnectStatusChangeManager managers.IRanConnectStatusChangeManager + ranListManager managers.RanListManager } const PartialSuccessDueToRmErrorMessage = "Operation succeeded except for routing manager outbound call" -func NewDeleteAllRequestHandler(logger *logger.Logger, rmrSender *rmrsender.RmrSender, config *configuration.Configuration, rnibDataService services.RNibDataService, e2tInstancesManager managers.IE2TInstancesManager, rmClient clients.IRoutingManagerClient, ranConnectStatusChangeManager managers.IRanConnectStatusChangeManager) *DeleteAllRequestHandler { +func NewDeleteAllRequestHandler(logger *logger.Logger, rmrSender *rmrsender.RmrSender, config *configuration.Configuration, rnibDataService services.RNibDataService, e2tInstancesManager managers.IE2TInstancesManager, rmClient clients.IRoutingManagerClient, ranConnectStatusChangeManager managers.IRanConnectStatusChangeManager, ranListManager managers.RanListManager) *DeleteAllRequestHandler { return &DeleteAllRequestHandler{ logger: logger, rnibDataService: rnibDataService, @@ -56,6 +57,7 @@ func NewDeleteAllRequestHandler(logger *logger.Logger, rmrSender *rmrsender.RmrS e2tInstancesManager: e2tInstancesManager, rmClient: rmClient, ranConnectStatusChangeManager: ranConnectStatusChangeManager, + ranListManager: ranListManager, } } @@ -127,13 +129,7 @@ func (h *DeleteAllRequestHandler) Handle(request models.Request) (models.IRespon } func (h *DeleteAllRequestHandler) updateNodebs(updateCb func(node *entities.NodebInfo) (error, bool)) (error, bool) { - nbIdentityList, err := h.rnibDataService.GetListNodebIds() - - if err != nil { - h.logger.Errorf("#DeleteAllRequestHandler.updateNodebs - failed to get nodes list from rNib. Error: %s", err) - return e2managererrors.NewRnibDbError(), false - } - + nbIdentityList := h.ranListManager.GetNbIdentityList() updatedAtLeastOnce := false for _, nbIdentity := range nbIdentityList {