"e2mgr/configuration"
"e2mgr/e2managererrors"
"e2mgr/logger"
+ "e2mgr/managers"
"e2mgr/models"
"e2mgr/providers/httpmsghandlerprovider"
"e2mgr/rNibWriter"
"e2mgr/services"
"encoding/json"
"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
- "github.com/julienschmidt/httprouter"
+ "github.com/gorilla/mux"
+ "io"
+ "io/ioutil"
"net/http"
+ "net/http/httputil"
+ "strings"
)
const (
ParamRanName = "ranName"
+ LimitRequest = 2000
)
+type IController interface {
+ ShutdownHandler(writer http.ResponseWriter, r *http.Request)
+ X2ResetHandler(writer http.ResponseWriter, r *http.Request)
+ X2SetupHandler(writer http.ResponseWriter, r *http.Request)
+ EndcSetupHandler(writer http.ResponseWriter, r *http.Request)
+}
+
type Controller struct {
logger *logger.Logger
handlerProvider *httpmsghandlerprovider.IncomingRequestHandlerProvider
}
func NewController(logger *logger.Logger, rmrService *services.RmrService, rNibReaderProvider func() reader.RNibReader, rNibWriterProvider func() rNibWriter.RNibWriter,
- config *configuration.Configuration) *Controller {
+ config *configuration.Configuration, ranSetupManager *managers.RanSetupManager) *Controller {
- provider := httpmsghandlerprovider.NewIncomingRequestHandlerProvider(logger, rmrService, config, rNibWriterProvider, rNibReaderProvider)
+ provider := httpmsghandlerprovider.NewIncomingRequestHandlerProvider(logger, rmrService, config, rNibWriterProvider, rNibReaderProvider, ranSetupManager)
return &Controller{
logger: logger,
handlerProvider: provider,
}
}
-func (c *Controller) ShutdownHandler(writer http.ResponseWriter, r *http.Request, params httprouter.Params) {
- c.logger.Infof("[Client -> E2 Manager] #controller.ShutdownHandler - request: %v", prettifyRequest(r))
- c.handleRequest(writer, &r.Header, httpmsghandlerprovider.ShutdownRequest, nil, false, http.StatusNoContent)
+func (c *Controller) ShutdownHandler(writer http.ResponseWriter, r *http.Request) {
+ c.logger.Infof("[Client -> E2 Manager] #controller.ShutdownHandler - request: %v", c.prettifyRequest(r))
+ c.handleRequest(writer, &r.Header, httpmsghandlerprovider.ShutdownRequest, nil, false)
}
-func (c *Controller) X2ResetHandler(writer http.ResponseWriter, r *http.Request, params httprouter.Params) {
- c.logger.Infof("[Client -> E2 Manager] #controller.X2ResetHandler - request: %v", prettifyRequest(r))
+func (c *Controller) X2ResetHandler(writer http.ResponseWriter, r *http.Request) {
+ c.logger.Infof("[Client -> E2 Manager] #controller.X2ResetHandler - request: %v", c.prettifyRequest(r))
request := models.ResetRequest{}
- ranName := params.ByName(ParamRanName)
+ vars := mux.Vars(r)
+ ranName := vars[ParamRanName]
- if !c.extractJsonBody(r, &request, writer) {
+ if r.ContentLength > 0 && !c.extractJsonBody(r, &request, writer) {
return
}
request.RanName = ranName
- c.handleRequest(writer, &r.Header, httpmsghandlerprovider.ResetRequest, request, false, http.StatusNoContent)
+ c.handleRequest(writer, &r.Header, httpmsghandlerprovider.ResetRequest, request, false)
+}
+
+func (c *Controller) X2SetupHandler(writer http.ResponseWriter, r *http.Request) {
+ c.logger.Infof("[Client -> E2 Manager] #controller.X2SetupHandler - request: %v", c.prettifyRequest(r))
+
+ request := models.SetupRequest{}
+
+ if !c.extractJsonBody(r, &request, writer) {
+ return
+ }
+
+ c.handleRequest(writer, &r.Header, httpmsghandlerprovider.X2SetupRequest, request, true)
+}
+
+func (c *Controller) EndcSetupHandler(writer http.ResponseWriter, r *http.Request) {
+ c.logger.Infof("[Client -> E2 Manager] #controller.EndcSetupHandler - request: %v", c.prettifyRequest(r))
+
+ request := models.SetupRequest{}
+
+ if !c.extractJsonBody(r, &request, writer) {
+ return
+ }
+
+ c.handleRequest(writer, &r.Header, httpmsghandlerprovider.EndcSetupRequest, request, true)
}
func (c *Controller) extractJsonBody(r *http.Request, request models.Request, writer http.ResponseWriter) bool {
- if r.ContentLength <= 0 {
- return true
+ defer r.Body.Close()
+ body, err := ioutil.ReadAll(io.LimitReader(r.Body, LimitRequest))
+
+ if err != nil {
+ c.logger.Errorf("[Client -> E2 Manager] #controller.extractJsonBody - unable to extract json body - error: %s", err)
+ c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer)
+ return false
}
- decoder := json.NewDecoder(r.Body)
- if err := decoder.Decode(request); err != nil {
- if err != nil {
- c.logger.Errorf("[Client -> E2 Manager] #controller.extractJsonBody - unable to extract json body - error: %s", err)
- c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer)
- return false
- }
+ err = json.Unmarshal(body, &request)
+ if err != nil {
+ c.logger.Errorf("[Client -> E2 Manager] #controller.extractJsonBody - unable to extract json body - error: %s", err)
+ c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer)
+ return false
}
return true
}
func (c *Controller) handleRequest(writer http.ResponseWriter, header *http.Header, requestName httpmsghandlerprovider.IncomingRequest,
- request models.Request, validateHeader bool, httpStatusResponse int) {
+ request models.Request, validateHeader bool) {
if validateHeader {
}
handler, err := c.handlerProvider.GetHandler(requestName)
+
if err != nil {
c.handleErrorResponse(err, writer)
return
}
- err = handler.Handle(c.logger, request)
+ err = handler.Handle(request)
if err != nil {
c.handleErrorResponse(err, writer)
return
}
- writer.WriteHeader(httpStatusResponse)
- c.logger.Infof("[E2 Manager -> Client] #controller.handleRequest - status response: %v", httpStatusResponse)
+ writer.WriteHeader(http.StatusNoContent)
+ c.logger.Infof("[E2 Manager -> Client] #controller.handleRequest - status response: %v", http.StatusNoContent)
}
func (c *Controller) validateRequestHeader(header *http.Header) error {
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
}
}
c.logger.Errorf("#controller.handleErrorResponse - Cannot send response. writer:%v", writer)
}
}
+
+func (c *Controller) prettifyRequest(request *http.Request) string {
+ dump, _ := httputil.DumpRequest(request, true)
+ requestPrettyPrint := strings.Replace(string(dump), "\r\n", " ", -1)
+ return strings.Replace(requestPrettyPrint, "\n", "", -1)
+}