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=ae88cb22eaf17386a8a3c2b84f82780ad646ec3a;hb=25486db26eb5d9117682ec9d3b4763f928768626;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..ae88cb2 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,7 @@ import (
 	"e2mgr/rNibWriter"
 	"e2mgr/rmrCgo"
 	"e2mgr/services"
-	"e2mgr/sessions"
+	"e2mgr/services/rmrsender"
 	"e2mgr/tests"
 	"fmt"
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
@@ -20,11 +20,13 @@ 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)
+	rmrSender := initRmrSender(rmrMessengerMock, logger)
 
 	readerMock := &mocks.RnibReaderMock{}
 	rnibReaderProvider := func() reader.RNibReader {
@@ -34,19 +36,17 @@ func initRanLostConnectionTest(t *testing.T) (*logger.Logger, *mocks.RnibReaderM
 	rnibWriterProvider := func() rNibWriter.RNibWriter {
 		return writerMock
 	}
-
-	ranReconnectionManager := managers.NewRanReconnectionManager(logger, configuration.ParseConfiguration(), rnibReaderProvider, rnibWriterProvider, rmrService)
-	return logger, readerMock, writerMock, rmrMessengerMock, ranReconnectionManager
+	rnibDataService := services.NewRnibDataService(logger, config, rnibReaderProvider, rnibWriterProvider)
+	ranSetupManager := managers.NewRanSetupManager(logger, rmrSender, rnibDataService)
+	ranReconnectionManager := managers.NewRanReconnectionManager(logger, configuration.ParseConfiguration(), rnibDataService, ranSetupManager)
+	handler := NewE2TermInitNotificationHandler(logger, ranReconnectionManager, rnibDataService)
+	return logger, handler, readerMock, writerMock, rmrMessengerMock
 }
 
 func TestE2TerminInitHandlerSuccessOneRan(t *testing.T) {
-	log, readerMock, writerMock, rmrMessengerMock, ranReconnectMgr := initRanLostConnectionTest(t)
+	_, 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)
 
@@ -60,23 +60,18 @@ func TestE2TerminInitHandlerSuccessOneRan(t *testing.T) {
 	xaction := []byte(ids[0].InventoryName)
 	msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), ids[0].InventoryName, &payload, &xaction)
 
-	rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(msg, nil)
+	rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg, nil)
 
-	handler := NewE2TermInitNotificationHandler(ranReconnectMgr, readerProvider)
-	handler.Handle(log, nil, nil, nil)
+	handler.Handle(nil)
 
 	writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 1)
 	rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 1)
 }
 
 func TestE2TerminInitHandlerSuccessTwoRans(t *testing.T) {
-	log, readerMock, writerMock, rmrMessengerMock, ranReconnectMgr := initRanLostConnectionTest(t)
+	_, 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)
 
@@ -92,23 +87,18 @@ func TestE2TerminInitHandlerSuccessTwoRans(t *testing.T) {
 	xaction := []byte(ids[0].InventoryName)
 	msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), ids[0].InventoryName, &payload, &xaction)
 
-	rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(msg, nil)
+	rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg, nil)
 
-	handler := NewE2TermInitNotificationHandler(ranReconnectMgr, readerProvider)
-	handler.Handle(log, nil, nil, nil)
+	handler.Handle(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)
 
@@ -133,10 +123,9 @@ func TestE2TerminInitHandlerSuccessThreeRansFirstRmrFailure(t *testing.T) {
 	//xaction = []byte(ids[1].InventoryName)
 	//msg1 := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), ids[1].InventoryName, &payload, &xaction)
 
-	rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(msg0, fmt.Errorf("RMR Error"))
+	rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg0, fmt.Errorf("RMR Error"))
 
-	handler := NewE2TermInitNotificationHandler(ranReconnectMgr, readerProvider)
-	handler.Handle(log, nil, nil, nil)
+	handler.Handle(nil)
 
 	//test1 (before send +1, after failure +1), test2 (0) test3 (0)
 	writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 2)
@@ -145,13 +134,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)
 
@@ -181,10 +166,9 @@ func TestE2TerminInitHandlerSuccessThreeRansSecondNotFoundFailure(t *testing.T)
 	//xaction = []byte(ids[1].InventoryName)
 	//msg1 := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), ids[1].InventoryName, &payload, &xaction)
 
-	rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(msg0, nil)
+	rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg0, nil)
 
-	handler := NewE2TermInitNotificationHandler(ranReconnectMgr, readerProvider)
-	handler.Handle(log, nil, nil, nil)
+	handler.Handle(nil)
 
 	readerMock.AssertNumberOfCalls(t, "GetNodeb", 3)
 	//test1 (+1), test2 failure (0) test3 (+1)
@@ -194,13 +178,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)
 
@@ -230,10 +210,9 @@ func TestE2TerminInitHandlerSuccessThreeRansSecondRnibInternalErrorFailure(t *te
 	//xaction = []byte(ids[1].InventoryName)
 	//msg1 := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), ids[1].InventoryName, &payload, &xaction)
 
-	rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(msg0, nil)
+	rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg0, nil)
 
-	handler := NewE2TermInitNotificationHandler(ranReconnectMgr, readerProvider)
-	handler.Handle(log, nil, nil, nil)
+	handler.Handle(nil)
 
 	readerMock.AssertNumberOfCalls(t, "GetNodeb", 2)
 	//test1 (+1), test2 failure (0) test3 (0)
@@ -243,44 +222,33 @@ func TestE2TerminInitHandlerSuccessThreeRansSecondRnibInternalErrorFailure(t *te
 }
 
 func TestE2TerminInitHandlerSuccessZeroRans(t *testing.T) {
-	log, readerMock, writerMock, rmrMessengerMock, ranReconnectMgr := initRanLostConnectionTest(t)
+	_, 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(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
-	}
+	_, 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(nil)
 
 	writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 0)
 	rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 0)
 }
 
 // TODO: extract to test_utils
-func getRmrService(rmrMessengerMock *mocks.RmrMessengerMock, log *logger.Logger) *services.RmrService {
+func initRmrSender(rmrMessengerMock *mocks.RmrMessengerMock, log *logger.Logger) *rmrsender.RmrSender {
 	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 rmrsender.NewRmrSender(log, &rmrMessenger)
 }
 
 // TODO: extract to test_utils