X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fcontrollers%2Fcontroller.go;h=f9a7bb3de94565656e5da7e69b92c38da8e8a11e;hb=926296eef49b076a23c4806513f3e719c8a6f685;hp=7d549b25e847eaae1c63872bf12e984ca36cdc18;hpb=947897d1f1df89967f4db1862d67a5649e10f3a2;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/controllers/controller.go b/E2Manager/controllers/controller.go
index 7d549b2..f9a7bb3 100644
--- a/E2Manager/controllers/controller.go
+++ b/E2Manager/controllers/controller.go
@@ -21,6 +21,7 @@ import (
 	"e2mgr/configuration"
 	"e2mgr/e2managererrors"
 	"e2mgr/logger"
+	"e2mgr/managers"
 	"e2mgr/models"
 	"e2mgr/providers/httpmsghandlerprovider"
 	"e2mgr/rNibWriter"
@@ -28,16 +29,23 @@ import (
 	"encoding/json"
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
 	"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 {
@@ -46,9 +54,9 @@ type Controller struct {
 }
 
 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,
@@ -56,42 +64,69 @@ func NewController(logger *logger.Logger, rmrService *services.RmrService, rNibR
 }
 
 func (c *Controller) ShutdownHandler(writer http.ResponseWriter, r *http.Request) {
-	c.logger.Infof("[Client -> E2 Manager] #controller.ShutdownHandler - request: %v", prettifyRequest(r))
-	c.handleRequest(writer, &r.Header, httpmsghandlerprovider.ShutdownRequest, nil, false, http.StatusNoContent)
+	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) {
-	c.logger.Infof("[Client -> E2 Manager] #controller.X2ResetHandler - request: %v", prettifyRequest(r))
+	c.logger.Infof("[Client -> E2 Manager] #controller.X2ResetHandler - request: %v", c.prettifyRequest(r))
 	request := models.ResetRequest{}
 	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 {
 
@@ -103,20 +138,21 @@ func (c *Controller) handleRequest(writer http.ResponseWriter, header *http.Head
 	}
 
 	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 {
@@ -187,3 +223,9 @@ func (c *Controller) handleErrorResponse(err error, writer http.ResponseWriter)
 		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)
+}