X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fcontrollers%2Fnodeb_controller.go;h=ece69415cd223b18b9a71e283d558dbd09d1bee8;hb=refs%2Fchanges%2F09%2F4809%2F6;hp=ed13a66cb4f19b69b3d5dd3ecbbe7abc2e7b745a;hpb=7e2e493acba882641329f867cccb73b3d2a2d2d8;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/controllers/nodeb_controller.go b/E2Manager/controllers/nodeb_controller.go
index ed13a66..ece6941 100644
--- a/E2Manager/controllers/nodeb_controller.go
+++ b/E2Manager/controllers/nodeb_controller.go
@@ -1,6 +1,7 @@
 //
 // Copyright 2019 AT&T Intellectual Property
 // Copyright 2019 Nokia
+// Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -48,10 +49,13 @@ type INodebController interface {
 	X2Reset(writer http.ResponseWriter, r *http.Request)
 	GetNodeb(writer http.ResponseWriter, r *http.Request)
 	UpdateGnb(writer http.ResponseWriter, r *http.Request)
+	UpdateEnb(writer http.ResponseWriter, r *http.Request)
 	GetNodebIdList(writer http.ResponseWriter, r *http.Request)
+	GetNodebId(writer http.ResponseWriter, r *http.Request)
 	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 {
@@ -72,6 +76,15 @@ func (c *NodebController) GetNodebIdList(writer http.ResponseWriter, r *http.Req
 	c.handleRequest(writer, &r.Header, httpmsghandlerprovider.GetNodebIdListRequest, nil, false, http.StatusOK)
 }
 
+func (c *NodebController) GetNodebId(writer http.ResponseWriter, r *http.Request) {
+	c.logger.Infof("[Client -> E2 Manager] #NodebController.GetNodebId - request: %v", c.prettifyRequest(r))
+	vars := mux.Vars(r)
+	ranName := vars["ranName"]
+	request := models.GetNodebIdRequest{RanName: ranName}
+
+	c.handleRequest(writer, &r.Header, httpmsghandlerprovider.GetNodebIdRequest, request, false, http.StatusOK)
+}
+
 func (c *NodebController) GetNodeb(writer http.ResponseWriter, r *http.Request) {
 	c.logger.Infof("[Client -> E2 Manager] #NodebController.GetNodeb - request: %v", c.prettifyRequest(r))
 	vars := mux.Vars(r)
@@ -95,14 +108,43 @@ func (c *NodebController) UpdateGnb(writer http.ResponseWriter, r *http.Request)
 
 	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))
+
+	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
+	}
+
+	updateEnbRequest := models.UpdateEnbRequest{}
+	err = json.Unmarshal(body, &updateEnbRequest)
+
+	if err != nil {
+		c.logger.Errorf("[Client -> E2 Manager] #NodebController.UpdateEnb - unable to unmarshal json - error: %s", err)
+		c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer)
+		return
+	}
+
+	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.AddEnb - request: %v", c.prettifyRequest(r))
 
 	defer r.Body.Close()
-	body, err := ioutil.ReadAll(io.LimitReader(r.Body, LimitRequest))
+	body, err := ioutil.ReadAll(r.Body)
 
 	if err != nil {
 		c.logger.Errorf("[Client -> E2 Manager] #NodebController.AddEnb - unable to read request body - error: %s", err)
@@ -126,7 +168,7 @@ func (c *NodebController) DeleteEnb(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)
 }
 
@@ -160,6 +202,19 @@ func (c *NodebController) X2Reset(writer http.ResponseWriter, r *http.Request) {
 	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.StatusAccepted)
+}
+
 func (c *NodebController) extractRequestBodyToProto(r *http.Request, pb proto.Message, writer http.ResponseWriter) bool {
 	defer r.Body.Close()
 
@@ -312,6 +367,10 @@ func (c *NodebController) handleErrorResponse(err error, writer http.ResponseWri
 			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}