X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhandlers%2Frmrmsghandlers%2Fe2_term_init_notification_handler_test.go;h=8bb8a05eb58bfd0aff4bddc51236bb49659ed748;hb=ffd085dd7f0654b84b163a7bfedd3fa89e7b8a71;hp=7948f9e2b8394786cc2ff11cb8b4ccf82b3d4da8;hpb=1ec13d4076e7c7abefac6176462c1fee31229213;p=ric-plt%2Fe2mgr.git

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 7948f9e..8bb8a05 100644
--- 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"
@@ -21,6 +20,7 @@ import (
 )
 
 func initRanLostConnectionTest(t *testing.T) (*logger.Logger, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.RmrMessengerMock, *managers.RanReconnectionManager) {
+
 	logger := initLog(t)
 
 	rmrMessengerMock := &mocks.RmrMessengerMock{}
@@ -34,8 +34,8 @@ func initRanLostConnectionTest(t *testing.T) (*logger.Logger, *mocks.RnibReaderM
 	rnibWriterProvider := func() rNibWriter.RNibWriter {
 		return writerMock
 	}
-
-	ranReconnectionManager := managers.NewRanReconnectionManager(logger, configuration.ParseConfiguration(), rnibReaderProvider, rnibWriterProvider, rmrService)
+	ranSetupManager := managers.NewRanSetupManager(logger, rmrService, rnibWriterProvider)
+	ranReconnectionManager := managers.NewRanReconnectionManager(logger, configuration.ParseConfiguration(), rnibReaderProvider, rnibWriterProvider, ranSetupManager)
 	return logger, readerMock, writerMock, rmrMessengerMock, ranReconnectionManager
 }
 
@@ -63,7 +63,7 @@ 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)
@@ -95,7 +95,7 @@ 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)
@@ -136,7 +136,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)
@@ -184,7 +184,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)
@@ -233,7 +233,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)
@@ -253,7 +253,7 @@ func TestE2TerminInitHandlerSuccessZeroRans(t *testing.T) {
 	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)
@@ -269,7 +269,7 @@ func TestE2TerminInitHandlerFailureGetListNodebIds(t *testing.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)
@@ -280,7 +280,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