Merge "Ric-193 - On Success, return Setup Response"

[ric-plt/e2mgr.git] / E2Manager / controllers / nodeb_controller.go

diff --git a/E2Manager/controllers/nodeb_controller.go b/E2Manager/controllers/nodeb_controller.go
index cbfa7d6..7b8a86f 100644 (file)
--- a/E2Manager/controllers/nodeb_controller.go
+++ b/E2Manager/controllers/nodeb_controller.go
@@ -232,6 +232,10 @@ func (c *NodebController) handleErrorResponse(err error, writer http.ResponseWri
                        e2Error, _ := err.(*e2managererrors.E2TInstanceAbsenceError)
                        errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
                        httpError = http.StatusServiceUnavailable
+               case *e2managererrors.RoutingManagerError:
+                       e2Error, _ := err.(*e2managererrors.RoutingManagerError)
+                       errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
+                       httpError = http.StatusServiceUnavailable
                default:
                        e2Error := e2managererrors.NewInternalError()
                        errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
@@ -245,10 +249,6 @@ func (c *NodebController) handleErrorResponse(err error, writer http.ResponseWri
        writer.Header().Set("Content-Type", "application/json")
        writer.WriteHeader(httpError)
        _, err = writer.Write(errorResponse)
-
-       if err != nil {
-               c.logger.Errorf("#NodebController.handleErrorResponse - Cannot send response. writer:%v", writer)
-       }
 }
 
 func (c *NodebController) prettifyRequest(request *http.Request) string {