Code Review / ric-plt / e2mgr.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Copy latest code
[ric-plt/e2mgr.git] / E2Manager / handlers / httpmsghandlers / x2_reset_request_handler_test.go
diff --git a/E2Manager/handlers/httpmsghandlers/x2_reset_request_handler_test.go b/E2Manager/handlers/httpmsghandlers/x2_reset_request_handler_test.go
index 35370c0..16def4c 100644 (file)
--- a/E2Manager/handlers/httpmsghandlers/x2_reset_request_handler_test.go
+++ b/E2Manager/handlers/httpmsghandlers/x2_reset_request_handler_test.go
@@ -5,238 +5,126 @@ import (
        "e2mgr/e2managererrors"
        "e2mgr/mocks"
        "e2mgr/models"
-       "e2mgr/rNibWriter"
        "e2mgr/rmrCgo"
+       "e2mgr/services"
        "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/stretchr/testify/assert"
-       "github.com/stretchr/testify/mock"
        "testing"
 )
 
-
-func TestHandleSuccessfulDefaultCause(t *testing.T){
+func setupX2ResetRequestHandlerTest(t *testing.T) (*X2ResetRequestHandler, *mocks.RmrMessengerMock, *mocks.RnibReaderMock) {
        log := initLog(t)
-
-       ranName := "test1"
-
+       config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3}
        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)
+       rnibDataService := services.NewRnibDataService(log, config, readerMock, writerMock)
        rmrMessengerMock := &mocks.RmrMessengerMock{}
-       rmrMessengerMock.On("SendMsg",msg,mock.Anything).Return(msg,nil)
-
-       config := configuration.ParseConfiguration()
-       rmrService:= getRmrService(rmrMessengerMock, log)
-       handler := NewX2ResetRequestHandler(rmrService, config, writerProvider, readerProvider)
-
-       var nodeb = &entities.NodebInfo{ConnectionStatus:  entities.ConnectionStatus_CONNECTED }
-       readerMock.On("GetNodeb",ranName).Return(nodeb, nil)
-
-       actual := handler.Handle(log, models.ResetRequest{RanName: ranName})
-
-       assert.Nil(t, actual)
+       rmrSender := getRmrSender(rmrMessengerMock, log)
+       handler := NewX2ResetRequestHandler(log, rmrSender, rnibDataService)
 
+       return handler, rmrMessengerMock, readerMock
 }
-
-func TestHandleSuccessfulRequestedCause(t *testing.T){
-       log := initLog(t)
+func TestHandleSuccessfulDefaultCause(t *testing.T) {
+       handler, rmrMessengerMock, readerMock := setupX2ResetRequestHandlerTest(t)
 
        ranName := "test1"
+       // o&m intervention
+       payload := []byte{0x00, 0x07, 0x00, 0x08, 0x00, 0x00, 0x01, 0x00, 0x05, 0x40, 0x01, 0x64}
+       var xAction[]byte
+       msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_RESET, len(payload), ranName, &payload, &xAction)
 
-       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)
-       handler := NewX2ResetRequestHandler(rmrService, config, writerProvider, readerProvider)
+       rmrMessengerMock.On("SendMsg", msg, true).Return(msg, nil)
 
-       var nodeb = &entities.NodebInfo{ConnectionStatus:  entities.ConnectionStatus_CONNECTED }
-       readerMock.On("GetNodeb",ranName).Return(nodeb, nil)
+       var nodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED}
+       readerMock.On("GetNodeb", ranName).Return(nodeb, nil)
 
-       actual := handler.Handle(log, models.ResetRequest{RanName: ranName , Cause:"protocol:transfer-syntax-error"})
+       _, actual := handler.Handle(models.ResetRequest{RanName: ranName})
 
        assert.Nil(t, actual)
 }
 
