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=8a74eff42bfc72c465194c340664b258fee4e62f;hb=4c67d61c4898a775d1280ee6fadd83637317037a;hp=95b818bd4168062dfee8abb1880a60bf45dbb596;hpb=a75da9a56d61ca4754650d44a54bbf0b04f610d1;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 95b818b..8a74eff 100644 --- a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go +++ b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go @@ -42,7 +42,11 @@ import ( "testing" ) -const e2tInitPayload = "{\"address\":\"10.0.2.15\", \"fqdn\":\"\"}" +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) { @@ -163,7 +167,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) @@ -186,7 +190,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) @@ -220,7 +224,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) @@ -244,10 +248,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)} @@ -264,10 +268,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) @@ -309,7 +313,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) @@ -349,7 +353,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) @@ -388,7 +392,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) @@ -416,7 +420,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) @@ -433,7 +437,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)} @@ -448,7 +452,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)}