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

diff --git a/E2Manager/controllers/controller.go b/E2Manager/controllers/controller.go
index 4f785da..7d549b2 100644
--- a/E2Manager/controllers/controller.go
+++ b/E2Manager/controllers/controller.go
@@ -27,7 +27,7 @@ import (
 	"e2mgr/services"
 	"encoding/json"
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
-	"github.com/julienschmidt/httprouter"
+	"github.com/gorilla/mux"
 	"net/http"
 )
 
@@ -35,6 +35,11 @@ const (
 	ParamRanName = "ranName"
 )
 
+type IController interface {
+	ShutdownHandler(writer http.ResponseWriter, r *http.Request)
+	X2ResetHandler(writer http.ResponseWriter, r *http.Request)
+}
+
 type Controller struct {
 	logger          *logger.Logger
 	handlerProvider *httpmsghandlerprovider.IncomingRequestHandlerProvider
@@ -50,15 +55,16 @@ func NewController(logger *logger.Logger, rmrService *services.RmrService, rNibR
 	}
 }
 
-func (c *Controller) ShutdownHandler(writer http.ResponseWriter, r *http.Request, params httprouter.Params) {
+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)
 }
 
-func (c *Controller) X2ResetHandler(writer http.ResponseWriter, r *http.Request, params httprouter.Params) {
+func (c *Controller) X2ResetHandler(writer http.ResponseWriter, r *http.Request) {
 	c.logger.Infof("[Client -> E2 Manager] #controller.X2ResetHandler - request: %v", prettifyRequest(r))
 	request := models.ResetRequest{}
-	ranName := params.ByName(ParamRanName)
+	vars := mux.Vars(r)
+	ranName := vars[ParamRanName]
 
 	if !c.extractJsonBody(r, &request, writer) {
 		return
@@ -132,40 +138,40 @@ func (c *Controller) handleErrorResponse(err error, writer http.ResponseWriter)
 		switch err.(type) {
 		case *e2managererrors.RnibDbError:
 			e2Error, _ := err.(*e2managererrors.RnibDbError)
-			errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
+			errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
 			httpError = http.StatusInternalServerError
 		case *e2managererrors.CommandAlreadyInProgressError:
 			e2Error, _ := err.(*e2managererrors.CommandAlreadyInProgressError)
-			errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
+			errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
 			httpError = http.StatusMethodNotAllowed
 		case *e2managererrors.HeaderValidationError:
 			e2Error, _ := err.(*e2managererrors.HeaderValidationError)
-			errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
+			errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
 			httpError = http.StatusUnsupportedMediaType
 		case *e2managererrors.WrongStateError:
 			e2Error, _ := err.(*e2managererrors.WrongStateError)
-			errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
+			errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
 			httpError = http.StatusBadRequest
 		case *e2managererrors.RequestValidationError:
 			e2Error, _ := err.(*e2managererrors.RequestValidationError)
-			errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
+			errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
 			httpError = http.StatusBadRequest
 		case *e2managererrors.InvalidJsonError:
 			e2Error, _ := err.(*e2managererrors.InvalidJsonError)
-			errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
+			errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
 			httpError = http.StatusBadRequest
 		case *e2managererrors.RmrError:
 			e2Error, _ := err.(*e2managererrors.RmrError)
-			errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
+			errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
 			httpError = http.StatusInternalServerError
 		case *e2managererrors.ResourceNotFoundError:
 			e2Error, _ := err.(*e2managererrors.ResourceNotFoundError)
-			errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
+			errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
 			httpError = http.StatusNotFound
 
 		default:
 			e2Error := e2managererrors.NewInternalError()
-			errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
+			errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
 			httpError = http.StatusInternalServerError
 		}
 	}