-func TestHandleFailureUnknownCause(t *testing.T){
-       log := initLog(t)
+func TestHandleSuccessfulRequestedCause(t *testing.T) {
+       handler, rmrMessengerMock, readerMock := setupX2ResetRequestHandlerTest(t)
 
        ranName := "test1"
+       payload := []byte{0x00, 0x07, 0x00, 0x08, 0x00, 0x00, 0x01, 0x00, 0x05, 0x40, 0x01, 0x40}
+       var xAction[]byte
+       msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_RESET, len(payload), ranName, &payload, &xAction)
+       rmrMessengerMock.On("SendMsg", msg, true).Return(msg, nil)
 
-       readerMock := &mocks.RnibReaderMock{}
-       readerProvider := func() reader.RNibReader {
-               return readerMock
-       }
-       writerMock := &mocks.RnibWriterMock{}
-       writerProvider := func() rNibWriter.RNibWriter {
-               return writerMock
-       }
+       var nodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED}
+       readerMock.On("GetNodeb", ranName).Return(nodeb, nil)
 
+       _, actual := handler.Handle(models.ResetRequest{RanName: ranName, Cause: "protocol:transfer-syntax-error"})
 
-       rmrMessengerMock := &mocks.RmrMessengerMock{}
-
+       assert.Nil(t, actual)
+}
 
-       config := configuration.ParseConfiguration()
-       rmrService:= getRmrService(rmrMessengerMock, log)
-       handler := NewX2ResetRequestHandler(rmrService, config, writerProvider, readerProvider)
+func TestHandleFailureUnknownCause(t *testing.T) {
+       handler, _, readerMock := setupX2ResetRequestHandlerTest(t)
 
-       var nodeb = &entities.NodebInfo{ConnectionStatus:  entities.ConnectionStatus_CONNECTED }
-       readerMock.On("GetNodeb",ranName).Return(nodeb, nil)
+       ranName := "test1"
+       var nodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED}
+       readerMock.On("GetNodeb", ranName).Return(nodeb, nil)
 
-       actual := handler.Handle(log, models.ResetRequest{RanName: ranName , Cause:"XXX"})
+       _, actual := handler.Handle(models.ResetRequest{RanName: ranName, Cause: "XXX"})
 
        assert.IsType(t, e2managererrors.NewRequestValidationError(), actual)
 
 }
 
-func TestHandleFailureWrongState(t *testing.T){
-       log := initLog(t)
+func TestHandleFailureWrongState(t *testing.T) {
+       handler, _, readerMock := setupX2ResetRequestHandlerTest(t)
 
        ranName := "test1"
+       var nodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED}
+       readerMock.On("GetNodeb", ranName).Return(nodeb, nil)
 
-       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)
-       handler := NewX2ResetRequestHandler(rmrService, config, writerProvider, readerProvider)
-
-       var nodeb = &entities.NodebInfo{ConnectionStatus:  entities.ConnectionStatus_DISCONNECTED }
-       readerMock.On("GetNodeb",ranName).Return(nodeb, nil)
-
-       actual := handler.Handle(log, models.ResetRequest{RanName: ranName })
+       _, actual := handler.Handle(models.ResetRequest{RanName: ranName})
 
        assert.IsType(t, e2managererrors.NewWrongStateError(X2_RESET_ACTIVITY_NAME, entities.ConnectionStatus_name[int32(nodeb.ConnectionStatus)]), actual)
-
 }
 
