X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=inline;f=E2Manager%2Fhandlers%2Fdelete_all_request_handler.go;h=b0899ba36c85d147dfbfdb4381e1bb0053afa356;hb=refs%2Fchanges%2F85%2F885%2F1;hp=3a9958f99be596176c2d73c829a1c13175b77741;hpb=07ef76dd471a0892a893c90e0ab06713aee34be1;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/handlers/delete_all_request_handler.go b/E2Manager/handlers/delete_all_request_handler.go index 3a9958f..b0899ba 100644 --- a/E2Manager/handlers/delete_all_request_handler.go +++ b/E2Manager/handlers/delete_all_request_handler.go @@ -17,36 +17,39 @@ package handlers +import "C" import ( "e2mgr/configuration" "e2mgr/e2managererrors" "e2mgr/logger" + "e2mgr/models" "e2mgr/rNibWriter" "e2mgr/rmrCgo" + "e2mgr/services" "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" - - "e2mgr/models" ) type DeleteAllRequestHandler struct { readerProvider func() reader.RNibReader writerProvider func() rNibWriter.RNibWriter + rmrService *services.RmrService config *configuration.Configuration } -func NewDeleteAllRequestHandler(config *configuration.Configuration, writerProvider func() rNibWriter.RNibWriter, +func NewDeleteAllRequestHandler(rmrService *services.RmrService, config *configuration.Configuration, writerProvider func() rNibWriter.RNibWriter, readerProvider func() reader.RNibReader) *DeleteAllRequestHandler { return &DeleteAllRequestHandler { readerProvider: readerProvider, writerProvider: writerProvider, + rmrService: rmrService, config: config, } } -func (handler *DeleteAllRequestHandler) Handle(logger *logger.Logger, request *models.Request, rmrResponseChannel chan<- *models.NotificationResponse) error { +func (handler *DeleteAllRequestHandler) Handle(logger *logger.Logger, request models.Request) error { err, continueFlow := handler.updateNodebStates(logger, false) if err != nil { @@ -59,10 +62,13 @@ func (handler *DeleteAllRequestHandler) Handle(logger *logger.Logger, request *m //TODO change to rmr_request response := models.NotificationResponse{MgsType: rmrCgo.RIC_SCTP_CLEAR_ALL} - rmrResponseChannel <- &response + if err:= handler.rmrService.SendRmrMessage(&response); err != nil { + logger.Errorf("#DeleteAllRequestHandler.Handle - failed to send sctp clear all message to RMR: %s", err) + return e2managererrors.NewRmrError() + } time.Sleep(time.Duration(handler.config.BigRedButtonTimeoutSec) * time.Second) - logger.Infof("#delete_all_request_handler.Handle - timer expired") + logger.Infof("#DeleteAllRequestHandler.Handle - timer expired") err, _ = handler.updateNodebStates(logger, true) if err != nil { @@ -76,7 +82,7 @@ func (handler *DeleteAllRequestHandler) updateNodebStates(logger *logger.Logger, nbIdentityList, err := handler.readerProvider().GetListNodebIds() if err != nil { - logger.Errorf("#delete_all_request_handler.updateNodebStates - failed to get nodes list from RNIB. Error: %s", err.Error()) + logger.Errorf("#DeleteAllRequestHandler.updateNodebStates - failed to get nodes list from RNIB. Error: %s", err.Error()) return e2managererrors.NewRnibDbError(), false } @@ -84,33 +90,48 @@ func (handler *DeleteAllRequestHandler) updateNodebStates(logger *logger.Logger, return nil, false } + numOfRanToShutDown := 0 for _,nbIdentity := range nbIdentityList{ node, err := handler.readerProvider().GetNodeb((*nbIdentity).GetInventoryName()) if err != nil { - logger.Errorf("#delete_all_request_handler.updateNodebStates - failed to get nodeB entity for ran name: %v from RNIB. Error: %s", + logger.Errorf("#DeleteAllRequestHandler.updateNodebStates - failed to get nodeB entity for ran name: %v from RNIB. Error: %s", (*nbIdentity).GetInventoryName(), err.Error()) continue } if timeoutExpired{ - handler.saveNodebShutDownState(logger, nbIdentity, node) + if handler.saveNodebShutDownState(logger, nbIdentity, node){ + numOfRanToShutDown++ + } continue } - handler.saveNodebNextState(logger, nbIdentity, node) + if handler.saveNodebNextState(logger, nbIdentity, node){ + numOfRanToShutDown++ + } + } + + if numOfRanToShutDown > 0{ + logger.Infof("#DeleteAllRequestHandler.updateNodebStates - update nodebs states in RNIB completed") + }else { + logger.Infof("#DeleteAllRequestHandler.updateNodebStates - nodebs states are not updated ") + return nil, false } - logger.Infof("#delete_all_request_handler.updateNodebStates - update nodeb states in RNIB completed") return nil, true } -func (handler *DeleteAllRequestHandler) saveNodebNextState(logger *logger.Logger, nbIdentity *entities.NbIdentity, node *entities.NodebInfo) { +func (handler *DeleteAllRequestHandler) saveNodebNextState(logger *logger.Logger, nbIdentity *entities.NbIdentity, node *entities.NodebInfo) bool{ + + if node.ConnectionStatus == entities.ConnectionStatus_SHUTTING_DOWN{ + return true + } nextStatus, res := stateMachine.NodeNextStateDeleteAll(node.ConnectionStatus) if res == false { - return + return false } node.ConnectionStatus = nextStatus @@ -118,26 +139,27 @@ func (handler *DeleteAllRequestHandler) saveNodebNextState(logger *logger.Logger err := handler.writerProvider().SaveNodeb(nbIdentity, node) if err != nil { - logger.Errorf("#delete_all_request_handler.saveNodebNextState - failed to save nodeB entity for inventory name: %v to RNIB. Error: %s", + logger.Errorf("#DeleteAllRequestHandler.saveNodebNextState - failed to save nodeB entity for inventory name: %v to RNIB. Error: %s", (*nbIdentity).GetInventoryName(), err.Error()) - return + return false } if logger.DebugEnabled() { - logger.Debugf("#delete_all_request_handler.saveNodebNextState - connection status of inventory name: %v changed to %v", + logger.Debugf("#DeleteAllRequestHandler.saveNodebNextState - connection status of inventory name: %v changed to %v", (*nbIdentity).GetInventoryName(), nextStatus.String()) } + return true } -func (handler *DeleteAllRequestHandler) saveNodebShutDownState(logger *logger.Logger, nbIdentity *entities.NbIdentity, node *entities.NodebInfo) { +func (handler *DeleteAllRequestHandler) saveNodebShutDownState(logger *logger.Logger, nbIdentity *entities.NbIdentity, node *entities.NodebInfo) bool{ if node.ConnectionStatus == entities.ConnectionStatus_SHUT_DOWN{ - return + return false } if node.ConnectionStatus != entities.ConnectionStatus_SHUTTING_DOWN { - logger.Errorf("#delete_all_request_handler.saveNodebShutDownState - ignore, status is not Shutting Down, inventory name: %v ", (*nbIdentity).GetInventoryName()) - return + logger.Errorf("#DeleteAllRequestHandler.saveNodebShutDownState - ignore, status is not Shutting Down, inventory name: %v ", (*nbIdentity).GetInventoryName()) + return false } node.ConnectionStatus = entities.ConnectionStatus_SHUT_DOWN @@ -145,10 +167,11 @@ func (handler *DeleteAllRequestHandler) saveNodebShutDownState(logger *logger.Lo err := handler.writerProvider().SaveNodeb(nbIdentity, node) if err != nil { - logger.Errorf("#delete_all_request_handler.saveNodebShutDownState - failed to save nodeB entity for inventory name: %v to RNIB. Error: %s", + logger.Errorf("#DeleteAllRequestHandler.saveNodebShutDownState - failed to save nodeB entity for inventory name: %v to RNIB. Error: %s", (*nbIdentity).GetInventoryName(), err.Error()) - return + return false } - logger.Errorf("#delete_all_request_handler.saveNodebShutDownState - Shut Down , inventory name: %v ", (*nbIdentity).GetInventoryName()) + logger.Errorf("#DeleteAllRequestHandler.saveNodebShutDownState - Shut Down , inventory name: %v ", (*nbIdentity).GetInventoryName()) + return true }