Merge "[RIC-395] - E2M new REST API - E2M Set Parameters - Automation + Decoder"

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

diff --git a/E2Manager/controllers/nodeb_controller.go b/E2Manager/controllers/nodeb_controller.go
index 49e821d..5bc2a2c 100644 (file)
--- a/E2Manager/controllers/nodeb_controller.go
+++ b/E2Manager/controllers/nodeb_controller.go
@@ -46,8 +46,6 @@ const ContentType = "Content-Type"
 type INodebController interface {
        Shutdown(writer http.ResponseWriter, r *http.Request)
        X2Reset(writer http.ResponseWriter, r *http.Request)
-       X2Setup(writer http.ResponseWriter, r *http.Request)
-       EndcSetup(writer http.ResponseWriter, r *http.Request)
        GetNodeb(writer http.ResponseWriter, r *http.Request)
        UpdateGnb(writer http.ResponseWriter, r *http.Request)
        GetNodebIdList(writer http.ResponseWriter, r *http.Request)
@@ -103,7 +101,7 @@ func (c *NodebController) SetGeneralConfiguration(writer http.ResponseWriter, r
 
        request := models.GeneralConfigurationRequest{}
 
-       if !c.extractJsonBody(r, &request, writer){
+       if !c.extractJsonBodyDisallowUnknownFields(r, &request, writer){
                return
        }
        c.handleRequest(writer, &r.Header, httpmsghandlerprovider.SetGeneralConfigurationRequest, request, false)
@@ -127,36 +125,27 @@ func (c *NodebController) X2Reset(writer http.ResponseWriter, r *http.Request) {
        c.handleRequest(writer, &r.Header, httpmsghandlerprovider.ResetRequest, request, false)
 }
 
-func (c *NodebController) X2Setup(writer http.ResponseWriter, r *http.Request) {
-       c.logger.Infof("[Client -> E2 Manager] #NodebController.X2Setup - 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 *NodebController) EndcSetup(writer http.ResponseWriter, r *http.Request) {
-       c.logger.Infof("[Client -> E2 Manager] #NodebController.EndcSetup - request: %v", c.prettifyRequest(r))
+func (c *NodebController) extractRequestBodyToProto(r *http.Request, pb proto.Message , writer http.ResponseWriter) bool {
+       defer r.Body.Close()
 
-       request := models.SetupRequest{}
+       err := jsonpb.Unmarshal(r.Body, pb)
 
-       if !c.extractJsonBody(r, &request, writer) {
-               return
+       if 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
        }
 
-       c.handleRequest(writer, &r.Header, httpmsghandlerprovider.EndcSetupRequest, request, true)
+       return true
 }
 
-func (c *NodebController) extractRequestBodyToProto(r *http.Request, pb proto.Message , writer http.ResponseWriter) bool {
+func (c *NodebController) extractJsonBodyDisallowUnknownFields(r *http.Request, request models.Request, writer http.ResponseWriter) bool {
        defer r.Body.Close()
 
-       err := jsonpb.Unmarshal(r.Body, pb)
+       decoder := json.NewDecoder(r.Body)
+       decoder.DisallowUnknownFields()
 
-       if err != nil {
+       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