X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhandlers%2Fhttpmsghandlers%2Fx2_reset_request_handler.go;h=c8fd4940c23e4b9c31db33bf19a6c093d7463604;hb=a07b8597afc9d063a7f37a376a5bcf29ba29b557;hp=72f7ccbc8cf58d8825129aef40fdc6f50fb860e8;hpb=33f84e1a0998af025880be3e8eb087fac34af731;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 72f7ccb..c8fd494 100644
--- a/E2Manager/handlers/httpmsghandlers/x2_reset_request_handler.go
+++ b/E2Manager/handlers/httpmsghandlers/x2_reset_request_handler.go
@@ -13,7 +13,10 @@
 // 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
 
@@ -22,12 +25,12 @@ import (
 	"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"
+	"unsafe"
 )
 
 const (
@@ -35,55 +38,62 @@ const (
 )
 
 type X2ResetRequestHandler struct {
-	readerProvider func() reader.RNibReader
-	writerProvider func() rNibWriter.RNibWriter
-	rmrService     *services.RmrService
-	logger         *logger.Logger
+	rNibDataService services.RNibDataService
+	rmrSender       *rmrsender.RmrSender
+	logger          *logger.Logger
 }
 
-func NewX2ResetRequestHandler(logger *logger.Logger, rmrService *services.RmrService, 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,
-		logger:         logger,
+		rNibDataService: rNibDataService,
+		rmrSender:       rmrSender,
+		logger:          logger,
 	}
 }
 
-func (handler *X2ResetRequestHandler) Handle(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)
+
 	if !ok {
-		handler.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 {
-		handler.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 {
-		handler.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 {
-		handler.logger.Errorf("#reset_request_handler.Handle - failed to send reset message to RMR: %s", err)
-		return e2managererrors.NewRmrError()
+	var xAction []byte
+	var msgSrc unsafe.Pointer
+	msg := models.NewRmrMessage(rmrCgo.RIC_X2_RESET, resetRequest.RanName, payload, xAction, msgSrc)
+
+	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("#reset_request_handler.Handle - sent x2 reset to RAN: %s with cause: %s", resetRequest.RanName, resetRequest.Cause)
-	return nil
+	handler.logger.Infof("#X2ResetRequestHandler.Handle - sent x2 reset to RAN: %s with cause: %s", resetRequest.RanName, resetRequest.Cause)
+
+	return nil, nil
 }