X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhandlers%2Fhttpmsghandlers%2Fx2_reset_request_handler.go;h=13a88ad9edca9fb504516d7e011fb7f22bcd8c53;hb=refs%2Fchanges%2F01%2F2101%2F1;hp=2455ac6974a05ef4dfde007a17b81725e0551c24;hpb=1ec13d4076e7c7abefac6176462c1fee31229213;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 2455ac6..13a88ad 100644
--- a/E2Manager/handlers/httpmsghandlers/x2_reset_request_handler.go
+++ b/E2Manager/handlers/httpmsghandlers/x2_reset_request_handler.go
@@ -13,80 +13,86 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-//
+
+//  This source code is part of the near-RT RIC (RAN Intelligent Controller)
+//  platform project (RICP).
+
 
 package httpmsghandlers
 
 import (
-	"e2mgr/configuration"
 	"e2mgr/e2managererrors"
 	"e2mgr/e2pdus"
 	"e2mgr/logger"
 	"e2mgr/models"
-	"e2mgr/rNibWriter"
 	"e2mgr/rmrCgo"
 	"e2mgr/services"
+	"e2mgr/services/rmrsender"
 	"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 (
 	X2_RESET_ACTIVITY_NAME = "X2_RESET"
 )
+
 type X2ResetRequestHandler struct {
-	readerProvider func() reader.RNibReader
-	writerProvider func() rNibWriter.RNibWriter
-	rmrService *services.RmrService
-	config         *configuration.Configuration
+	rNibDataService services.RNibDataService
+	rmrSender       *rmrsender.RmrSender
+	logger          *logger.Logger
 }
 
-
-func NewX2ResetRequestHandler(rmrService *services.RmrService, config *configuration.Configuration, writerProvider func() rNibWriter.RNibWriter,
-	readerProvider func() reader.RNibReader) *X2ResetRequestHandler {
+func NewX2ResetRequestHandler(logger *logger.Logger, rmrSender *rmrsender.RmrSender, rNibDataService services.RNibDataService) *X2ResetRequestHandler {
 	return &X2ResetRequestHandler{
-		readerProvider: readerProvider,
-		writerProvider: writerProvider,
-		rmrService: rmrService,
-		config:         config,
+		rNibDataService: rNibDataService,
+		rmrSender:       rmrSender,
+		logger:          logger,
 	}
 }
 
-func (handler *X2ResetRequestHandler) Handle(logger *logger.Logger, request models.Request) error {
+func (handler *X2ResetRequestHandler) Handle(request models.Request) (models.IResponse, error) {
+
 	resetRequest := request.(models.ResetRequest)
+	handler.logger.Infof("#X2ResetRequestHandler.Handle - Ran name: %s", resetRequest.RanName)
 
 	if len(resetRequest.Cause) == 0 {
 		resetRequest.Cause = e2pdus.OmInterventionCause
 	}
-	payload, ok:= e2pdus.KnownCausesToX2ResetPDU(resetRequest.Cause)
+
+	payload, ok := e2pdus.KnownCausesToX2ResetPDU(resetRequest.Cause)
+
 	if !ok {
-		logger.Errorf("#reset_request_handler.Handle - Unknown cause (%s)", resetRequest.Cause)
-		return e2managererrors.NewRequestValidationError()
+		handler.logger.Errorf("#X2ResetRequestHandler.Handle - Unknown cause (%s)", resetRequest.Cause)
+		return nil, e2managererrors.NewRequestValidationError()
 	}
 
-	nodeb, err  := handler.readerProvider().GetNodeb(resetRequest.RanName)
+	nodeb, err := handler.rNibDataService.GetNodeb(resetRequest.RanName)
 	if err != nil {
-		logger.Errorf("#reset_request_handler.Handle - failed to get status of RAN: %s from RNIB. Error: %s", resetRequest.RanName,  err.Error())
+		handler.logger.Errorf("#X2ResetRequestHandler.Handle - failed to get status of RAN: %s from RNIB. Error: %s", resetRequest.RanName, err.Error())
 		_, ok := err.(*common.ResourceNotFoundError)
 		if ok {
-			return e2managererrors.NewResourceNotFoundError()
+			return nil, e2managererrors.NewResourceNotFoundError()
 		}
-		return e2managererrors.NewRnibDbError()
+		return nil, e2managererrors.NewRnibDbError()
 	}
 
 	if nodeb.ConnectionStatus != entities.ConnectionStatus_CONNECTED {
-		logger.Errorf("#reset_request_handler.Handle - RAN: %s in wrong state (%s)", resetRequest.RanName, entities.ConnectionStatus_name[int32(nodeb.ConnectionStatus)])
-		return e2managererrors.NewWrongStateError(X2_RESET_ACTIVITY_NAME,entities.ConnectionStatus_name[int32(nodeb.ConnectionStatus)])
+		handler.logger.Errorf("#X2ResetRequestHandler.Handle - RAN: %s in wrong state (%s)", resetRequest.RanName, entities.ConnectionStatus_name[int32(nodeb.ConnectionStatus)])
+		return nil, e2managererrors.NewWrongStateError(X2_RESET_ACTIVITY_NAME, entities.ConnectionStatus_name[int32(nodeb.ConnectionStatus)])
 	}
 
-	response := models.NotificationResponse{MgsType: rmrCgo.RIC_X2_RESET, RanName: resetRequest.RanName, Payload: payload}
-	if err:= handler.rmrService.SendRmrMessage(&response); err != nil {
-		logger.Errorf("#reset_request_handler.Handle - failed to send reset message to RMR: %s", err)
-		return  e2managererrors.NewRmrError()
-	}
+	var xAction []byte
 
-	logger.Infof("#reset_request_handler.Handle - sent x2 reset to RAN: %s with cause: %s", resetRequest.RanName, resetRequest.Cause)
-	return nil
-}
+	msg := models.NewRmrMessage(rmrCgo.RIC_X2_RESET, resetRequest.RanName, payload, xAction)
 
+	err = handler.rmrSender.Send(msg)
 
+	if err != nil {
+		handler.logger.Errorf("#X2ResetRequestHandler.Handle - failed to send reset message to RMR: %s", err)
+		return nil, e2managererrors.NewRmrError()
+	}
+
+	handler.logger.Infof("#X2ResetRequestHandler.Handle - sent x2 reset to RAN: %s with cause: %s", resetRequest.RanName, resetRequest.Cause)
+
+	return nil, nil
+}