X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fcontrollers%2Fnodeb_controller.go;h=cef57f951d3a15715b745ec9ffbf1c3d803b78cc;hb=refs%2Fchanges%2F63%2F4163%2F2;hp=90b9311d8f2da0f52afb2bd8b6c065a9c4012db6;hpb=514e6041ca6b9b92cb887c941767f298a746e315;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/controllers/nodeb_controller.go b/E2Manager/controllers/nodeb_controller.go
index 90b9311..cef57f9 100644
--- a/E2Manager/controllers/nodeb_controller.go
+++ b/E2Manager/controllers/nodeb_controller.go
@@ -40,6 +40,8 @@ const (
 	ParamRanName = "ranName"
 	LimitRequest = 2000
 )
+const ApplicationJson = "application/json"
+const ContentType = "Content-Type"
 
 type INodebController interface {
 	Shutdown(writer http.ResponseWriter, r *http.Request)
@@ -49,6 +51,7 @@ type INodebController interface {
 	GetNodeb(writer http.ResponseWriter, r *http.Request)
 	UpdateGnb(writer http.ResponseWriter, r *http.Request)
 	GetNodebIdList(writer http.ResponseWriter, r *http.Request)
+	SetGeneralConfiguration(writer http.ResponseWriter, r *http.Request)
 }
 
 type NodebController struct {
@@ -90,11 +93,22 @@ func (c *NodebController) UpdateGnb(writer http.ResponseWriter, r *http.Request)
 		return
 	}
 
-	request.Gnb = &gnb;
+	request.Gnb = &gnb
 	request.RanName = ranName
 	c.handleRequest(writer, &r.Header, httpmsghandlerprovider.UpdateGnbRequest, request, true)
 }
 
+func (c *NodebController) SetGeneralConfiguration(writer http.ResponseWriter, r *http.Request) {
+	c.logger.Infof("[Client -> E2 Manager] #NodebController.SetGeneralConfiguration - request: %v", c.prettifyRequest(r))
+
+	request := models.GeneralConfigurationRequest{}
+
+	if !c.extractJsonBodyDisallowUnknownFields(r, &request, writer){
+		return
+	}
+	c.handleRequest(writer, &r.Header, httpmsghandlerprovider.SetGeneralConfigurationRequest, request, false)
+}
+
 func (c *NodebController) Shutdown(writer http.ResponseWriter, r *http.Request) {
 	c.logger.Infof("[Client -> E2 Manager] #NodebController.Shutdown - request: %v", c.prettifyRequest(r))
 	c.handleRequest(writer, &r.Header, httpmsghandlerprovider.ShutdownRequest, nil, false)
@@ -151,6 +165,21 @@ func (c *NodebController) extractRequestBodyToProto(r *http.Request, pb proto.Me
 	return true
 }
 
+func (c *NodebController) extractJsonBodyDisallowUnknownFields(r *http.Request, request models.Request, writer http.ResponseWriter) bool {
+	defer r.Body.Close()
+
+	decoder := json.NewDecoder(r.Body)
+	decoder.DisallowUnknownFields()
+
+	if err := decoder.Decode(&request); err != nil {
+		c.logger.Errorf("[Client -> E2 Manager] #NodebController.extractJsonBody - unable to extract json body - error: %s", err)
+		c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer)
+		return false
+	}
+
+	return true
+}
+
 func (c *NodebController) extractJsonBody(r *http.Request, request models.Request, writer http.ResponseWriter) bool {
 	defer r.Body.Close()
 	body, err := ioutil.ReadAll(io.LimitReader(r.Body, LimitRequest))
@@ -210,13 +239,13 @@ func (c *NodebController) handleRequest(writer http.ResponseWriter, header *http
 	}
 
 	c.logger.Infof("[E2 Manager -> Client] #NodebController.handleRequest - response: %s", result)
-	writer.Header().Set("Content-Type", "application/json")
+	writer.Header().Set(ContentType, ApplicationJson)
 	writer.Write(result)
 }
 
 func (c *NodebController) validateRequestHeader(header *http.Header) error {
 
-	if header.Get("Content-Type") != "application/json" {
+	if header.Get(ContentType) != ApplicationJson {
 		c.logger.Errorf("#NodebController.validateRequestHeader - validation failure, incorrect content type")
 
 		return e2managererrors.NewHeaderValidationError()
@@ -281,7 +310,7 @@ func (c *NodebController) handleErrorResponse(err error, writer http.ResponseWri
 
 	c.logger.Errorf("[E2 Manager -> Client] #NodebController.handleErrorResponse - http status: %d, error response: %+v", httpError, errorResponseDetails)
 
-	writer.Header().Set("Content-Type", "application/json")
+	writer.Header().Set(ContentType, ApplicationJson)
 	writer.WriteHeader(httpError)
 	_, err = writer.Write(errorResponse)
 }