X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhandlers%2Fhttpmsghandlers%2Fdelete_all_request_handler.go;h=fc6b3c480df627d110e401865f92e8ffc5f92acf;hb=refs%2Fchanges%2F65%2F1965%2F1;hp=ba770751667853e0721d5d9e446d4ff62b82f2af;hpb=e3623cf1310f8c8d2fd9b5842102516b9be3b441;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 ba77075..fc6b3c4 100644
--- a/E2Manager/handlers/httpmsghandlers/delete_all_request_handler.go
+++ b/E2Manager/handlers/httpmsghandlers/delete_all_request_handler.go
@@ -25,6 +25,7 @@ import (
 	"e2mgr/models"
 	"e2mgr/rmrCgo"
 	"e2mgr/services"
+	"e2mgr/services/rmrsender"
 	"e2mgr/stateMachine"
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
 	"time"
@@ -32,36 +33,35 @@ import (
 
 type DeleteAllRequestHandler struct {
 	rnibDataService services.RNibDataService
-	rmrService *services.RmrService
-	config *configuration.Configuration
-	logger         *logger.Logger
+	rmrSender       *rmrsender.RmrSender
+	config          *configuration.Configuration
+	logger          *logger.Logger
 }
 
-func NewDeleteAllRequestHandler(logger *logger.Logger, rmrService *services.RmrService, config *configuration.Configuration, rnibDataService services.RNibDataService) *DeleteAllRequestHandler {
+func NewDeleteAllRequestHandler(logger *logger.Logger, rmrSender *rmrsender.RmrSender, config *configuration.Configuration, rnibDataService services.RNibDataService) *DeleteAllRequestHandler {
 	return &DeleteAllRequestHandler{
-		logger:         logger,
+		logger:          logger,
 		rnibDataService: rnibDataService,
-		rmrService:     rmrService,
-		config:         config,
+		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)
@@ -69,10 +69,10 @@ 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) {