package controllers
import (
+ "bytes"
"e2mgr/configuration"
"e2mgr/e2managererrors"
+ "e2mgr/e2pdus"
"e2mgr/logger"
+ "e2mgr/managers"
"e2mgr/mocks"
"e2mgr/models"
- "e2mgr/providers"
+ "e2mgr/providers/httpmsghandlerprovider"
"e2mgr/rNibWriter"
+ "e2mgr/rmrCgo"
"e2mgr/tests"
"encoding/json"
+ "fmt"
"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/gorilla/mux"
"github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/mock"
"io"
"io/ioutil"
"net/http"
"net/http/httptest"
+ "strings"
"testing"
)
+func TestX2SetupInvalidBody(t *testing.T) {
+
+ readerMock, writerMock, rmrMessengerMock, ranSetupManager := initTest(t)
+ log := initLog(t)
+
+ readerProvider := func() reader.RNibReader {
+ return readerMock
+ }
+ writerProvider := func() rNibWriter.RNibWriter {
+ return writerMock
+ }
+
+ header := http.Header{}
+ header.Set("Content-Type", "application/json")
+ httpRequest, _ := http.NewRequest("POST", "http://localhost:3800/v1/nodeb/x2-setup", strings.NewReader("{}{}"))
+ httpRequest.Header = header
+
+ writer := httptest.NewRecorder()
+ config := configuration.ParseConfiguration()
+ controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config, ranSetupManager)
+ controller.X2SetupHandler(writer, httpRequest)
+
+ var errorResponse = parseJsonRequest(t, writer.Body)
+
+ assert.Equal(t, http.StatusBadRequest, writer.Result().StatusCode)
+ assert.Equal(t, e2managererrors.NewInvalidJsonError().Code, errorResponse.Code)
+}
+
+func TestX2SetupSuccess(t *testing.T) {
+
+ readerMock, writerMock, rmrMessengerMock, ranSetupManager := initTest(t)
+ log := initLog(t)
+
+ readerProvider := func() reader.RNibReader {
+ return readerMock
+ }
+ writerProvider := func() rNibWriter.RNibWriter {
+ return writerMock
+ }
+
+ ranName := "test"
+ nb := &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
+ readerMock.On("GetNodeb", ranName).Return(nb, nil)
+
+ var nbUpdated = &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1}
+ writerMock.On("UpdateNodebInfo", nbUpdated).Return(nil)
+
+ payload := e2pdus.PackedX2setupRequest
+ xaction := []byte(ranName)
+ msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), ranName, &payload, &xaction)
+
+ rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(msg, nil)
+
+ header := http.Header{}
+ header.Set("Content-Type", "application/json")
+ httpRequest := tests.GetHttpRequest()
+ httpRequest.Header = header
+
+ writer := httptest.NewRecorder()
+ config := configuration.ParseConfiguration()
+ controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config, ranSetupManager)
+ controller.X2SetupHandler(writer, httpRequest)
+
+ assert.Equal(t, http.StatusNoContent, writer.Result().StatusCode)
+}
+
+func TestEndcSetupSuccess(t *testing.T) {
+
+ readerMock, writerMock, rmrMessengerMock, ranSetupManager := initTest(t)
+ log := initLog(t)
+
+ readerProvider := func() reader.RNibReader {
+ return readerMock
+ }
+ writerProvider := func() rNibWriter.RNibWriter {
+ return writerMock
+ }
+
+ ranName := "test"
+ nb := &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST}
+ readerMock.On("GetNodeb", ranName).Return(nb, nil)
+
+ var nbUpdated = &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST, ConnectionAttempts: 1}
+ writerMock.On("UpdateNodebInfo", nbUpdated).Return(nil)
+
+ payload := e2pdus.PackedEndcX2setupRequest
+ xaction := []byte(ranName)
+ msg := rmrCgo.NewMBuf(rmrCgo.RIC_ENDC_X2_SETUP_REQ, len(payload), ranName, &payload, &xaction)
+
+ rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(msg, nil)
+
+ header := http.Header{}
+ header.Set("Content-Type", "application/json")
+ httpRequest := tests.GetHttpRequest()
+ httpRequest.Header = header
+
+ writer := httptest.NewRecorder()
+ config := configuration.ParseConfiguration()
+ controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config, ranSetupManager)
+ controller.EndcSetupHandler(writer, httpRequest)
+
+ assert.Equal(t, http.StatusNoContent, writer.Result().StatusCode)
+}
+
func TestShutdownHandlerRnibError(t *testing.T) {
log := initLog(t)
config := configuration.ParseConfiguration()
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)
+ ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter)
+ controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config, ranSetupManager)
+ 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) {
}
writer := httptest.NewRecorder()
-
- controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config)
+ ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter)
+ controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config, ranSetupManager)
header := &http.Header{}
- controller.handleRequest(writer, header, providers.ShutdownRequest, nil, true, http.StatusNoContent)
+ controller.handleRequest(writer, header, httpmsghandlerprovider.ShutdownRequest, nil, true)
var errorResponse = parseJsonRequest(t, writer.Body)
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){
+func TestShutdownStatusNoContent(t *testing.T) {
log := initLog(t)
rmrMessengerMock := &mocks.RmrMessengerMock{}
}
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)
+ ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter)
+ controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config, ranSetupManager)
+ controller.ShutdownHandler(writer, tests.GetHttpRequest())
assert.Equal(t, http.StatusNoContent, writer.Result().StatusCode)
}
}
writer := httptest.NewRecorder()
- controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config)
+ ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter)
+ controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config, ranSetupManager)
err := e2managererrors.NewInternalError()
controller.handleErrorResponse(err, writer)
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) {
return writerMock
}
writer := httptest.NewRecorder()
- controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config)
+ ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter)
+ controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config, ranSetupManager)
err := e2managererrors.NewCommandAlreadyInProgressError()
controller.handleErrorResponse(err, writer)
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){
+func TestValidateHeaders(t *testing.T) {
log := initLog(t)
rmrMessengerMock := &mocks.RmrMessengerMock{}
return writerMock
}
config := configuration.ParseConfiguration()
-
- controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config)
+ ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter)
+ controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config, ranSetupManager)
header := http.Header{}
header.Set("Content-Type", "application/json")
}
return log
}
+
+func TestX2ResetHandleSuccessfulRequestedCause(t *testing.T) {
+ log := initLog(t)
+
+ ranName := "test1"
+
+ readerMock := &mocks.RnibReaderMock{}
+ readerProvider := func() reader.RNibReader {
+ return readerMock
+ }
+ writerMock := &mocks.RnibWriterMock{}
+ writerProvider := func() rNibWriter.RNibWriter {
+ return writerMock
+ }
+ payload := []byte{0x00, 0x07, 0x00, 0x08, 0x00, 0x00, 0x01, 0x00, 0x05, 0x40, 0x01, 0x40}
+ xaction := []byte(ranName)
+ msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_RESET, len(payload), ranName, &payload, &xaction)
+ rmrMessengerMock := &mocks.RmrMessengerMock{}
+ rmrMessengerMock.On("SendMsg", msg, mock.Anything).Return(msg, nil)
+
+ config := configuration.ParseConfiguration()
+ rmrService := getRmrService(rmrMessengerMock, log)
+
+ writer := httptest.NewRecorder()
+ ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter)
+ controller := NewController(log, rmrService, readerProvider, writerProvider, config, ranSetupManager)
+
+ var nodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED}
+ readerMock.On("GetNodeb", ranName).Return(nodeb, nil)
+
+ data4Req := map[string]interface{}{"cause": "protocol:transfer-syntax-error"}
+ 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})
+
+ controller.X2ResetHandler(writer, req)
+ assert.Equal(t, http.StatusNoContent, writer.Result().StatusCode)
+
+}
+
+func TestX2ResetHandleSuccessfulRequestedDefault(t *testing.T) {
+ log := initLog(t)
+
+ ranName := "test1"
+
+ readerMock := &mocks.RnibReaderMock{}
+ readerProvider := func() reader.RNibReader {
+ return readerMock
+ }
+ writerMock := &mocks.RnibWriterMock{}
+ writerProvider := func() rNibWriter.RNibWriter {
+ return writerMock
+ }
+ // o&m intervention
+ payload := []byte{0x00, 0x07, 0x00, 0x08, 0x00, 0x00, 0x01, 0x00, 0x05, 0x40, 0x01, 0x64}
+ xaction := []byte(ranName)
+ msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_RESET, len(payload), ranName, &payload, &xaction)
+ rmrMessengerMock := &mocks.RmrMessengerMock{}
+ rmrMessengerMock.On("SendMsg", msg, mock.Anything).Return(msg, nil)
+
+ config := configuration.ParseConfiguration()
+ rmrService := getRmrService(rmrMessengerMock, log)
+
+ writer := httptest.NewRecorder()
+ ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter)
+ controller := NewController(log, rmrService, readerProvider, writerProvider, config, ranSetupManager)
+
+ var nodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED}
+ readerMock.On("GetNodeb", ranName).Return(nodeb, nil)
+
+ // 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})
+
+ controller.X2ResetHandler(writer, req)
+ assert.Equal(t, http.StatusNoContent, writer.Result().StatusCode)
+
+}
+
+func TestX2ResetHandleFailureInvalidBody(t *testing.T) {
+ log := initLog(t)
+
+ ranName := "test1"
+
+ readerMock := &mocks.RnibReaderMock{}
+ readerProvider := func() reader.RNibReader {
+ return readerMock
+ }
+ writerMock := &mocks.RnibWriterMock{}
+ writerProvider := func() rNibWriter.RNibWriter {
+ return writerMock
+ }
+ rmrMessengerMock := &mocks.RmrMessengerMock{}
+
+ config := configuration.ParseConfiguration()
+ rmrService := getRmrService(rmrMessengerMock, log)
+
+ writer := httptest.NewRecorder()
+ ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter)
+ controller := NewController(log, rmrService, readerProvider, writerProvider, config, ranSetupManager)
+
+ // 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})
+
+ controller.X2ResetHandler(writer, req)
+ assert.Equal(t, http.StatusBadRequest, writer.Result().StatusCode)
+
+}
+
+func TestHandleErrorResponse(t *testing.T) {
+ log := initLog(t)
+
+ readerMock := &mocks.RnibReaderMock{}
+ readerProvider := func() reader.RNibReader {
+ return readerMock
+ }
+ writerMock := &mocks.RnibWriterMock{}
+ writerProvider := func() rNibWriter.RNibWriter {
+ return writerMock
+ }
+ rmrMessengerMock := &mocks.RmrMessengerMock{}
+
+ config := configuration.ParseConfiguration()
+ rmrService := getRmrService(rmrMessengerMock, log)
+ ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter)
+ controller := NewController(log, rmrService, readerProvider, writerProvider, config, ranSetupManager)
+
+ writer := httptest.NewRecorder()
+ controller.handleErrorResponse(e2managererrors.NewRnibDbError(), writer)
+ assert.Equal(t, http.StatusInternalServerError, writer.Result().StatusCode)
+
+ writer = httptest.NewRecorder()
+ controller.handleErrorResponse(e2managererrors.NewCommandAlreadyInProgressError(), writer)
+ assert.Equal(t, http.StatusMethodNotAllowed, writer.Result().StatusCode)
+
+ writer = httptest.NewRecorder()
+ controller.handleErrorResponse(e2managererrors.NewHeaderValidationError(), writer)
+ assert.Equal(t, http.StatusUnsupportedMediaType, writer.Result().StatusCode)
+
+ writer = httptest.NewRecorder()
+ controller.handleErrorResponse(e2managererrors.NewWrongStateError("", ""), writer)
+ assert.Equal(t, http.StatusBadRequest, writer.Result().StatusCode)
+
+ writer = httptest.NewRecorder()
+ controller.handleErrorResponse(e2managererrors.NewRequestValidationError(), writer)
+ assert.Equal(t, http.StatusBadRequest, writer.Result().StatusCode)
+
+ writer = httptest.NewRecorder()
+ controller.handleErrorResponse(e2managererrors.NewRmrError(), writer)
+ assert.Equal(t, http.StatusInternalServerError, writer.Result().StatusCode)
+
+ writer = httptest.NewRecorder()
+ controller.handleErrorResponse(e2managererrors.NewResourceNotFoundError(), writer)
+ assert.Equal(t, http.StatusNotFound, writer.Result().StatusCode)
+
+ writer = httptest.NewRecorder()
+ controller.handleErrorResponse(fmt.Errorf("ErrorError"), writer)
+ assert.Equal(t, http.StatusInternalServerError, writer.Result().StatusCode)
+}
+
+func initTest(t *testing.T)(*mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.RmrMessengerMock, *managers.RanSetupManager) {
+ log := initLog(t)
+
+ readerMock := &mocks.RnibReaderMock{}
+ writerMock := &mocks.RnibWriterMock{}
+ writerProvider := func() rNibWriter.RNibWriter {
+ return writerMock
+ }
+
+ rmrMessengerMock := &mocks.RmrMessengerMock{}
+ rmrService := getRmrService(rmrMessengerMock, log)
+
+ ranSetupManager := managers.NewRanSetupManager(log, rmrService, writerProvider)
+
+ return readerMock, writerMock, rmrMessengerMock, ranSetupManager
+}
\ No newline at end of file
Code Review / ric-plt / e2mgr.git / blobdiff