X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fcontrollers%2Fnodeb_controller.go;h=45fdb3f177af24bdd95c84981f7504500350acf3;hb=76709204dfd7968156b5fa81190f146a8991812d;hp=b1fd087e3bae55f34702df2503c15d863b04e338;hpb=de19068aaa1f3d2b415cd960106121ceb167aaa9;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/controllers/nodeb_controller.go b/E2Manager/controllers/nodeb_controller.go
index b1fd087..45fdb3f 100644
--- a/E2Manager/controllers/nodeb_controller.go
+++ b/E2Manager/controllers/nodeb_controller.go
@@ -13,7 +13,9 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-//
+
+//  This source code is part of the near-RT RIC (RAN Intelligent Controller)
+//  platform project (RICP).
 
 package controllers
 
@@ -23,6 +25,9 @@ import (
 	"e2mgr/models"
 	"e2mgr/providers/httpmsghandlerprovider"
 	"encoding/json"
+	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
+	"github.com/golang/protobuf/jsonpb"
+	"github.com/golang/protobuf/proto"
 	"github.com/gorilla/mux"
 	"io"
 	"io/ioutil"
@@ -35,14 +40,16 @@ const (
 	ParamRanName = "ranName"
 	LimitRequest = 2000
 )
+const ApplicationJson = "application/json"
+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)
+	SetGeneralConfiguration(writer http.ResponseWriter, r *http.Request)
 }
 
 type NodebController struct {
@@ -71,6 +78,35 @@ func (c *NodebController) GetNodeb(writer http.ResponseWriter, r *http.Request)
 	c.handleRequest(writer, &r.Header, httpmsghandlerprovider.GetNodebRequest, request, false)
 }
 
+func (c *NodebController) UpdateGnb(writer http.ResponseWriter, r *http.Request) {
+	c.logger.Infof("[Client -> E2 Manager] #NodebController.UpdateGnb - request: %v", c.prettifyRequest(r))
+	vars := mux.Vars(r)
+	ranName := vars[ParamRanName]
+
+	request := models.UpdateGnbRequest{}
+
+	gnb := entities.Gnb{}
+
+	if !c.extractRequestBodyToProto(r, &gnb, writer) {
+		return
+	}
+
+	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.extractJsonBody(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)
@@ -89,28 +125,18 @@ 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) extractJsonBody(r *http.Request, request models.Request, writer http.ResponseWriter) bool {
@@ -133,9 +159,9 @@ func (c *NodebController) extractJsonBody(r *http.Request, request models.Reques
 	return true
 }
 
-func (c *NodebController) handleRequest(writer http.ResponseWriter, header *http.Header, requestName httpmsghandlerprovider.IncomingRequest, request models.Request, validateHeader bool) {
+func (c *NodebController) handleRequest(writer http.ResponseWriter, header *http.Header, requestName httpmsghandlerprovider.IncomingRequest, request models.Request, validateRequestHeaders bool) {
 
-	if validateHeader {
+	if validateRequestHeaders {
 
 		err := c.validateRequestHeader(header)
 		if err != nil {
@@ -172,13 +198,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.Write([]byte(result))
+	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()
@@ -225,7 +251,14 @@ func (c *NodebController) handleErrorResponse(err error, writer http.ResponseWri
 			e2Error, _ := err.(*e2managererrors.ResourceNotFoundError)
 			errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
 			httpError = http.StatusNotFound
-
+		case *e2managererrors.E2TInstanceAbsenceError:
+			e2Error, _ := err.(*e2managererrors.E2TInstanceAbsenceError)
+			errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
+			httpError = http.StatusServiceUnavailable
+		case *e2managererrors.RoutingManagerError:
+			e2Error, _ := err.(*e2managererrors.RoutingManagerError)
+			errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
+			httpError = http.StatusServiceUnavailable
 		default:
 			e2Error := e2managererrors.NewInternalError()
 			errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
@@ -236,13 +269,9 @@ 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)
-
-	if err != nil {
-		c.logger.Errorf("#NodebController.handleErrorResponse - Cannot send response. writer:%v", writer)
-	}
 }
 
 func (c *NodebController) prettifyRequest(request *http.Request) string {