SetGeneralConfiguration(writer http.ResponseWriter, r *http.Request)
AddEnb(writer http.ResponseWriter, r *http.Request)
DeleteEnb(writer http.ResponseWriter, r *http.Request)
+ HealthCheckRequest(writer http.ResponseWriter, r *http.Request)
}
type NodebController struct {
request.Gnb = &gnb
request.RanName = ranName
- c.handleRequest(writer, &r.Header, httpmsghandlerprovider.UpdateGnbRequest, request, true, http.StatusOK)
+ c.handleRequest(writer, &r.Header, httpmsghandlerprovider.UpdateGnbRequest, &request, true, http.StatusOK)
}
func (c *NodebController) UpdateEnb(writer http.ResponseWriter, r *http.Request) {
c.logger.Infof("[Client -> E2 Manager] #NodebController.UpdateEnb - request: %v", c.prettifyRequest(r))
- vars := mux.Vars(r)
- ranName := vars[ParamRanName]
- request := models.UpdateNodebRequest{}
+ defer r.Body.Close()
+ body, err := ioutil.ReadAll(r.Body)
+
+ if err != nil {
+ c.logger.Errorf("[Client -> E2 Manager] #NodebController.UpdateEnb - unable to read request body - error: %s", err)
+ c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer)
+ return
+ }
- enb := entities.Enb{}
+ updateEnbRequest := models.UpdateEnbRequest{}
+ err = json.Unmarshal(body, &updateEnbRequest)
- if !c.extractRequestBodyToProto(r, &enb, writer) {
+ if err != nil {
+ c.logger.Errorf("[Client -> E2 Manager] #NodebController.UpdateEnb - unable to unmarshal json - error: %s", err)
+ c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer)
return
}
- request.Enb = &enb
- request.RanName = ranName
- c.handleRequest(writer, &r.Header, httpmsghandlerprovider.UpdateEnbRequest, request, true, http.StatusOK)
+ vars := mux.Vars(r)
+ ranName := vars[ParamRanName]
+
+ updateEnbRequest.RanName = ranName
+
+ c.handleRequest(writer, &r.Header, httpmsghandlerprovider.UpdateEnbRequest, &updateEnbRequest, true, http.StatusOK)
}
func (c *NodebController) AddEnb(writer http.ResponseWriter, r *http.Request) {
c.logger.Infof("[Client -> E2 Manager] #NodebController.DeleteEnb - request: %v", c.prettifyRequest(r))
vars := mux.Vars(r)
ranName := vars["ranName"]
- request := models.DeleteEnbRequest{RanName: ranName}
+ request := &models.DeleteEnbRequest{RanName: ranName}
c.handleRequest(writer, &r.Header, httpmsghandlerprovider.DeleteEnbRequest, request, true, http.StatusNoContent)
}
c.handleRequest(writer, &r.Header, httpmsghandlerprovider.ResetRequest, request, false, http.StatusNoContent)
}
+func (c *NodebController) HealthCheckRequest(writer http.ResponseWriter, r *http.Request) {
+ c.logger.Infof("[Client -> E2 Manager] #NodebController.HealthCheckRequest - request: %v", c.prettifyRequest(r))
+
+ request := models.HealthCheckRequest{}
+
+ if err := c.extractJsonBody(r, &request); err != nil {
+ c.handleErrorResponse(err, writer)
+ return
+ }
+
+ c.handleRequest(writer, &r.Header, httpmsghandlerprovider.HealthCheckRequest, request, true, http.StatusNoContent)
+}
+
func (c *NodebController) extractRequestBodyToProto(r *http.Request, pb proto.Message, writer http.ResponseWriter) bool {
defer r.Body.Close()
e2Error, _ := err.(*e2managererrors.NodebExistsError)
errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
httpError = http.StatusBadRequest
+ case *e2managererrors.NoConnectedRanError:
+ e2Error, _ := err.(*e2managererrors.NoConnectedRanError)
+ errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
+ httpError = http.StatusNotFound
default:
e2Error := e2managererrors.NewInternalError()
errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}