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=e2ce5d226dafebc2e668c23b9cd29366abf6fa4d;hb=4cd92f9b121a576f28340c72de52a750e383c670;hp=ac8ee5d062eae5462b6d70e4a7f622427f7d73af;hpb=fbd73df3e4bd575816d4c6444807879a8bf54c7f;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 ac8ee5d..e2ce5d2 100644 --- a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go +++ b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go @@ -33,19 +33,21 @@ import ( "e2mgr/services/rmrsender" "e2mgr/tests" "fmt" + "io/ioutil" + "net/http" + "testing" + "time" + "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common" "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities" "github.com/pkg/errors" "github.com/stretchr/testify/mock" - "io/ioutil" - "net/http" - "testing" ) const ( - e2tInitPayload = "{\"address\":\"10.0.2.15\", \"fqdn\":\"\"}" + e2tInitPayload = "{\"address\":\"10.0.2.15\", \"fqdn\":\"\"}" e2tInstanceAddress = "10.0.2.15" - podName = "podNAme_test" + podName = "podNAme_test" ) func initRanLostConnectionTest(t *testing.T) (*logger.Logger, E2TermInitNotificationHandler, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.E2TInstancesManagerMock, *mocks.RoutingManagerClientMock) { @@ -65,7 +67,7 @@ func initRanLostConnectionTest(t *testing.T) (*logger.Logger, E2TermInitNotifica ranListManager := managers.NewRanListManager(logger, rnibDataService) ranAlarmService := &mocks.RanAlarmServiceMock{} - ranConnectStatusChangeManager := managers.NewRanConnectStatusChangeManager(logger, rnibDataService,ranListManager, ranAlarmService) + ranConnectStatusChangeManager := managers.NewRanConnectStatusChangeManager(logger, rnibDataService, ranListManager, ranAlarmService) e2tAssociationManager := managers.NewE2TAssociationManager(logger, rnibDataService, e2tInstancesManagerMock, routingManagerClientMock, ranConnectStatusChangeManager) ranDisconnectionManager := managers.NewRanDisconnectionManager(logger, configuration.ParseConfiguration(), rnibDataService, e2tAssociationManager, ranConnectStatusChangeManager) @@ -90,7 +92,7 @@ func initRanLostConnectionTestWithRealE2tInstanceManager(t *testing.T) (*logger. e2tInstancesManager := managers.NewE2TInstancesManager(rnibDataService, logger) ranListManager := managers.NewRanListManager(logger, rnibDataService) ranAlarmService := services.NewRanAlarmService(logger, config) - ranConnectStatusChangeManager := managers.NewRanConnectStatusChangeManager(logger, rnibDataService,ranListManager, ranAlarmService) + 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) @@ -173,8 +175,11 @@ func TestE2TermInitNewE2TInstance__RoutingManagerError(t *testing.T) { } func TestE2TermInitExistingE2TInstanceNoAssociatedRans(t *testing.T) { - _, handler, _, _, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) + _, handler, _, _, e2tInstancesManagerMock, routingManagerClientMock := initRanLostConnectionTest(t) e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName) + var rtmgrErr error + e2tInstancesManagerMock.On("ResetKeepAliveTimestamp", e2tInstanceAddress).Return(nil) + routingManagerClientMock.On("AddE2TInstance", e2tInstanceAddress).Return(rtmgrErr, nil) e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil) notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} handler.Handle(notificationRequest) @@ -196,7 +201,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("UpdateNodebInfoOnConnectionStatusInversion", argNodeb, "test_DISCONNECTED").Return(nil) + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, "test_DISCONNECTED").Return(nil) newNbIdentity := &entities.NbIdentity{InventoryName: RanName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}} writerMock.On("UpdateNbIdentities", argNodeb.GetNodeType(), []*entities.NbIdentity{oldNbIdentity}, []*entities.NbIdentity{newNbIdentity}).Return(nil) @@ -205,7 +210,8 @@ func TestE2TermInitHandlerSuccessOneRan(t *testing.T) { readerMock.On("GetNodeb", RanName).Return(disconnectedNodeb, rnibErr) var updatedNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: ""} - writerMock.On("UpdateNodebInfo", updatedNodeb).Return(rnibErr) + updatedNodeb.StatusUpdateTimeStamp = uint64(time.Now().UnixNano()) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(rnibErr) e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName) e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) @@ -240,7 +246,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("UpdateNodebInfoOnConnectionStatusInversion", argNodeb, "test_DISCONNECTED").Return(nil) + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, "test_DISCONNECTED").Return(nil) newNbIdentity := &entities.NbIdentity{InventoryName: RanName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}} writerMock.On("UpdateNbIdentities", argNodeb.GetNodeType(), []*entities.NbIdentity{oldNbIdentity}, []*entities.NbIdentity{newNbIdentity}).Return(nil) @@ -249,7 +255,8 @@ func TestE2TermInitHandlerSuccessOneRan_RoutingManagerError(t *testing.T) { readerMock.On("GetNodeb", RanName).Return(disconnectedNodeb, rnibErr) var updatedNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: ""} - writerMock.On("UpdateNodebInfo", updatedNodeb).Return(rnibErr) + updatedNodeb.StatusUpdateTimeStamp = uint64(time.Now().UnixNano()) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(rnibErr) e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName) e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) @@ -283,7 +290,7 @@ func TestE2TermInitHandlerSuccessOneRanShuttingdown(t *testing.T) { readerMock.On("GetNodeb", RanName).Return(initialNodeb, rnibErr) var argNodeb = &entities.NodebInfo{RanName: RanName, ConnectionStatus: entities.ConnectionStatus_SHUT_DOWN, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} - writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(rnibErr) newNbIdentity := &entities.NbIdentity{InventoryName: RanName, ConnectionStatus: entities.ConnectionStatus_SHUT_DOWN, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}} writerMock.On("UpdateNbIdentities", argNodeb.GetNodeType(), []*entities.NbIdentity{oldNbIdentity}, []*entities.NbIdentity{newNbIdentity}).Return(nil) @@ -306,7 +313,8 @@ func TestE2TermInitHandlerSuccessOneRan_ToBeDeleted(t *testing.T) { readerMock.On("GetNodeb", RanName).Return(initialNodeb, rnibErr) var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} - writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr) + argNodeb.StatusUpdateTimeStamp = uint64(time.Now().UnixNano()) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(rnibErr) e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName) e2tInstance.State = entities.ToBeDeleted @@ -342,12 +350,13 @@ func TestE2TermInitHandlerSuccessTwoRans(t *testing.T) { readerMock.On("GetNodeb", RanName).Return(firstRan, rnibErr).Return(disconnectedFirstRan, rnibErr) var updatedFirstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"} - writerMock.On("UpdateNodebInfo", updatedFirstRan).Return(rnibErr) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(rnibErr) newNbIdentity := &entities.NbIdentity{InventoryName: RanName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}} writerMock.On("UpdateNbIdentities", updatedFirstRan.GetNodeType(), []*entities.NbIdentity{oldNbIdentity1}, []*entities.NbIdentity{newNbIdentity}).Return(nil) var updatedDisconnectedFirstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: ""} - writerMock.On("UpdateNodebInfo", updatedDisconnectedFirstRan).Return(rnibErr) + updatedDisconnectedFirstRan.StatusUpdateTimeStamp = uint64(time.Now().UnixNano()) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(rnibErr) //Second RAN var secondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"} @@ -355,12 +364,14 @@ func TestE2TermInitHandlerSuccessTwoRans(t *testing.T) { readerMock.On("GetNodeb", test2).Return(secondRan, rnibErr).Return(disconnectedSecondRan, rnibErr) var updatedSecondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"} - writerMock.On("UpdateNodebInfo", updatedSecondRan).Return(rnibErr) + updatedSecondRan.StatusUpdateTimeStamp = uint64(time.Now().UnixNano()) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(rnibErr) newNbIdentity2 := &entities.NbIdentity{InventoryName: test2, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId2", NbId: "nbId2"}} writerMock.On("UpdateNbIdentities", updatedFirstRan.GetNodeType(), []*entities.NbIdentity{oldNbIdentity2}, []*entities.NbIdentity{newNbIdentity2}).Return(nil) var updatedDisconnectedSecondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: test2, AssociatedE2TInstanceAddress: ""} - writerMock.On("UpdateNodebInfo", updatedDisconnectedSecondRan).Return(rnibErr) + updatedDisconnectedSecondRan.StatusUpdateTimeStamp = uint64(time.Now().UnixNano()) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(rnibErr) e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName) e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) @@ -399,12 +410,13 @@ func TestE2TermInitHandlerSuccessTwoRansSecondRanShutdown(t *testing.T) { readerMock.On("GetNodeb", RanName).Return(firstRan, rnibErr).Return(disconnectedFirstRan, rnibErr) var updatedFirstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"} - writerMock.On("UpdateNodebInfo", updatedFirstRan).Return(rnibErr) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(rnibErr) newNbIdentity := &entities.NbIdentity{InventoryName: RanName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}} writerMock.On("UpdateNbIdentities", updatedFirstRan.GetNodeType(), []*entities.NbIdentity{oldNbIdentity}, []*entities.NbIdentity{newNbIdentity}).Return(nil) var updatedDisconnectedFirstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: ""} - writerMock.On("UpdateNodebInfo", updatedDisconnectedFirstRan).Return(rnibErr) + updatedDisconnectedFirstRan.StatusUpdateTimeStamp = uint64(time.Now().UnixNano()) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(rnibErr) //Second RAN var secondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_SHUT_DOWN, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"} @@ -450,10 +462,11 @@ func TestE2TermInitHandlerSuccessTwoRansFirstNotFoundFailure(t *testing.T) { readerMock.On("GetNodeb", test2).Return(secondRan, rnibErr).Return(disconnectedSecondRan, rnibErr) var updatedSecondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"} - writerMock.On("UpdateNodebInfo", updatedSecondRan).Return(rnibErr) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(rnibErr) var updatedDisconnectedSecondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: test2, AssociatedE2TInstanceAddress: ""} - writerMock.On("UpdateNodebInfo", updatedDisconnectedSecondRan).Return(rnibErr) + updatedDisconnectedSecondRan.StatusUpdateTimeStamp = uint64(time.Now().UnixNano()) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(rnibErr) newNbIdentity := &entities.NbIdentity{InventoryName: test2, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}} writerMock.On("UpdateNbIdentities", updatedSecondRan.GetNodeType(), []*entities.NbIdentity{oldNbIdentity}, []*entities.NbIdentity{newNbIdentity}).Return(nil) @@ -501,9 +514,12 @@ func TestE2TermInitHandlerSuccessTwoRansFirstRnibInternalErrorFailure(t *testing } func TestE2TermInitHandlerSuccessZeroRans(t *testing.T) { - _, handler, _, writerMock, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) + _, handler, _, writerMock, e2tInstancesManagerMock, routingManagerClientMock := initRanLostConnectionTest(t) e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName) + var rtmgrErr error + e2tInstancesManagerMock.On("ResetKeepAliveTimestamp", e2tInstanceAddress).Return(nil) + routingManagerClientMock.On("AddE2TInstance", e2tInstanceAddress).Return(rtmgrErr, nil) e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil) notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} @@ -535,13 +551,15 @@ func TestE2TermInitHandlerOneRanNoRanInNbIdentityMap(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("UpdateNodebInfoOnConnectionStatusInversion", argNodeb, "test_DISCONNECTED").Return(nil) + argNodeb.StatusUpdateTimeStamp = uint64(time.Now().UnixNano()) + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, "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) var updatedNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: ""} - writerMock.On("UpdateNodebInfo", updatedNodeb).Return(rnibErr) + updatedNodeb.StatusUpdateTimeStamp = uint64(time.Now().UnixNano()) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(rnibErr) e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName) e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) @@ -577,7 +595,7 @@ func TestE2TermInitHandlerOneRanUpdateNbIdentitiesFailure(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("UpdateNodebInfoOnConnectionStatusInversion", argNodeb, "test_DISCONNECTED").Return(nil) + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, "test_DISCONNECTED").Return(nil) newNbIdentity := &entities.NbIdentity{InventoryName: RanName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}} writerMock.On("UpdateNbIdentities", argNodeb.GetNodeType(), []*entities.NbIdentity{oldNbIdentity}, []*entities.NbIdentity{newNbIdentity}).Return(common.NewInternalError(fmt.Errorf("internal error"))) @@ -586,7 +604,8 @@ func TestE2TermInitHandlerOneRanUpdateNbIdentitiesFailure(t *testing.T) { readerMock.On("GetNodeb", RanName).Return(disconnectedNodeb, rnibErr) var updatedNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: ""} - writerMock.On("UpdateNodebInfo", updatedNodeb).Return(rnibErr) + updatedNodeb.StatusUpdateTimeStamp = uint64(time.Now().UnixNano()) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(rnibErr) e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName) e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) @@ -606,6 +625,7 @@ func TestE2TermInitHandlerOneRanUpdateNbIdentitiesFailure(t *testing.T) { writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 1) httpClientMock.AssertNumberOfCalls(t, "Post", 1) } + // TODO: extract to test_utils func initRmrSender(rmrMessengerMock *mocks.RmrMessengerMock, log *logger.Logger) *rmrsender.RmrSender { rmrMessenger := rmrCgo.RmrMessenger(rmrMessengerMock) @@ -615,7 +635,8 @@ func initRmrSender(rmrMessengerMock *mocks.RmrMessengerMock, log *logger.Logger) // TODO: extract to test_utils func initLog(t *testing.T) *logger.Logger { - log, err := logger.InitLogger(logger.InfoLevel) + InfoLevel := int8(3) + log, err := logger.InitLogger(InfoLevel) if err != nil { t.Errorf("#delete_all_request_handler_test.TestHandleSuccessFlow - failed to initialize logger, error: %s", err) }