[RICPLT-2165] Add rnibDataService to support retries

[ric-plt/e2mgr.git] / E2Manager / handlers / rmrmsghandlers / e2_term_init_notification_handler_test.go

diff --git a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go
index 51827f4..308d970 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go
+++ b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go
@@ -10,7 +10,6 @@ import (
        "e2mgr/rNibWriter"
        "e2mgr/rmrCgo"
        "e2mgr/services"
-       "e2mgr/sessions"
        "e2mgr/tests"
        "fmt"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
@@ -20,9 +19,10 @@ import (
        "testing"
 )
 
-func initRanLostConnectionTest(t *testing.T) (*logger.Logger, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.RmrMessengerMock, *managers.RanReconnectionManager) {
+func initRanLostConnectionTest(t *testing.T) (*logger.Logger, E2TermInitNotificationHandler, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.RmrMessengerMock) {
 
        logger := initLog(t)
+       config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3}
 
        rmrMessengerMock := &mocks.RmrMessengerMock{}
        rmrService := getRmrService(rmrMessengerMock, logger)
@@ -35,19 +35,17 @@ func initRanLostConnectionTest(t *testing.T) (*logger.Logger, *mocks.RnibReaderM
        rnibWriterProvider := func() rNibWriter.RNibWriter {
                return writerMock
        }
-       ranSetupManager := managers.NewRanSetupManager(logger,rmrService, rnibWriterProvider)
-       ranReconnectionManager := managers.NewRanReconnectionManager(logger, configuration.ParseConfiguration(), rnibReaderProvider, rnibWriterProvider, ranSetupManager)
-       return logger, readerMock, writerMock, rmrMessengerMock, ranReconnectionManager
+       rnibDataService := services.NewRnibDataService(logger, config, rnibReaderProvider, rnibWriterProvider)
+       ranSetupManager := managers.NewRanSetupManager(logger, rmrService, rnibDataService)
+       ranReconnectionManager := managers.NewRanReconnectionManager(logger, configuration.ParseConfiguration(), rnibDataService, ranSetupManager)
+       handler := NewE2TermInitNotificationHandler(ranReconnectionManager, rnibDataService)
+       return logger, handler, readerMock, writerMock, rmrMessengerMock
 }
 
 func TestE2TerminInitHandlerSuccessOneRan(t *testing.T) {
-       log, readerMock, writerMock, rmrMessengerMock, ranReconnectMgr := initRanLostConnectionTest(t)
+       log, handler, readerMock, writerMock, rmrMessengerMock := initRanLostConnectionTest(t)
        var rnibErr error
 
-       readerProvider := func() reader.RNibReader {
-               return readerMock
-       }
-
        ids := []*entities.NbIdentity{{InventoryName: "test1"}}
        readerMock.On("GetListNodebIds").Return(ids, rnibErr)
 
@@ -63,21 +61,16 @@ func TestE2TerminInitHandlerSuccessOneRan(t *testing.T) {
 
        rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(msg, nil)
 
-       handler := NewE2TermInitNotificationHandler(ranReconnectMgr, readerProvider)
-       handler.Handle(log, nil, nil, nil)
+       handler.Handle(log, nil, nil)
 
        writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 1)
        rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 1)
 }
 
 func TestE2TerminInitHandlerSuccessTwoRans(t *testing.T) {
-       log, readerMock, writerMock, rmrMessengerMock, ranReconnectMgr := initRanLostConnectionTest(t)
+       log, handler, readerMock, writerMock, rmrMessengerMock := initRanLostConnectionTest(t)
        var rnibErr error
 
-       readerProvider := func() reader.RNibReader {
-               return readerMock
-       }
-
        ids := []*entities.NbIdentity{{InventoryName: "test1"}, {InventoryName: "test2"}}
        readerMock.On("GetListNodebIds").Return(ids, rnibErr)
 
@@ -95,21 +88,16 @@ func TestE2TerminInitHandlerSuccessTwoRans(t *testing.T) {
 
        rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(msg, nil)
 
-       handler := NewE2TermInitNotificationHandler(ranReconnectMgr, readerProvider)
-       handler.Handle(log, nil, nil, nil)
+       handler.Handle(log, nil, nil)
 
        writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 2)
        rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 2)
 }
 
 func TestE2TerminInitHandlerSuccessThreeRansFirstRmrFailure(t *testing.T) {
-       log, readerMock, writerMock, rmrMessengerMock, ranReconnectMgr := initRanLostConnectionTest(t)
+       log, handler, readerMock, writerMock, rmrMessengerMock := initRanLostConnectionTest(t)
        var rnibErr error
 
-       readerProvider := func() reader.RNibReader {
-               return readerMock
-       }
-
        ids := []*entities.NbIdentity{{InventoryName: "test1"}, {InventoryName: "test2"}, {InventoryName: "test3"}}
        readerMock.On("GetListNodebIds").Return(ids, rnibErr)
 
@@ -136,8 +124,7 @@ func TestE2TerminInitHandlerSuccessThreeRansFirstRmrFailure(t *testing.T) {
 
        rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(msg0, fmt.Errorf("RMR Error"))
 
-       handler := NewE2TermInitNotificationHandler(ranReconnectMgr, readerProvider)
-       handler.Handle(log, nil, nil, nil)
+       handler.Handle(log, nil, nil)
 
        //test1 (before send +1, after failure +1), test2 (0) test3 (0)
        writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 2)
@@ -146,13 +133,9 @@ func TestE2TerminInitHandlerSuccessThreeRansFirstRmrFailure(t *testing.T) {
 }
 
 func TestE2TerminInitHandlerSuccessThreeRansSecondNotFoundFailure(t *testing.T) {
-       log, readerMock, writerMock, rmrMessengerMock, ranReconnectMgr := initRanLostConnectionTest(t)
+       log, handler, readerMock, writerMock, rmrMessengerMock := initRanLostConnectionTest(t)
        var rnibErr error
 
-       readerProvider := func() reader.RNibReader {
-               return readerMock
-       }
-
        ids := []*entities.NbIdentity{{InventoryName: "test1"}, {InventoryName: "test2"}, {InventoryName: "test3"}}
        readerMock.On("GetListNodebIds").Return(ids, rnibErr)
 
@@ -184,8 +167,7 @@ func TestE2TerminInitHandlerSuccessThreeRansSecondNotFoundFailure(t *testing.T)
 
        rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(msg0, nil)
 
-       handler := NewE2TermInitNotificationHandler(ranReconnectMgr, readerProvider)
-       handler.Handle(log, nil, nil, nil)
+       handler.Handle(log, nil, nil)
 
        readerMock.AssertNumberOfCalls(t, "GetNodeb", 3)
        //test1 (+1), test2 failure (0) test3 (+1)
@@ -195,13 +177,9 @@ func TestE2TerminInitHandlerSuccessThreeRansSecondNotFoundFailure(t *testing.T)
 }
 
 func TestE2TerminInitHandlerSuccessThreeRansSecondRnibInternalErrorFailure(t *testing.T) {
-       log, readerMock, writerMock, rmrMessengerMock, ranReconnectMgr := initRanLostConnectionTest(t)
+       log, handler, readerMock, writerMock, rmrMessengerMock := initRanLostConnectionTest(t)
        var rnibErr error
 
-       readerProvider := func() reader.RNibReader {
-               return readerMock
-       }
-
        ids := []*entities.NbIdentity{{InventoryName: "test1"}, {InventoryName: "test2"}, {InventoryName: "test3"}}
        readerMock.On("GetListNodebIds").Return(ids, rnibErr)
 
@@ -233,8 +211,7 @@ func TestE2TerminInitHandlerSuccessThreeRansSecondRnibInternalErrorFailure(t *te
 
        rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(msg0, nil)
 
-       handler := NewE2TermInitNotificationHandler(ranReconnectMgr, readerProvider)
-       handler.Handle(log, nil, nil, nil)
+       handler.Handle(log, nil, nil)
 
        readerMock.AssertNumberOfCalls(t, "GetNodeb", 2)
        //test1 (+1), test2 failure (0) test3 (0)
@@ -244,33 +221,23 @@ func TestE2TerminInitHandlerSuccessThreeRansSecondRnibInternalErrorFailure(t *te
 }
 
 func TestE2TerminInitHandlerSuccessZeroRans(t *testing.T) {
-       log, readerMock, writerMock, rmrMessengerMock, ranReconnectMgr := initRanLostConnectionTest(t)
+       log, handler, readerMock, writerMock, rmrMessengerMock := initRanLostConnectionTest(t)
        var rnibErr error
 
-       readerProvider := func() reader.RNibReader {
-               return readerMock
-       }
-
        readerMock.On("GetListNodebIds").Return([]*entities.NbIdentity{}, rnibErr)
 
-       handler := NewE2TermInitNotificationHandler(ranReconnectMgr, readerProvider)
-       handler.Handle(log, nil, nil, nil)
+       handler.Handle(log, nil, nil)
 
        writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 0)
        rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 0)
 }
 
 func TestE2TerminInitHandlerFailureGetListNodebIds(t *testing.T) {
-       log, readerMock, writerMock, rmrMessengerMock, ranReconnectMgr := initRanLostConnectionTest(t)
-
-       readerProvider := func() reader.RNibReader {
-               return readerMock
-       }
+       log, handler, readerMock, writerMock, rmrMessengerMock := initRanLostConnectionTest(t)
 
        readerMock.On("GetListNodebIds").Return([]*entities.NbIdentity{}, common.NewInternalError(fmt.Errorf("internal error")))
 
-       handler := NewE2TermInitNotificationHandler(ranReconnectMgr, readerProvider)
-       handler.Handle(log, nil, nil, nil)
+       handler.Handle(log, nil, nil)
 
        writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 0)
        rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 0)
@@ -281,7 +248,7 @@ func getRmrService(rmrMessengerMock *mocks.RmrMessengerMock, log *logger.Logger)
        rmrMessenger := rmrCgo.RmrMessenger(rmrMessengerMock)
        messageChannel := make(chan *models.NotificationResponse)
        rmrMessengerMock.On("Init", tests.GetPort(), tests.MaxMsgSize, tests.Flags, log).Return(&rmrMessenger)
-       return services.NewRmrService(services.NewRmrConfig(tests.Port, tests.MaxMsgSize, tests.Flags, log), rmrMessenger, make(sessions.E2Sessions), messageChannel)
+       return services.NewRmrService(services.NewRmrConfig(tests.Port, tests.MaxMsgSize, tests.Flags, log), rmrMessenger, messageChannel)
 }
 
 // TODO: extract to test_utils