Merge "Getting node for which e2 reset has to be applied"

[ric-plt/e2mgr.git] / E2Manager / handlers / httpmsghandlers / x2_reset_request_handler.go

diff --git a/E2Manager/handlers/httpmsghandlers/x2_reset_request_handler.go b/E2Manager/handlers/httpmsghandlers/x2_reset_request_handler.go
index 3d02272..c8fd494 100644 (file)
--- 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
 
@@ -24,8 +27,10 @@ import (
        "e2mgr/models"
        "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"
+       "unsafe"
 )
 
 const (
@@ -34,51 +39,61 @@ const (
 
 type X2ResetRequestHandler struct {
        rNibDataService services.RNibDataService
-       rmrService     *services.RmrService
-       logger         *logger.Logger
+       rmrSender       *rmrsender.RmrSender
+       logger          *logger.Logger
 }
 
-func NewX2ResetRequestHandler(logger *logger.Logger, rmrService *services.RmrService, rNibDataService services.RNibDataService) *X2ResetRequestHandler {
+func NewX2ResetRequestHandler(logger *logger.Logger, rmrSender *rmrsender.RmrSender, rNibDataService services.RNibDataService) *X2ResetRequestHandler {
        return &X2ResetRequestHandler{
                rNibDataService: rNibDataService,
-               rmrService:     rmrService,
-               logger:         logger,
+               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.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
 }