From 2165a761642886ce8df2f6fe4a71914f3ddb0965 Mon Sep 17 00:00:00 2001 From: irina Date: Wed, 4 Sep 2019 10:54:37 +0300 Subject: [PATCH] e2managererrors - err removed Change-Id: If4049bebc9be63d676d65c1ca365e0a47761df61 Signed-off-by: irina rogress.go Change-Id: I44d07fcb068bfb346baf4388936f8ebc481107fa Signed-off-by: irina --- E2Manager/controllers/controller.go | 18 +++++++++--------- E2Manager/controllers/controller_test.go | 14 +++++++------- .../e2managererrors/command_already_in_progress.go | 6 +++--- E2Manager/e2managererrors/header_validation_error.go | 6 +++--- E2Manager/e2managererrors/internal_error.go | 6 +++--- E2Manager/e2managererrors/invalid_json_error.go | 6 +++--- E2Manager/e2managererrors/request_validation_error.go | 6 +++--- E2Manager/e2managererrors/resource_not_found.go | 6 +++--- E2Manager/e2managererrors/rmr_error.go | 6 +++--- E2Manager/e2managererrors/rnib_db_error.go | 6 +++--- E2Manager/e2managererrors/wrong_state_error.go | 6 +++--- E2Manager/e2pdus/x2_reset_known_causes_test.go | 2 +- 12 files changed, 44 insertions(+), 44 deletions(-) diff --git a/E2Manager/controllers/controller.go b/E2Manager/controllers/controller.go index 7975ed5..7d549b2 100644 --- a/E2Manager/controllers/controller.go +++ b/E2Manager/controllers/controller.go @@ -138,40 +138,40 @@ func (c *Controller) handleErrorResponse(err error, writer http.ResponseWriter) switch err.(type) { case *e2managererrors.RnibDbError: e2Error, _ := err.(*e2managererrors.RnibDbError) - errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message} + errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message} httpError = http.StatusInternalServerError case *e2managererrors.CommandAlreadyInProgressError: e2Error, _ := err.(*e2managererrors.CommandAlreadyInProgressError) - errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message} + errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message} httpError = http.StatusMethodNotAllowed case *e2managererrors.HeaderValidationError: e2Error, _ := err.(*e2managererrors.HeaderValidationError) - errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message} + errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message} httpError = http.StatusUnsupportedMediaType case *e2managererrors.WrongStateError: e2Error, _ := err.(*e2managererrors.WrongStateError) - errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message} + errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message} httpError = http.StatusBadRequest case *e2managererrors.RequestValidationError: e2Error, _ := err.(*e2managererrors.RequestValidationError) - errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message} + errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message} httpError = http.StatusBadRequest case *e2managererrors.InvalidJsonError: e2Error, _ := err.(*e2managererrors.InvalidJsonError) - errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message} + errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message} httpError = http.StatusBadRequest case *e2managererrors.RmrError: e2Error, _ := err.(*e2managererrors.RmrError) - errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message} + errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message} httpError = http.StatusInternalServerError case *e2managererrors.ResourceNotFoundError: e2Error, _ := err.(*e2managererrors.ResourceNotFoundError) - errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message} + errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message} httpError = http.StatusNotFound default: e2Error := e2managererrors.NewInternalError() - errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message} + errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message} httpError = http.StatusInternalServerError } } diff --git a/E2Manager/controllers/controller_test.go b/E2Manager/controllers/controller_test.go index b5c4b05..448ac9d 100644 --- a/E2Manager/controllers/controller_test.go +++ b/E2Manager/controllers/controller_test.go @@ -69,7 +69,7 @@ func TestShutdownHandlerRnibError(t *testing.T) { var errorResponse = parseJsonRequest(t, writer.Body) assert.Equal(t, http.StatusInternalServerError, writer.Result().StatusCode) - assert.Equal(t, errorResponse.Code, e2managererrors.NewRnibDbError().Err.Code) + assert.Equal(t, errorResponse.Code, e2managererrors.NewRnibDbError().Code) } func TestHeaderValidationFailed(t *testing.T) { @@ -98,8 +98,8 @@ func TestHeaderValidationFailed(t *testing.T) { err := e2managererrors.NewHeaderValidationError() assert.Equal(t, http.StatusUnsupportedMediaType, writer.Result().StatusCode) - assert.Equal(t, errorResponse.Code, err.Err.Code) - assert.Equal(t, errorResponse.Message, err.Err.Message) + assert.Equal(t, errorResponse.Code, err.Code) + assert.Equal(t, errorResponse.Message, err.Message) } func TestShutdownStatusNoContent(t *testing.T) { @@ -149,8 +149,8 @@ func TestHandleInternalError(t *testing.T) { var errorResponse = parseJsonRequest(t, writer.Body) assert.Equal(t, http.StatusInternalServerError, writer.Result().StatusCode) - assert.Equal(t, errorResponse.Code, err.Err.Code) - assert.Equal(t, errorResponse.Message, err.Err.Message) + assert.Equal(t, errorResponse.Code, err.Code) + assert.Equal(t, errorResponse.Message, err.Message) } func TestHandleCommandAlreadyInProgressError(t *testing.T) { @@ -174,8 +174,8 @@ func TestHandleCommandAlreadyInProgressError(t *testing.T) { var errorResponse = parseJsonRequest(t, writer.Body) assert.Equal(t, http.StatusMethodNotAllowed, writer.Result().StatusCode) - assert.Equal(t, errorResponse.Code, err.Err.Code) - assert.Equal(t, errorResponse.Message, err.Err.Message) + assert.Equal(t, errorResponse.Code, err.Code) + assert.Equal(t, errorResponse.Message, err.Message) } func TestValidateHeaders(t *testing.T) { diff --git a/E2Manager/e2managererrors/command_already_in_progress.go b/E2Manager/e2managererrors/command_already_in_progress.go index c6167ac..fab2016 100644 --- a/E2Manager/e2managererrors/command_already_in_progress.go +++ b/E2Manager/e2managererrors/command_already_in_progress.go @@ -18,12 +18,12 @@ package e2managererrors type CommandAlreadyInProgressError struct { - Err BaseError + *BaseError } func NewCommandAlreadyInProgressError() *CommandAlreadyInProgressError { return &CommandAlreadyInProgressError { - BaseError{ + &BaseError{ Code: 405, Message: "Command already in progress", }, @@ -31,6 +31,6 @@ func NewCommandAlreadyInProgressError() *CommandAlreadyInProgressError { } func (e *CommandAlreadyInProgressError) Error() string { - return e.Err.Message + return e.Message } diff --git a/E2Manager/e2managererrors/header_validation_error.go b/E2Manager/e2managererrors/header_validation_error.go index 9c2d8ef..9987a55 100644 --- a/E2Manager/e2managererrors/header_validation_error.go +++ b/E2Manager/e2managererrors/header_validation_error.go @@ -18,12 +18,12 @@ package e2managererrors type HeaderValidationError struct { - Err BaseError + *BaseError } func NewHeaderValidationError() *HeaderValidationError { return &HeaderValidationError { - BaseError{ + &BaseError{ Code: 415, Message: "Header validation error", }, @@ -31,5 +31,5 @@ func NewHeaderValidationError() *HeaderValidationError { } func (e *HeaderValidationError) Error() string { - return e.Err.Message + return e.Message } diff --git a/E2Manager/e2managererrors/internal_error.go b/E2Manager/e2managererrors/internal_error.go index 24fa773..160481a 100644 --- a/E2Manager/e2managererrors/internal_error.go +++ b/E2Manager/e2managererrors/internal_error.go @@ -18,12 +18,12 @@ package e2managererrors type InternalError struct { - Err BaseError + *BaseError } func NewInternalError() *InternalError { return &InternalError { - BaseError{ + &BaseError{ Code: 501, Message: "Internal Server Error. Please try again later", }, @@ -31,5 +31,5 @@ func NewInternalError() *InternalError { } func (e *InternalError) Error() string { - return e.Err.Message + return e.Message } diff --git a/E2Manager/e2managererrors/invalid_json_error.go b/E2Manager/e2managererrors/invalid_json_error.go index 17a3564..ac8b3db 100644 --- a/E2Manager/e2managererrors/invalid_json_error.go +++ b/E2Manager/e2managererrors/invalid_json_error.go @@ -19,12 +19,12 @@ package e2managererrors type InvalidJsonError struct { - Err BaseError + *BaseError } func NewInvalidJsonError() *InvalidJsonError { return &InvalidJsonError{ - BaseError{ + &BaseError{ Code: 401, Message: "corrupted json", }, @@ -32,6 +32,6 @@ func NewInvalidJsonError() *InvalidJsonError { } func (e *InvalidJsonError) Error() string { - return e.Err.Message + return e.Message } diff --git a/E2Manager/e2managererrors/request_validation_error.go b/E2Manager/e2managererrors/request_validation_error.go index 2029aa7..d2cd0bf 100644 --- a/E2Manager/e2managererrors/request_validation_error.go +++ b/E2Manager/e2managererrors/request_validation_error.go @@ -18,12 +18,12 @@ package e2managererrors type RequestValidationError struct { - Err BaseError + *BaseError } func NewRequestValidationError() *RequestValidationError { return &RequestValidationError{ - BaseError{ + &BaseError{ Code: 402, Message: "Validation error", }, @@ -31,5 +31,5 @@ func NewRequestValidationError() *RequestValidationError { } func (e *RequestValidationError) Error() string { - return e.Err.Message + return e.Message } diff --git a/E2Manager/e2managererrors/resource_not_found.go b/E2Manager/e2managererrors/resource_not_found.go index a69f73e..aed97ef 100644 --- a/E2Manager/e2managererrors/resource_not_found.go +++ b/E2Manager/e2managererrors/resource_not_found.go @@ -18,12 +18,12 @@ package e2managererrors type ResourceNotFoundError struct { - Err BaseError + *BaseError } func NewResourceNotFoundError() *ResourceNotFoundError { return &ResourceNotFoundError{ - BaseError{ + &BaseError{ Code: 404, Message: "Resource not found", }, @@ -31,5 +31,5 @@ func NewResourceNotFoundError() *ResourceNotFoundError { } func (e *ResourceNotFoundError) Error() string { - return e.Err.Message + return e.Message } diff --git a/E2Manager/e2managererrors/rmr_error.go b/E2Manager/e2managererrors/rmr_error.go index fca2a8a..416da78 100644 --- a/E2Manager/e2managererrors/rmr_error.go +++ b/E2Manager/e2managererrors/rmr_error.go @@ -18,12 +18,12 @@ package e2managererrors type RmrError struct { - Err BaseError + *BaseError } func NewRmrError() *RmrError { return &RmrError{ - BaseError{ + &BaseError{ Code: 502, Message: "RMR error", }, @@ -31,5 +31,5 @@ func NewRmrError() *RmrError { } func (e *RmrError) Error() string { - return e.Err.Message + return e.Message } diff --git a/E2Manager/e2managererrors/rnib_db_error.go b/E2Manager/e2managererrors/rnib_db_error.go index 7a18181..f642b41 100644 --- a/E2Manager/e2managererrors/rnib_db_error.go +++ b/E2Manager/e2managererrors/rnib_db_error.go @@ -18,12 +18,12 @@ package e2managererrors type RnibDbError struct { - Err BaseError + *BaseError } func NewRnibDbError() *RnibDbError { return &RnibDbError { - BaseError{ + &BaseError{ Code: 500, Message: "RNIB error", }, @@ -31,5 +31,5 @@ func NewRnibDbError() *RnibDbError { } func (e *RnibDbError) Error() string { - return e.Err.Message + return e.Message } \ No newline at end of file diff --git a/E2Manager/e2managererrors/wrong_state_error.go b/E2Manager/e2managererrors/wrong_state_error.go index ea984ed..cd0cb37 100644 --- a/E2Manager/e2managererrors/wrong_state_error.go +++ b/E2Manager/e2managererrors/wrong_state_error.go @@ -20,12 +20,12 @@ package e2managererrors import "fmt" type WrongStateError struct { - Err BaseError + *BaseError } func NewWrongStateError(activityName string, state string) *WrongStateError { return &WrongStateError{ - BaseError{ + &BaseError{ Code: 403, Message: fmt.Sprintf("Activity <%s> rejected. RAN current state <%s> does not allow its execution ", activityName, state) , }, @@ -33,5 +33,5 @@ func NewWrongStateError(activityName string, state string) *WrongStateError { } func (e *WrongStateError) Error() string { - return e.Err.Message + return e.Message } diff --git a/E2Manager/e2pdus/x2_reset_known_causes_test.go b/E2Manager/e2pdus/x2_reset_known_causes_test.go index 96de726..449cbbf 100644 --- a/E2Manager/e2pdus/x2_reset_known_causes_test.go +++ b/E2Manager/e2pdus/x2_reset_known_causes_test.go @@ -95,7 +95,7 @@ func TestPrepareX2ResetPDUsFailure(t *testing.T) { t.Errorf("want: error, got: success.\n") } - expected := "#x2_reset_known_causes_test.TestPrepareX2ResetPDUsFailure - failed to build and pack the reset message #src/asn1codec_utils.c.pack_pdu_aux - Encoded output of E2AP-PDU, is too big:" + expected := "#x2_reset_known_causes.prepareX2ResetPDUs - failed to build and pack the reset message #src/asn1codec_utils.c.pack_pdu_aux - Encoded output of E2AP-PDU, is too big:" if !strings.Contains(err.Error(), expected) { t.Errorf("want :[%s], got: [%s]\n", expected, err) } -- 2.16.6