X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhandlers%2Frmrmsghandlers%2Fe2_reset_request_handler_test.go;h=25a815015cd8cab3e862d748496d4485dae28736;hb=9d035d0669de41cd4cb9e3e1f04b814486f72e3a;hp=cc9722e4b745a6934147f5dfa1d628ac65aa1476;hpb=b6cc960f9c1adb208e4d41ccc4a144c1de307806;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/handlers/rmrmsghandlers/e2_reset_request_handler_test.go b/E2Manager/handlers/rmrmsghandlers/e2_reset_request_handler_test.go
index cc9722e..25a8150 100644
--- a/E2Manager/handlers/rmrmsghandlers/e2_reset_request_handler_test.go
+++ b/E2Manager/handlers/rmrmsghandlers/e2_reset_request_handler_test.go
@@ -37,7 +37,7 @@ const (
 	E2ResetXmlPath = "../../tests/resources/reset/reset-request.xml"
 )
 
-func initE2ResetMocks(t *testing.T) (*E2ResetRequestNotificationHandler, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.RmrMessengerMock) {
+func initE2ResetMocks(t *testing.T) (*E2ResetRequestNotificationHandler, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.RmrMessengerMock, *mocks.RanAlarmServiceMock) {
 	logger := tests.InitLog(t)
 	config := &configuration.Configuration{
 		RnibRetryIntervalMs:       10,
@@ -55,13 +55,14 @@ func initE2ResetMocks(t *testing.T) (*E2ResetRequestNotificationHandler, *mocks.
 	ranAlarmService := &mocks.RanAlarmServiceMock{}
 	ranConnectStatusChangeManager := managers.NewRanConnectStatusChangeManager(logger, rnibDataService, ranListManager, ranAlarmService)
 	ranResetManager := managers.NewRanResetManager(logger, rnibDataService, ranConnectStatusChangeManager)
-	handler := NewE2ResetRequestNotificationHandler(logger, rnibDataService, config, rmrSender, ranResetManager)
-	return handler, readerMock, writerMock, rmrMessengerMock
+	changeStatusToConnectedRanManager := managers.NewChangeStatusToConnectedRanManager(logger, rnibDataService, ranConnectStatusChangeManager)
+	handler := NewE2ResetRequestNotificationHandler(logger, rnibDataService, config, rmrSender, ranResetManager, changeStatusToConnectedRanManager)
+	return handler, readerMock, writerMock, rmrMessengerMock, ranAlarmService
 }
 
 func TestE2ResettNotificationHandler(t *testing.T) {
 	e2ResetXml := utils.ReadXmlFile(t, E2ResetXmlPath)
-	handler, readerMock, writerMock, rmrMessengerMock := initE2ResetMocks(t)
+	handler, readerMock, writerMock, rmrMessengerMock, ranAlarmServiceMock := initE2ResetMocks(t)
 	var nodebInfo = &entities.NodebInfo{
 		RanName:                      gnbNodebRanName,
 		AssociatedE2TInstanceAddress: e2tInstanceFullAddress,
@@ -78,6 +79,8 @@ func TestE2ResettNotificationHandler(t *testing.T) {
 	var errEmpty error
 	rmrMessage := &rmrCgo.MBuf{}
 	rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(rmrMessage, errEmpty)
+	writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, mock.Anything).Return(nil)
+	ranAlarmServiceMock.On("SetConnectivityChangeAlarm", mock.Anything).Return(nil)
 	notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(""), e2ResetXml...)}
 	handler.Handle(notificationRequest)
 	readerMock.AssertExpectations(t)
@@ -88,7 +91,7 @@ func TestE2ResettNotificationHandler(t *testing.T) {
 
 func TestE2ResettNotificationHandler_UpdateStatus_Connected(t *testing.T) {
 	e2ResetXml := utils.ReadXmlFile(t, E2ResetXmlPath)
-	handler, readerMock, writerMock, rmrMessengerMock := initE2ResetMocks(t)
+	handler, readerMock, writerMock, rmrMessengerMock, ranAlarmServiceMock := initE2ResetMocks(t)
 	var nodebInfo = &entities.NodebInfo{
 		RanName:                      gnbNodebRanName,
 		AssociatedE2TInstanceAddress: e2tInstanceFullAddress,
@@ -108,6 +111,8 @@ func TestE2ResettNotificationHandler_UpdateStatus_Connected(t *testing.T) {
 	var errEmpty error
 	rmrMessage := &rmrCgo.MBuf{}
 	rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(rmrMessage, errEmpty)
+	writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, mock.Anything).Return(nil)
+	ranAlarmServiceMock.On("SetConnectivityChangeAlarm", mock.Anything).Return(nil)
 	notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(""), e2ResetXml...)}
 	handler.Handle(notificationRequest)
 	readerMock.AssertCalled(t, "GetNodeb", mock.Anything)
@@ -117,7 +122,7 @@ func TestE2ResettNotificationHandler_UpdateStatus_Connected(t *testing.T) {
 
 func TestE2ResettNotificationHandler_Successful_Reset_Response(t *testing.T) {
 	e2ResetXml := utils.ReadXmlFile(t, E2ResetXmlPath)
-	handler, readerMock, writerMock, rmrMessengerMock := initE2ResetMocks(t)
+	handler, readerMock, writerMock, rmrMessengerMock, ranAlarmServiceMock := initE2ResetMocks(t)
 	var nodebInfo = &entities.NodebInfo{
 		RanName:                      gnbNodebRanName,
 		AssociatedE2TInstanceAddress: e2tInstanceFullAddress,
@@ -137,6 +142,8 @@ func TestE2ResettNotificationHandler_Successful_Reset_Response(t *testing.T) {
 	var errEmpty error
 	rmrMessage := &rmrCgo.MBuf{}
 	rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(rmrMessage, errEmpty)
+	writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, mock.Anything).Return(nil)
+	ranAlarmServiceMock.On("SetConnectivityChangeAlarm", mock.Anything).Return(nil)
 	notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(""), e2ResetXml...)}
 	handler.Handle(notificationRequest)
 	readerMock.AssertCalled(t, "GetNodeb", mock.Anything)