merge of Natalia - change rnib errors

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

diff --git a/E2Manager/handlers/x2_reset_request_handler.go b/E2Manager/handlers/x2_reset_request_handler.go
index eafd0cc..f61e60c 100644 (file)
--- a/E2Manager/handlers/x2_reset_request_handler.go
+++ b/E2Manager/handlers/x2_reset_request_handler.go
@@ -32,7 +32,7 @@ import (
 )
 
 const (
-       X2_RESET_ACTIVITIY_NAME = "X2_RESET"
+       X2_RESET_ACTIVITY_NAME = "X2_RESET"
 )
 type X2ResetRequestHandler struct {
        readerProvider func() reader.RNibReader
@@ -67,7 +67,8 @@ func (handler *X2ResetRequestHandler) Handle(logger *logger.Logger, request mode
        nodeb, err  := handler.readerProvider().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())
-               if err.GetCode() == common.RESOURCE_NOT_FOUND {
+               _, ok := err.(*common.ResourceNotFoundError)
+               if ok {
                        return e2managererrors.NewResourceNotFoundError()
                }
                return e2managererrors.NewRnibDbError()
@@ -75,7 +76,7 @@ func (handler *X2ResetRequestHandler) Handle(logger *logger.Logger, request mode
 
        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_ACTIVITIY_NAME,entities.ConnectionStatus_name[int32(nodeb.ConnectionStatus)])
+               return 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}