-
-
-func TestHandleFailureRanNotFound(t *testing.T){
-       log := initLog(t)
+func TestHandleFailureRanNotFound(t *testing.T) {
+       handler, _, readerMock := setupX2ResetRequestHandlerTest(t)
 
        ranName := "test1"
 
-       readerMock := &mocks.RnibReaderMock{}
-       readerProvider := func() reader.RNibReader {
-               return readerMock
-       }
-       writerMock := &mocks.RnibWriterMock{}
-       writerProvider := func() rNibWriter.RNibWriter {
-               return writerMock
-       }
+       readerMock.On("GetNodeb", ranName).Return(&entities.NodebInfo{}, common.NewResourceNotFoundError("nodeb not found"))
 
-
-       rmrMessengerMock := &mocks.RmrMessengerMock{}
-
-
-       config := configuration.ParseConfiguration()
-       rmrService:= getRmrService(rmrMessengerMock, log)
-       handler := NewX2ResetRequestHandler(rmrService, config, writerProvider, readerProvider)
-
-       readerMock.On("GetNodeb",ranName).Return(&entities.NodebInfo{}, common.NewResourceNotFoundError("nodeb not found"))
-
-       actual := handler.Handle(log, models.ResetRequest{RanName: ranName })
+       _, actual := handler.Handle(models.ResetRequest{RanName: ranName})
 
        assert.IsType(t, e2managererrors.NewResourceNotFoundError(), actual)
-
 }
 
-
-func TestHandleFailureRnibError(t *testing.T){
-       log := initLog(t)
+func TestHandleFailureRnibError(t *testing.T) {
+       handler, _, readerMock := setupX2ResetRequestHandlerTest(t)
 
        ranName := "test1"
 
-       readerMock := &mocks.RnibReaderMock{}
-       readerProvider := func() reader.RNibReader {
-               return readerMock
-       }
-       writerMock := &mocks.RnibWriterMock{}
-       writerProvider := func() rNibWriter.RNibWriter {
-               return writerMock
-       }
-
-
-       rmrMessengerMock := &mocks.RmrMessengerMock{}
+       readerMock.On("GetNodeb", ranName).Return(&entities.NodebInfo{}, common.NewInternalError(fmt.Errorf("internal error")))
 
-
-       config := configuration.ParseConfiguration()
-       rmrService:= getRmrService(rmrMessengerMock, log)
-       handler := NewX2ResetRequestHandler(rmrService, config, writerProvider, readerProvider)
-
-       readerMock.On("GetNodeb",ranName).Return(&entities.NodebInfo{}, common.NewInternalError(fmt.Errorf("internal error")))
-
-       actual := handler.Handle(log, models.ResetRequest{RanName: ranName })
+       _, actual := handler.Handle(models.ResetRequest{RanName: ranName})
 
        assert.IsType(t, e2managererrors.NewRnibDbError(), actual)
-
 }
 
-
-func TestHandleFailureRmrError(t *testing.T){
-       log := initLog(t)
+func TestHandleFailureRmrError(t *testing.T) {
+       handler, rmrMessengerMock, readerMock := setupX2ResetRequestHandlerTest(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(&rmrCgo.MBuf{},fmt.Errorf("rmr error"))
+       payload := []byte{0x00, 0x07, 0x00, 0x08, 0x00, 0x00, 0x01, 0x00, 0x05, 0x40, 0x01, 0x64}
+       var xAction[]byte
+       msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_RESET, len(payload), ranName, &payload, &xAction)
+       rmrMessengerMock.On("SendMsg", msg, true).Return(&rmrCgo.MBuf{}, fmt.Errorf("rmr error"))
 
-       config := configuration.ParseConfiguration()
-       rmrService:= getRmrService(rmrMessengerMock, log)
-       handler := NewX2ResetRequestHandler(rmrService, config, writerProvider, readerProvider)
+       var nodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED}
+       readerMock.On("GetNodeb", ranName).Return(nodeb, nil)
 
-       var nodeb = &entities.NodebInfo{ConnectionStatus:  entities.ConnectionStatus_CONNECTED }
-       readerMock.On("GetNodeb",ranName).Return(nodeb, nil)
-
-       actual := handler.Handle(log, models.ResetRequest{RanName: ranName })
+       _, actual := handler.Handle(models.ResetRequest{RanName: ranName})
 
        assert.IsType(t, e2managererrors.NewRmrError(), actual)
-
 }