X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fcontrollers%2Fcontroller_test.go;h=69dbfdae81b96977b3f826691707958afc7d378c;hb=3f9a67b3d8e15bc725f2f66adf499617ffc0d2fc;hp=b869252f961b9020ebaddc56ea1e142fd2e0f161;hpb=19e72a51b5edbf108d230093fdf85b42fe5ab470;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/controllers/controller_test.go b/E2Manager/controllers/controller_test.go
index b869252..69dbfda 100644
--- a/E2Manager/controllers/controller_test.go
+++ b/E2Manager/controllers/controller_test.go
@@ -33,7 +33,7 @@ import (
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
-	"github.com/julienschmidt/httprouter"
+	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"io"
@@ -58,18 +58,18 @@ func TestShutdownHandlerRnibError(t *testing.T) {
 		return writerMock
 	}
 
-	rnibErr := &common.RNibError{}
+	rnibErr := &common.ResourceNotFoundError{}
 	var nbIdentityList []*entities.NbIdentity
 	readerMock.On("GetListNodebIds").Return(nbIdentityList, rnibErr)
 
 	writer := httptest.NewRecorder()
 	controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config)
-	controller.ShutdownHandler(writer, tests.GetHttpRequest(), nil)
+	controller.ShutdownHandler(writer, tests.GetHttpRequest())
 
 	var errorResponse = parseJsonRequest(t, writer.Body)
 
 	assert.Equal(t, http.StatusInternalServerError, writer.Result().StatusCode)
-	assert.Equal(t, errorResponse.Code, e2managererrors.NewRnibDbError().Err.Code)
+	assert.Equal(t, errorResponse.Code, e2managererrors.NewRnibDbError().Code)
 }
 
 func TestHeaderValidationFailed(t *testing.T) {
@@ -98,8 +98,8 @@ func TestHeaderValidationFailed(t *testing.T) {
 	err := e2managererrors.NewHeaderValidationError()
 
 	assert.Equal(t, http.StatusUnsupportedMediaType, writer.Result().StatusCode)
-	assert.Equal(t, errorResponse.Code, err.Err.Code)
-	assert.Equal(t, errorResponse.Message, err.Err.Message)
+	assert.Equal(t, errorResponse.Code, err.Code)
+	assert.Equal(t, errorResponse.Message, err.Message)
 }
 
 func TestShutdownStatusNoContent(t *testing.T) {
@@ -116,13 +116,13 @@ func TestShutdownStatusNoContent(t *testing.T) {
 	}
 	config := configuration.ParseConfiguration()
 
-	var rnibError common.IRNibError
+	var rnibError error
 	nbIdentityList := []*entities.NbIdentity{}
 	readerMock.On("GetListNodebIds").Return(nbIdentityList, rnibError)
 
 	writer := httptest.NewRecorder()
 	controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config)
-	controller.ShutdownHandler(writer, tests.GetHttpRequest(), nil)
+	controller.ShutdownHandler(writer, tests.GetHttpRequest())
 
 	assert.Equal(t, http.StatusNoContent, writer.Result().StatusCode)
 }
@@ -149,8 +149,8 @@ func TestHandleInternalError(t *testing.T) {
 	var errorResponse = parseJsonRequest(t, writer.Body)
 
 	assert.Equal(t, http.StatusInternalServerError, writer.Result().StatusCode)
-	assert.Equal(t, errorResponse.Code, err.Err.Code)
-	assert.Equal(t, errorResponse.Message, err.Err.Message)
+	assert.Equal(t, errorResponse.Code, err.Code)
+	assert.Equal(t, errorResponse.Message, err.Message)
 }
 
 func TestHandleCommandAlreadyInProgressError(t *testing.T) {
@@ -174,8 +174,8 @@ func TestHandleCommandAlreadyInProgressError(t *testing.T) {
 	var errorResponse = parseJsonRequest(t, writer.Body)
 
 	assert.Equal(t, http.StatusMethodNotAllowed, writer.Result().StatusCode)
-	assert.Equal(t, errorResponse.Code, err.Err.Code)
-	assert.Equal(t, errorResponse.Message, err.Err.Message)
+	assert.Equal(t, errorResponse.Code, err.Code)
+	assert.Equal(t, errorResponse.Message, err.Message)
 }
 
 func TestValidateHeaders(t *testing.T) {
@@ -253,9 +253,9 @@ func TestX2ResetHandleSuccessfulRequestedCause(t *testing.T) {
 	b := new(bytes.Buffer)
 	_ = json.NewEncoder(b).Encode(data4Req)
 	req, _ := http.NewRequest("PUT", "https://localhost:3800/nodeb-reset", b)
+	req = mux.SetURLVars(req, map[string]string{"ranName": ranName})
 
-	param := httprouter.Param{Key: "ranName", Value: ranName}
-	controller.X2ResetHandler(writer, req, []httprouter.Param{param})
+	controller.X2ResetHandler(writer, req)
 	assert.Equal(t, http.StatusNoContent, writer.Result().StatusCode)
 
 }
@@ -292,9 +292,9 @@ func TestX2ResetHandleSuccessfulRequestedDefault(t *testing.T) {
 	// no body
 	b := new(bytes.Buffer)
 	req, _ := http.NewRequest("PUT", "https://localhost:3800/nodeb-reset", b)
+	req = mux.SetURLVars(req, map[string]string{"ranName": ranName})
 
-	param := httprouter.Param{Key: "ranName", Value: ranName}
-	controller.X2ResetHandler(writer, req, []httprouter.Param{param})
+	controller.X2ResetHandler(writer, req)
 	assert.Equal(t, http.StatusNoContent, writer.Result().StatusCode)
 
 }
@@ -323,9 +323,9 @@ func TestX2ResetHandleFailureInvalidBody(t *testing.T) {
 	// Invalid json: attribute name without quotes (should be "cause":).
 	b := strings.NewReader("{cause:\"protocol:transfer-syntax-error\"")
 	req, _ := http.NewRequest("PUT", "https://localhost:3800/nodeb-reset", b)
+	req = mux.SetURLVars(req, map[string]string{"ranName": ranName})
 
-	param := httprouter.Param{Key: "ranName", Value: ranName}
-	controller.X2ResetHandler(writer, req, []httprouter.Param{param})
+	controller.X2ResetHandler(writer, req)
 	assert.Equal(t, http.StatusBadRequest, writer.Result().StatusCode)
 
 	_, ok := rmrService.E2sessions[ranName]