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=710503f612fe181097f0232dedb509d87006d914;hb=dc8932a553fabccf33b5cbb4e37084362493dbcf;hp=159008c18e3231660d9b7c9c06de1ac9e25ea9a1;hpb=ca265f6ea96500b9a01e2b13e76b162a4c557297;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 159008c..710503f 100644 --- a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go +++ b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go @@ -45,6 +45,7 @@ import ( const ( e2tInitPayload = "{\"address\":\"10.0.2.15\", \"fqdn\":\"\"}" e2tInstanceAddress = "10.0.2.15" + podName = "podNAme_test" ) func initRanLostConnectionTest(t *testing.T) (*logger.Logger, E2TermInitNotificationHandler, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.E2TInstancesManagerMock, *mocks.RoutingManagerClientMock) { @@ -61,9 +62,13 @@ func initRanLostConnectionTest(t *testing.T) (*logger.Logger, E2TermInitNotifica rnibDataService := services.NewRnibDataService(logger, config, readerMock, writerMock) e2tInstancesManagerMock := &mocks.E2TInstancesManagerMock{} - e2tAssociationManager := managers.NewE2TAssociationManager(logger, rnibDataService, e2tInstancesManagerMock, routingManagerClientMock) - ranDisconnectionManager := managers.NewRanDisconnectionManager(logger, configuration.ParseConfiguration(), rnibDataService, e2tAssociationManager) + ranListManager := &mocks.RanListManagerMock{} + ranAlarmService := &mocks.RanAlarmServiceMock{} + ranConnectStatusChangeManager := managers.NewRanConnectStatusChangeManager(logger, rnibDataService,ranListManager, ranAlarmService) + e2tAssociationManager := managers.NewE2TAssociationManager(logger, rnibDataService, e2tInstancesManagerMock, routingManagerClientMock, ranConnectStatusChangeManager) + + ranDisconnectionManager := managers.NewRanDisconnectionManager(logger, configuration.ParseConfiguration(), rnibDataService, e2tAssociationManager, ranConnectStatusChangeManager) handler := NewE2TermInitNotificationHandler(logger, ranDisconnectionManager, e2tInstancesManagerMock, routingManagerClientMock) return logger, handler, readerMock, writerMock, e2tInstancesManagerMock, routingManagerClientMock @@ -83,8 +88,11 @@ func initRanLostConnectionTestWithRealE2tInstanceManager(t *testing.T) (*logger. rnibDataService := services.NewRnibDataService(logger, config, readerMock, writerMock) e2tInstancesManager := managers.NewE2TInstancesManager(rnibDataService, logger) - e2tAssociationManager := managers.NewE2TAssociationManager(logger, rnibDataService, e2tInstancesManager, routingManagerClient) - ranDisconnectionManager := managers.NewRanDisconnectionManager(logger, configuration.ParseConfiguration(), rnibDataService, e2tAssociationManager) + ranListManager := managers.NewRanListManager(logger, rnibDataService) + ranAlarmService := services.NewRanAlarmService(logger, config) + ranConnectStatusChangeManager := managers.NewRanConnectStatusChangeManager(logger, rnibDataService,ranListManager, ranAlarmService) + e2tAssociationManager := managers.NewE2TAssociationManager(logger, rnibDataService, e2tInstancesManager, routingManagerClient, ranConnectStatusChangeManager) + ranDisconnectionManager := managers.NewRanDisconnectionManager(logger, configuration.ParseConfiguration(), rnibDataService, e2tAssociationManager, ranConnectStatusChangeManager) handler := NewE2TermInitNotificationHandler(logger, ranDisconnectionManager, e2tInstancesManager, routingManagerClient) return logger, config, handler, readerMock, writerMock, httpClientMock } @@ -166,7 +174,7 @@ func TestE2TermInitNewE2TInstance__RoutingManagerError(t *testing.T) { func TestE2TermInitExistingE2TInstanceNoAssociatedRans(t *testing.T) { _, handler, _, _, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) - e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) + e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName) e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil) notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} handler.Handle(notificationRequest) @@ -181,7 +189,7 @@ func TestE2TermInitHandlerSuccessOneRan(t *testing.T) { readerMock.On("GetNodeb", RanName).Return(initialNodeb, rnibErr) var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"} - writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr) + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", argNodeb, "test_DISCONNECTED").Return(nil) var disconnectedNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"} readerMock.On("GetNodeb", RanName).Return(disconnectedNodeb, rnibErr) @@ -189,7 +197,7 @@ func TestE2TermInitHandlerSuccessOneRan(t *testing.T) { var updatedNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: ""} writerMock.On("UpdateNodebInfo", updatedNodeb).Return(rnibErr) - e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) + e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName) e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil) writerMock.On("SaveE2TInstance", mock.Anything).Return(nil) @@ -202,7 +210,8 @@ func TestE2TermInitHandlerSuccessOneRan(t *testing.T) { handler.Handle(notificationRequest) - writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 2) + writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 1) + writerMock.AssertNumberOfCalls(t, "UpdateNodebInfoOnConnectionStatusInversion", 1) writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 1) httpClientMock.AssertNumberOfCalls(t, "Post", 1) } @@ -215,7 +224,7 @@ func TestE2TermInitHandlerSuccessOneRan_RoutingManagerError(t *testing.T) { readerMock.On("GetNodeb", RanName).Return(initialNodeb, rnibErr) var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"} - writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr) + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", argNodeb, "test_DISCONNECTED").Return(nil) var disconnectedNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"} readerMock.On("GetNodeb", RanName).Return(disconnectedNodeb, rnibErr) @@ -223,7 +232,7 @@ func TestE2TermInitHandlerSuccessOneRan_RoutingManagerError(t *testing.T) { var updatedNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: ""} writerMock.On("UpdateNodebInfo", updatedNodeb).Return(rnibErr) - e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) + e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName) e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil) writerMock.On("SaveE2TInstance", mock.Anything).Return(nil) @@ -235,7 +244,8 @@ func TestE2TermInitHandlerSuccessOneRan_RoutingManagerError(t *testing.T) { handler.Handle(notificationRequest) - writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 2) + writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 1) + writerMock.AssertNumberOfCalls(t, "UpdateNodebInfoOnConnectionStatusInversion", 1) writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 1) httpClientMock.AssertNumberOfCalls(t, "Post", 1) } @@ -247,10 +257,10 @@ func TestE2TermInitHandlerSuccessOneRanShuttingdown(t *testing.T) { var initialNodeb = &entities.NodebInfo{RanName: RanName, ConnectionStatus: entities.ConnectionStatus_SHUTTING_DOWN, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} readerMock.On("GetNodeb", RanName).Return(initialNodeb, rnibErr) - var argNodeb = &entities.NodebInfo{RanName: RanName, ConnectionStatus: entities.ConnectionStatus_SHUT_DOWN, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 0} + var argNodeb = &entities.NodebInfo{RanName: RanName, ConnectionStatus: entities.ConnectionStatus_SHUT_DOWN, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr) - e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) + e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName) e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil) notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} @@ -267,10 +277,10 @@ func TestE2TermInitHandlerSuccessOneRan_ToBeDeleted(t *testing.T) { var initialNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} readerMock.On("GetNodeb", RanName).Return(initialNodeb, rnibErr) - var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1} + var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr) - e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) + e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName) e2tInstance.State = entities.ToBeDeleted e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) @@ -312,7 +322,7 @@ func TestE2TermInitHandlerSuccessTwoRans(t *testing.T) { var updatedDisconnectedSecondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: test2, AssociatedE2TInstanceAddress: ""} writerMock.On("UpdateNodebInfo", updatedDisconnectedSecondRan).Return(rnibErr) - e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) + e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName) e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, test2) readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil) @@ -352,7 +362,7 @@ func TestE2TermInitHandlerSuccessTwoRansSecondRanShutdown(t *testing.T) { var secondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_SHUT_DOWN, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"} readerMock.On("GetNodeb", test2).Return(secondRan, rnibErr) - e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) + e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName) e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil) writerMock.On("SaveE2TInstance", mock.Anything).Return(nil) @@ -391,7 +401,7 @@ func TestE2TermInitHandlerSuccessTwoRansFirstNotFoundFailure(t *testing.T) { var updatedDisconnectedSecondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: test2, AssociatedE2TInstanceAddress: ""} writerMock.On("UpdateNodebInfo", updatedDisconnectedSecondRan).Return(rnibErr) - e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) + e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName) e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, test2) readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil) @@ -419,7 +429,7 @@ func TestE2TermInitHandlerSuccessTwoRansFirstRnibInternalErrorFailure(t *testing var firstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"} readerMock.On("GetNodeb", RanName).Return(firstRan, common.NewInternalError(fmt.Errorf("internal error"))) - e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) + e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName) e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, test2) readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil) @@ -436,7 +446,7 @@ func TestE2TermInitHandlerSuccessTwoRansFirstRnibInternalErrorFailure(t *testing func TestE2TermInitHandlerSuccessZeroRans(t *testing.T) { _, handler, _, writerMock, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) - e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) + e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName) e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil) notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} @@ -451,7 +461,7 @@ func TestE2TermInitHandlerFailureGetNodebInternalError(t *testing.T) { var nodebInfo *entities.NodebInfo readerMock.On("GetNodeb", "test1").Return(nodebInfo, common.NewInternalError(fmt.Errorf("internal error"))) - e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) + e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName) e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, "test1") e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil) notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}