From ead1eda38e92a3806d6c5ec2b7306d80eea66ddb Mon Sep 17 00:00:00 2001 From: Irina Date: Thu, 27 Feb 2020 22:21:44 +0200 Subject: [PATCH] [RIC-199] - e2_term_init_notification_handler - setup removed Change-Id: If083892935fbc3f83ca8c51a5c1284a9aaa227f1 Signed-off-by: Irina --- Automation/Tests/KeepAlive/keep_alive_test.robot | 1 - .../e2_term_init_notification_handler.go | 4 +- .../e2_term_init_notification_handler_test.go | 524 ++++++++++----------- E2Manager/managers/ran_disconnection_manager.go | 2 +- 4 files changed, 253 insertions(+), 278 deletions(-) diff --git a/Automation/Tests/KeepAlive/keep_alive_test.robot b/Automation/Tests/KeepAlive/keep_alive_test.robot index 65e29fb..07faee2 100644 --- a/Automation/Tests/KeepAlive/keep_alive_test.robot +++ b/Automation/Tests/KeepAlive/keep_alive_test.robot @@ -81,7 +81,6 @@ Stop E2T prepare logs for tests Remove log files Save logs - Sleep 3s Verify Is Dead Message Printed ${result} find_error_script.find_error ${EXECDIR} ${e2mgr_log_filename} ${e2_is_dead_message_printed} diff --git a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go index 4987ef1..0059b2a 100644 --- a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go +++ b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go @@ -98,9 +98,7 @@ func (h E2TermInitNotificationHandler) HandleExistingE2TInstance(e2tInstance *en for _, ranName := range e2tInstance.AssociatedRanList { if err := h.ranDisconnectionManager.DisconnectRan(ranName); err != nil { - h.logger.Errorf("#E2TermInitNotificationHandler.HandleExistingE2TInstance - Ran name: %s - connection attempt failure, error: %s", ranName, err) - _, ok := err.(*common.ResourceNotFoundError) - if !ok { + if _, ok := err.(*common.ResourceNotFoundError); !ok{ break } } 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 e06b37f..9a258d0 100644 --- a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go +++ b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go @@ -24,7 +24,6 @@ import ( "bytes" "e2mgr/clients" "e2mgr/configuration" - "e2mgr/e2pdus" "e2mgr/logger" "e2mgr/managers" "e2mgr/mocks" @@ -36,6 +35,7 @@ import ( "fmt" "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" @@ -45,13 +45,11 @@ import ( const e2tInstanceAddress = "10.0.2.15" const e2tInitPayload = "{\"address\":\"10.0.2.15\", \"fqdn\":\"\"}" -func initRanLostConnectionTest(t *testing.T) (*logger.Logger, E2TermInitNotificationHandler, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.RmrMessengerMock, *mocks.E2TInstancesManagerMock, *mocks.RoutingManagerClientMock) { +func initRanLostConnectionTest(t *testing.T) (*logger.Logger, E2TermInitNotificationHandler, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.E2TInstancesManagerMock, *mocks.RoutingManagerClientMock) { logger := initLog(t) config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3} - rmrMessengerMock := &mocks.RmrMessengerMock{} - readerMock := &mocks.RnibReaderMock{} writerMock := &mocks.RnibWriterMock{} @@ -63,19 +61,17 @@ func initRanLostConnectionTest(t *testing.T) (*logger.Logger, E2TermInitNotifica e2tInstancesManagerMock := &mocks.E2TInstancesManagerMock{} e2tAssociationManager := managers.NewE2TAssociationManager(logger, rnibDataService, e2tInstancesManagerMock, routingManagerClientMock) - ranReconnectionManager := managers.NewRanDisconnectionManager(logger, configuration.ParseConfiguration(), rnibDataService, e2tAssociationManager) - handler := NewE2TermInitNotificationHandler(logger, ranReconnectionManager, e2tInstancesManagerMock, routingManagerClientMock) + ranDisconnectionManager := managers.NewRanDisconnectionManager(logger, configuration.ParseConfiguration(), rnibDataService, e2tAssociationManager) + handler := NewE2TermInitNotificationHandler(logger, ranDisconnectionManager, e2tInstancesManagerMock, routingManagerClientMock) - return logger, handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock + return logger, handler, readerMock, writerMock, e2tInstancesManagerMock, routingManagerClientMock } -func initRanLostConnectionTestWithRealE2tInstanceManager(t *testing.T) (*logger.Logger, *configuration.Configuration, E2TermInitNotificationHandler, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.RmrMessengerMock, *mocks.HttpClientMock) { +func initRanLostConnectionTestWithRealE2tInstanceManager(t *testing.T) (*logger.Logger, *configuration.Configuration, E2TermInitNotificationHandler, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.HttpClientMock) { logger := initLog(t) config := configuration.ParseConfiguration() - rmrMessengerMock := &mocks.RmrMessengerMock{} - readerMock := &mocks.RnibReaderMock{} writerMock := &mocks.RnibWriterMock{} @@ -86,13 +82,13 @@ func initRanLostConnectionTestWithRealE2tInstanceManager(t *testing.T) (*logger. e2tInstancesManager := managers.NewE2TInstancesManager(rnibDataService, logger) e2tAssociationManager := managers.NewE2TAssociationManager(logger, rnibDataService, e2tInstancesManager, routingManagerClient) - ranReconnectionManager := managers.NewRanDisconnectionManager(logger, configuration.ParseConfiguration(), rnibDataService, e2tAssociationManager) - handler := NewE2TermInitNotificationHandler(logger, ranReconnectionManager, e2tInstancesManager, routingManagerClient) - return logger, config, handler, readerMock, writerMock, rmrMessengerMock, httpClientMock + ranDisconnectionManager := managers.NewRanDisconnectionManager(logger, configuration.ParseConfiguration(), rnibDataService, e2tAssociationManager) + handler := NewE2TermInitNotificationHandler(logger, ranDisconnectionManager, e2tInstancesManager, routingManagerClient) + return logger, config, handler, readerMock, writerMock, httpClientMock } func TestE2TermInitUnmarshalPayloadFailure(t *testing.T) { - _, handler, _, _, _, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) + _, handler, _, _, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte("asd")} handler.Handle(notificationRequest) e2tInstancesManagerMock.AssertNotCalled(t, "GetE2TInstance") @@ -100,7 +96,7 @@ func TestE2TermInitUnmarshalPayloadFailure(t *testing.T) { } func TestE2TermInitEmptyE2TAddress(t *testing.T) { - _, handler, _, _, _, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) + _, handler, _, _, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte("{\"address\":\"\"}")} handler.Handle(notificationRequest) e2tInstancesManagerMock.AssertNotCalled(t, "GetE2TInstance") @@ -108,7 +104,7 @@ func TestE2TermInitEmptyE2TAddress(t *testing.T) { } func TestE2TermInitGetE2TInstanceFailure(t *testing.T) { - _, handler, _, _, _, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) + _, handler, _, _, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) var e2tInstance *entities.E2TInstance e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, common.NewInternalError(fmt.Errorf("internal error"))) notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} @@ -117,17 +113,16 @@ func TestE2TermInitGetE2TInstanceFailure(t *testing.T) { } func TestE2TermInitGetE2TInstanceDbFailure(t *testing.T) { - _, _, handler, readerMock, writerMock, rmrMessengerMock,_ := initRanLostConnectionTestWithRealE2tInstanceManager(t) + _, _, handler, readerMock, writerMock, _ := initRanLostConnectionTestWithRealE2tInstanceManager(t) var e2tInstance *entities.E2TInstance readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, common.NewInternalError(fmt.Errorf("internal error"))) notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} handler.Handle(notificationRequest) writerMock.AssertNotCalled(t, "UpdateNodebInfo") - rmrMessengerMock.AssertNotCalled(t, "SendMsg") } func TestE2TermInitNewE2TInstance(t *testing.T) { - _, config, handler, readerMock, writerMock, _, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t) + _, config, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t) var e2tInstance *entities.E2TInstance readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, common.NewResourceNotFoundError("not found")) @@ -151,8 +146,24 @@ func TestE2TermInitNewE2TInstance(t *testing.T) { writerMock.AssertCalled(t, "SaveE2TAddresses", e2tAddresses) } +func TestE2TermInitNewE2TInstance__RoutingManagerError(t *testing.T) { + _, config, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t) + + var e2tInstance *entities.E2TInstance + + readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, common.NewResourceNotFoundError("not found")) + + url := config.RoutingManager.BaseUrl + clients.AddE2TInstanceApiSuffix + httpClientMock.On("Post", url, mock.Anything, mock.Anything).Return(&http.Response{}, errors.New("error")) + + notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} + handler.Handle(notificationRequest) + + writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 0) +} + func TestE2TermInitExistingE2TInstanceNoAssociatedRans(t *testing.T) { - _, handler, _, _, _, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) + _, handler, _, _, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil) notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} @@ -160,35 +171,75 @@ func TestE2TermInitExistingE2TInstanceNoAssociatedRans(t *testing.T) { e2tInstancesManagerMock.AssertCalled(t, "GetE2TInstance", e2tInstanceAddress) } -//func TestE2TermInitHandlerSuccessOneRan(t *testing.T) { -// _, handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) -// var rnibErr error -// -// 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} -// writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr) -// -// payload := e2pdus.PackedX2setupRequest -// xaction := []byte(RanName) -// msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), RanName, &payload, &xaction) -// -// rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(msg, nil) -// -// e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) -// e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) -// e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil) -// notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} -// -// handler.Handle(notificationRequest) -// -// writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 1) -// rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 1) -//} +func TestE2TermInitHandlerSuccessOneRan(t *testing.T) { + _, config, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t) + + var rnibErr error + var initialNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"} + 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) + + 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) + + e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) + e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) + readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil) + writerMock.On("SaveE2TInstance", mock.Anything).Return(nil) + + respBody := ioutil.NopCloser(bytes.NewBufferString("")) + url := config.RoutingManager.BaseUrl + clients.DissociateRanE2TInstanceApiSuffix + httpClientMock.On("Post", url, mock.Anything, mock.Anything).Return(&http.Response{StatusCode: http.StatusCreated, Body: respBody}, nil) + + notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} + + handler.Handle(notificationRequest) + + writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 2) + writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 1) + httpClientMock.AssertNumberOfCalls(t, "Post", 1) +} + +func TestE2TermInitHandlerSuccessOneRan_RoutingManagerError(t *testing.T) { + _, config, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t) + + var rnibErr error + var initialNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"} + 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) + + 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) + + e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) + e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) + readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil) + writerMock.On("SaveE2TInstance", mock.Anything).Return(nil) + + url := config.RoutingManager.BaseUrl + clients.DissociateRanE2TInstanceApiSuffix + httpClientMock.On("Post", url, mock.Anything, mock.Anything).Return(&http.Response{}, errors.New("error")) + + notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} + + handler.Handle(notificationRequest) + + writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 2) + writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 1) + httpClientMock.AssertNumberOfCalls(t, "Post", 1) +} func TestE2TermInitHandlerSuccessOneRanShuttingdown(t *testing.T) { - _, _, handler, readerMock, writerMock, rmrMessengerMock,_ := initRanLostConnectionTestWithRealE2tInstanceManager(t) + _, _, handler, readerMock, writerMock,_ := initRanLostConnectionTestWithRealE2tInstanceManager(t) var rnibErr error var initialNodeb = &entities.NodebInfo{RanName: RanName, ConnectionStatus: entities.ConnectionStatus_SHUTTING_DOWN, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} @@ -197,12 +248,6 @@ func TestE2TermInitHandlerSuccessOneRanShuttingdown(t *testing.T) { var argNodeb = &entities.NodebInfo{RanName: RanName, ConnectionStatus: entities.ConnectionStatus_SHUT_DOWN, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 0} writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr) - payload := e2pdus.PackedX2setupRequest - xaction := []byte(RanName) - msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), RanName, &payload, &xaction) - - rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg, nil) - e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil) @@ -211,11 +256,10 @@ func TestE2TermInitHandlerSuccessOneRanShuttingdown(t *testing.T) { handler.Handle(notificationRequest) writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 1) - rmrMessengerMock.AssertNotCalled(t, "SendMsg") } func TestE2TermInitHandlerSuccessOneRan_ToBeDeleted(t *testing.T) { - _, _, handler, readerMock, writerMock, rmrMessengerMock, httpClientMock:= initRanLostConnectionTestWithRealE2tInstanceManager(t) + _, _, handler, readerMock, writerMock, httpClientMock:= initRanLostConnectionTestWithRealE2tInstanceManager(t) var rnibErr error var initialNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} @@ -224,12 +268,6 @@ func TestE2TermInitHandlerSuccessOneRan_ToBeDeleted(t *testing.T) { var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1} writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr) - payload := e2pdus.PackedX2setupRequest - xaction := []byte(RanName) - msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), RanName, &payload, &xaction) - - rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(msg, nil) - e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) e2tInstance.State = entities.ToBeDeleted e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) @@ -241,190 +279,161 @@ func TestE2TermInitHandlerSuccessOneRan_ToBeDeleted(t *testing.T) { httpClientMock.AssertNotCalled(t, "Post", mock.Anything, mock.Anything, mock.Anything) writerMock.AssertNotCalled(t, "UpdateNodebInfo") - rmrMessengerMock.AssertNotCalled(t, "SendMsg") } -//func TestE2TermInitHandlerSuccessTwoRans(t *testing.T) { -// _, _, handler, readerMock, writerMock, rmrMessengerMock, httpClientMock:= initRanLostConnectionTestWithRealE2tInstanceManager(t) -// var rnibErr error -// var initialNodeb0 = &entities.NodebInfo{RanName: RanName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} -// var initialNodeb1 = &entities.NodebInfo{RanName: "test2", ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} -// readerMock.On("GetNodeb", RanName).Return(initialNodeb0, rnibErr) -// readerMock.On("GetNodeb", "test2").Return(initialNodeb1, rnibErr) -// writerMock.On("UpdateNodebInfo", mock.Anything).Return(rnibErr) -// -// payload := e2pdus.PackedX2setupRequest -// xaction := []byte(RanName) -// msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), RanName, &payload, &xaction) -// -// rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(msg, nil) -// -// e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) -// e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName, "test2") -// readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil) -// notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} -// -// handler.Handle(notificationRequest) -// -// writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 2) -// rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 2) -// httpClientMock.AssertNotCalled(t, "Post", mock.Anything, mock.Anything, mock.Anything) -//} - -//func TestE2TermInitHandlerSuccessTwoRansSecondRanShutdown(t *testing.T) { -// _, handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) -// var rnibErr error -// var initialNodeb0 = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} -// var initialNodeb1 = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_SHUT_DOWN, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} -// readerMock.On("GetNodeb", RanName).Return(initialNodeb0, rnibErr) -// readerMock.On("GetNodeb", "test2").Return(initialNodeb1, rnibErr) -// -// var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1} -// writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr) -// -// payload := e2pdus.PackedX2setupRequest -// xaction := []byte(RanName) -// msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), RanName, &payload, &xaction) -// -// rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(msg, nil) -// -// e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) -// e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName, "test2") -// e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil) -// notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} -// -// handler.Handle(notificationRequest) -// -// writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 1) -// rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 1) -// writerMock.AssertExpectations(t) -//} - -//func TestE2TermInitHandlerSuccessThreeRansFirstRmrFailure(t *testing.T) { -// log, handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) -// var rnibErr error -// -// ids := []*entities.NbIdentity{{InventoryName: "test1"}, {InventoryName: "test2"}, {InventoryName: "test3"}} -// -// var initialNodeb0 = &entities.NodebInfo{RanName: ids[0].InventoryName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} -// var initialNodeb1 = &entities.NodebInfo{RanName: ids[1].InventoryName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} -// var initialNodeb2 = &entities.NodebInfo{RanName: ids[2].InventoryName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} -// readerMock.On("GetNodeb", ids[0].InventoryName).Return(initialNodeb0, rnibErr) -// readerMock.On("GetNodeb", ids[1].InventoryName).Return(initialNodeb1, rnibErr) -// readerMock.On("GetNodeb", ids[2].InventoryName).Return(initialNodeb2, rnibErr) -// -// var argNodeb0 = &entities.NodebInfo{RanName: ids[0].InventoryName, ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1} -// var argNodeb0Fail = &entities.NodebInfo{RanName: ids[0].InventoryName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 0} -// writerMock.On("UpdateNodebInfo", argNodeb0).Return(rnibErr) -// writerMock.On("UpdateNodebInfo", argNodeb0Fail).Return(rnibErr) -// -// payload := models.NewE2RequestMessage(ids[0].InventoryName /*tid*/, "", 0, ids[0].InventoryName, e2pdus.PackedX2setupRequest).GetMessageAsBytes(log) -// xaction := []byte(ids[0].InventoryName) -// msg0 := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), ids[0].InventoryName, &payload, &xaction) -// -// rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(msg0, fmt.Errorf("RMR Error")) -// -// e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) -// e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, "test1", "test2", "test3") -// e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil) -// notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} -// -// handler.Handle(notificationRequest) -// -// //test1 (before send +1, after failure +1), test2 (0) test3 (0) -// writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 2) -// //test1 failure (+1), test2 (0). test3 (0) -// rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 1) -//} - -//func TestE2TermInitHandlerSuccessThreeRansSecondNotFoundFailure(t *testing.T) { -// log, handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) -// var rnibErr error -// -// ids := []*entities.NbIdentity{{InventoryName: "test1"}, {InventoryName: "test2"}, {InventoryName: "test3"}} -// -// var initialNodeb0 = &entities.NodebInfo{RanName: ids[0].InventoryName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} -// var initialNodeb1 = &entities.NodebInfo{RanName: ids[1].InventoryName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} -// var initialNodeb2 = &entities.NodebInfo{RanName: ids[2].InventoryName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} -// readerMock.On("GetNodeb", ids[0].InventoryName).Return(initialNodeb0, rnibErr) -// readerMock.On("GetNodeb", ids[1].InventoryName).Return(initialNodeb1, common.NewResourceNotFoundError("not found")) -// readerMock.On("GetNodeb", ids[2].InventoryName).Return(initialNodeb2, rnibErr) -// -// var argNodeb0 = &entities.NodebInfo{RanName: ids[0].InventoryName, ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1} -// var argNodeb0Success = &entities.NodebInfo{RanName: ids[0].InventoryName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1} -// writerMock.On("UpdateNodebInfo", argNodeb0).Return(rnibErr) -// writerMock.On("UpdateNodebInfo", argNodeb0Success).Return(rnibErr) -// -// var argNodeb2 = &entities.NodebInfo{RanName: ids[2].InventoryName, ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1} -// var argNodeb2Success = &entities.NodebInfo{RanName: ids[2].InventoryName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1} -// writerMock.On("UpdateNodebInfo", argNodeb2).Return(rnibErr) -// writerMock.On("UpdateNodebInfo", argNodeb2Success).Return(rnibErr) -// -// payload := models.NewE2RequestMessage(ids[0].InventoryName /*tid*/, "", 0, ids[0].InventoryName, e2pdus.PackedX2setupRequest).GetMessageAsBytes(log) -// xaction := []byte(ids[0].InventoryName) -// msg0 := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), ids[0].InventoryName, &payload, &xaction) -// -// rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(msg0, nil) -// -// e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) -// e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, "test1", "test2", "test3") -// e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil) -// notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} -// -// handler.Handle(notificationRequest) -// -// readerMock.AssertNumberOfCalls(t, "GetNodeb", 3) -// //test1 (+1), test2 failure (0) test3 (+1) -// writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 2) -// //test1 success (+1), test2 (0). test3 (+1) -// rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 2) -//} - -//func TestE2TermInitHandlerSuccessThreeRansSecondRnibInternalErrorFailure(t *testing.T) { -// log, handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) -// var rnibErr error -// -// ids := []*entities.NbIdentity{{InventoryName: "test1"}, {InventoryName: "test2"}, {InventoryName: "test3"}} -// -// var initialNodeb0 = &entities.NodebInfo{RanName: ids[0].InventoryName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} -// var initialNodeb1 = &entities.NodebInfo{RanName: ids[1].InventoryName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} -// var initialNodeb2 = &entities.NodebInfo{RanName: ids[2].InventoryName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} -// readerMock.On("GetNodeb", ids[0].InventoryName).Return(initialNodeb0, rnibErr) -// readerMock.On("GetNodeb", ids[1].InventoryName).Return(initialNodeb1, common.NewInternalError(fmt.Errorf("internal error"))) -// readerMock.On("GetNodeb", ids[2].InventoryName).Return(initialNodeb2, rnibErr) -// -// var argNodeb0 = &entities.NodebInfo{RanName: ids[0].InventoryName, ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1} -// var argNodeb0Success = &entities.NodebInfo{RanName: ids[0].InventoryName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1} -// writerMock.On("UpdateNodebInfo", argNodeb0).Return(rnibErr) -// writerMock.On("UpdateNodebInfo", argNodeb0Success).Return(rnibErr) -// -// var argNodeb2 = &entities.NodebInfo{RanName: ids[2].InventoryName, ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1} -// var argNodeb2Success = &entities.NodebInfo{RanName: ids[2].InventoryName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1} -// writerMock.On("UpdateNodebInfo", argNodeb2).Return(rnibErr) -// writerMock.On("UpdateNodebInfo", argNodeb2Success).Return(rnibErr) -// -// payload := models.NewE2RequestMessage(ids[0].InventoryName /*tid*/, "", 0, ids[0].InventoryName, e2pdus.PackedX2setupRequest).GetMessageAsBytes(log) -// xaction := []byte(ids[0].InventoryName) -// msg0 := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), ids[0].InventoryName, &payload, &xaction) -// -// rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(msg0, nil) -// -// e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) -// e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, "test1", "test2", "test3") -// e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil) -// notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} -// -// handler.Handle(notificationRequest) -// -// readerMock.AssertNumberOfCalls(t, "GetNodeb", 2) -// //test1 (+1), test2 failure (0) test3 (0) -// writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 1) -// //test1 success (+1), test2 (0). test3 (+1) -// rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 1) -//} +func TestE2TermInitHandlerSuccessTwoRans(t *testing.T) { + + _, config, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t) + + var rnibErr error + test2 := "test2" + + //First RAN + var firstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"} + var disconnectedFirstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"} + 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) + + var updatedDisconnectedFirstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: ""} + writerMock.On("UpdateNodebInfo", updatedDisconnectedFirstRan).Return(rnibErr) + + + //Second RAN + var secondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"} + var disconnectedSecondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"} + 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) + + var updatedDisconnectedSecondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: test2, AssociatedE2TInstanceAddress: ""} + writerMock.On("UpdateNodebInfo", updatedDisconnectedSecondRan).Return(rnibErr) + + e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) + e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) + e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, test2) + readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil) + writerMock.On("SaveE2TInstance", mock.Anything).Return(nil) + + respBody := ioutil.NopCloser(bytes.NewBufferString("")) + url := config.RoutingManager.BaseUrl + clients.DissociateRanE2TInstanceApiSuffix + httpClientMock.On("Post", url, mock.Anything, mock.Anything).Return(&http.Response{StatusCode: http.StatusCreated, Body: respBody}, nil) + + notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} + + handler.Handle(notificationRequest) + + writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 4) + writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 2) + httpClientMock.AssertNumberOfCalls(t, "Post", 2) +} + +func TestE2TermInitHandlerSuccessTwoRansSecondRanShutdown(t *testing.T) { + _, config, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t) + + var rnibErr error + test2 := "test2" + + //First RAN + var firstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"} + var disconnectedFirstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"} + 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) + + var updatedDisconnectedFirstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: ""} + writerMock.On("UpdateNodebInfo", updatedDisconnectedFirstRan).Return(rnibErr) + + //Second RAN + 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.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) + readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil) + writerMock.On("SaveE2TInstance", mock.Anything).Return(nil) + + respBody := ioutil.NopCloser(bytes.NewBufferString("")) + url := config.RoutingManager.BaseUrl + clients.DissociateRanE2TInstanceApiSuffix + httpClientMock.On("Post", url, mock.Anything, mock.Anything).Return(&http.Response{StatusCode: http.StatusCreated, Body: respBody}, nil) + + notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} + + handler.Handle(notificationRequest) + + writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 2) + writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 1) + httpClientMock.AssertNumberOfCalls(t, "Post", 1) +} + +func TestE2TermInitHandlerSuccessTwoRansFirstNotFoundFailure(t *testing.T) { + _, config, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t) + + var rnibErr error + test2 := "test2" + + //First RAN + var firstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"} + readerMock.On("GetNodeb", RanName).Return(firstRan, common.NewResourceNotFoundError("not found")) + + //Second RAN + var secondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"} + var disconnectedSecondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"} + 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) + + var updatedDisconnectedSecondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: test2, AssociatedE2TInstanceAddress: ""} + writerMock.On("UpdateNodebInfo", updatedDisconnectedSecondRan).Return(rnibErr) + + e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) + e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) + e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, test2) + readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil) + writerMock.On("SaveE2TInstance", mock.Anything).Return(nil) + + respBody := ioutil.NopCloser(bytes.NewBufferString("")) + url := config.RoutingManager.BaseUrl + clients.DissociateRanE2TInstanceApiSuffix + httpClientMock.On("Post", url, mock.Anything, mock.Anything).Return(&http.Response{StatusCode: http.StatusCreated, Body: respBody}, nil) + + notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} + + handler.Handle(notificationRequest) + + writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 2) + writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 1) + httpClientMock.AssertNumberOfCalls(t, "Post", 1) +} + +func TestE2TermInitHandlerSuccessTwoRansFirstRnibInternalErrorFailure(t *testing.T) { + _, _, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t) + + test2 := "test2" + + //First RAN + 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.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) + e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, test2) + readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil) + + notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} + + handler.Handle(notificationRequest) + + writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 0) + writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 0) + httpClientMock.AssertNumberOfCalls(t, "Post", 0) +} func TestE2TermInitHandlerSuccessZeroRans(t *testing.T) { - _, handler, _, writerMock, rmrMessengerMock, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) + _, handler, _, writerMock, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil) @@ -433,11 +442,10 @@ func TestE2TermInitHandlerSuccessZeroRans(t *testing.T) { handler.Handle(notificationRequest) writerMock.AssertNotCalled(t, "UpdateNodebInfo") - rmrMessengerMock.AssertNotCalled(t, "SendMsg") } func TestE2TermInitHandlerFailureGetNodebInternalError(t *testing.T) { - _, handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) + _, handler, readerMock, writerMock, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) var nodebInfo *entities.NodebInfo readerMock.On("GetNodeb", "test1").Return(nodebInfo, common.NewInternalError(fmt.Errorf("internal error"))) @@ -449,38 +457,8 @@ func TestE2TermInitHandlerFailureGetNodebInternalError(t *testing.T) { handler.Handle(notificationRequest) writerMock.AssertNotCalled(t, "UpdateNodebInfo") - rmrMessengerMock.AssertNotCalled(t, "SendMsg") } -//func TestE2TermInitHandlerSuccessTwoRansSecondIsDisconnected(t *testing.T) { -// _, handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) -// var rnibErr error -// var initialNodeb0 = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} -// var initialNodeb1 = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} -// readerMock.On("GetNodeb", RanName).Return(initialNodeb0, rnibErr) -// readerMock.On("GetNodeb", "test2").Return(initialNodeb1, rnibErr) -// -// var argNodeb1 = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1} -// writerMock.On("UpdateNodebInfo", argNodeb1).Return(rnibErr) -// -// payload := e2pdus.PackedX2setupRequest -// xaction := []byte(RanName) -// msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), RanName, &payload, &xaction) -// -// rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(msg, nil) -// -// e2tInstance := entities.NewE2TInstance(e2tInstanceAddress) -// e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName, "test2") -// e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil) -// notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} -// -// handler.Handle(notificationRequest) -// -// writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 2) -// rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 2) -//} - - // TODO: extract to test_utils func initRmrSender(rmrMessengerMock *mocks.RmrMessengerMock, log *logger.Logger) *rmrsender.RmrSender { rmrMessenger := rmrCgo.RmrMessenger(rmrMessengerMock) diff --git a/E2Manager/managers/ran_disconnection_manager.go b/E2Manager/managers/ran_disconnection_manager.go index 3c4479a..ce6d62e 100644 --- a/E2Manager/managers/ran_disconnection_manager.go +++ b/E2Manager/managers/ran_disconnection_manager.go @@ -71,7 +71,7 @@ func (m *RanDisconnectionManager) DisconnectRan(inventoryName string) error { err = m.updateNodebInfo(nodebInfo, entities.ConnectionStatus_DISCONNECTED) if err != nil { - return err; + return err } e2tAddress := nodebInfo.AssociatedE2TInstanceAddress -- 2.16.6