X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fe2t_association_manager_test.go;h=5a3a11431ce0b931471f5bd9cffffb6718a28777;hb=69f1211bf4b73c8b61ccaf10b75de53a2a6dbc65;hp=fa1384869d2af093c75888e81b2c326a27d60569;hpb=1f62f4c6e2746153275b6c3b1e24a705e25b90c0;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/managers/e2t_association_manager_test.go b/E2Manager/managers/e2t_association_manager_test.go index fa13848..5a3a114 100644 --- a/E2Manager/managers/e2t_association_manager_test.go +++ b/E2Manager/managers/e2t_association_manager_test.go @@ -28,6 +28,8 @@ import ( "e2mgr/models" "e2mgr/services" "encoding/json" + "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/assert" @@ -36,11 +38,14 @@ import ( "testing" ) -const RanName = "test" +const ( + RanName = "test" + StateChangeMessageChannel = "RAN_CONNECTION_STATUS_CHANGE" +) func initE2TAssociationManagerTest(t *testing.T) (*E2TAssociationManager, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.HttpClientMock) { log := initLog(t) - config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3} + config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3, RnibWriter: configuration.RnibWriterConfig{ StateChangeMessageChannel: StateChangeMessageChannel}} readerMock := &mocks.RnibReaderMock{} writerMock := &mocks.RnibWriterMock{} @@ -49,9 +54,11 @@ func initE2TAssociationManagerTest(t *testing.T) (*E2TAssociationManager, *mocks e2tInstancesManager := NewE2TInstancesManager(rnibDataService, log) httpClientMock := &mocks.HttpClientMock{} rmClient := clients.NewRoutingManagerClient(log, config, httpClientMock) - manager := NewE2TAssociationManager(log, rnibDataService, e2tInstancesManager, rmClient) - - return manager, readerMock, writerMock, httpClientMock + ranListManager := NewRanListManager(log, rnibDataService) + ranAlarmService := services.NewRanAlarmService(log, config) + ranConnectStatusChangeManager := NewRanConnectStatusChangeManager(log, rnibDataService, ranListManager, ranAlarmService) + e2tAssociationManager := NewE2TAssociationManager(log, rnibDataService, e2tInstancesManager, rmClient, ranConnectStatusChangeManager) + return e2tAssociationManager, readerMock, writerMock, httpClientMock } func mockHttpClient(httpClientMock *mocks.HttpClientMock, apiSuffix string, isSuccessful bool) { @@ -71,18 +78,21 @@ func mockHttpClient(httpClientMock *mocks.HttpClientMock, apiSuffix string, isSu func TestAssociateRanSuccess(t *testing.T) { manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true) - nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1} + nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: ""} updatedNb := *nb - updatedNb.ConnectionAttempts = 0 - updatedNb.AssociatedE2TInstanceAddress = E2TAddress - writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil) + updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNb, RanName+"_CONNECTED").Return(nil) + updatedNb2 := *nb + updatedNb2.ConnectionStatus = entities.ConnectionStatus_CONNECTED + updatedNb2.AssociatedE2TInstanceAddress = E2TAddress + writerMock.On("UpdateNodebInfo", &updatedNb2).Return(nil) e2tInstance := &entities.E2TInstance{Address: E2TAddress} readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance, nil) updatedE2tInstance := *e2tInstance updatedE2tInstance.AssociatedRanList = append(updatedE2tInstance.AssociatedRanList, RanName) writerMock.On("SaveE2TInstance", &updatedE2tInstance).Return(nil) - err := manager.AssociateRan(E2TAddress, nb) + _, err := manager.AssociateRan(E2TAddress, nb) assert.Nil(t, err) readerMock.AssertExpectations(t) @@ -90,16 +100,33 @@ func TestAssociateRanSuccess(t *testing.T) { httpClientMock.AssertExpectations(t) } -func TestAssociateRanRoutingManagerError(t *testing.T) { +func TestAssociateRan_RnibError(t *testing.T) { manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) + mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true) + nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: ""} + updatedNb := *nb + updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNb, RanName+"_CONNECTED").Return(common.NewInternalError(fmt.Errorf("for tests"))) + + _, err := manager.AssociateRan(E2TAddress, nb) + + assert.NotNil(t, err) + assert.IsType(t, &e2managererrors.RnibDbError{}, err) + readerMock.AssertExpectations(t) + writerMock.AssertExpectations(t) + httpClientMock.AssertExpectations(t) +} + +func TestAssociateRanRoutingManagerError(t *testing.T) { + manager, _, writerMock, httpClientMock := initE2TAssociationManagerTest(t) mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, false) + nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: ""} + writerMock.On("UpdateNodebInfo", nb).Return(nil) - nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1} - err := manager.AssociateRan(E2TAddress, nb) + _, err := manager.AssociateRan(E2TAddress, nb) assert.NotNil(t, err) assert.IsType(t, &e2managererrors.RoutingManagerError{}, err) - readerMock.AssertExpectations(t) writerMock.AssertExpectations(t) httpClientMock.AssertExpectations(t) } @@ -107,13 +134,17 @@ func TestAssociateRanRoutingManagerError(t *testing.T) { func TestAssociateRanUpdateNodebError(t *testing.T) { manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true) - nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1} + nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: ""} + updatedNb := *nb - updatedNb.ConnectionAttempts = 0 - updatedNb.AssociatedE2TInstanceAddress = E2TAddress - writerMock.On("UpdateNodebInfo", &updatedNb).Return(e2managererrors.NewRnibDbError()) + updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNb, RanName+"_CONNECTED").Return(nil) + updatedNb2 := *nb + updatedNb2.ConnectionStatus = entities.ConnectionStatus_CONNECTED + updatedNb2.AssociatedE2TInstanceAddress = E2TAddress + writerMock.On("UpdateNodebInfo", &updatedNb2).Return(e2managererrors.NewRnibDbError()) - err := manager.AssociateRan(E2TAddress, nb) + _, err := manager.AssociateRan(E2TAddress, nb) assert.NotNil(t, err) assert.IsType(t, &e2managererrors.RnibDbError{}, err) @@ -125,15 +156,20 @@ func TestAssociateRanUpdateNodebError(t *testing.T) { func TestAssociateRanGetE2tInstanceError(t *testing.T) { manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true) - nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1} + nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: ""} + updatedNb := *nb - updatedNb.ConnectionAttempts = 0 - updatedNb.AssociatedE2TInstanceAddress = E2TAddress - writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil) + updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNb, RanName+"_CONNECTED").Return(nil) + + updatedNb2 := *nb + updatedNb2.AssociatedE2TInstanceAddress = E2TAddress + updatedNb2.ConnectionStatus = entities.ConnectionStatus_CONNECTED + writerMock.On("UpdateNodebInfo", &updatedNb2).Return(nil) var e2tInstance *entities.E2TInstance readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance, errors.New("test")) - err := manager.AssociateRan(E2TAddress, nb) + _, err := manager.AssociateRan(E2TAddress, nb) assert.NotNil(t, err) assert.IsType(t, &e2managererrors.RnibDbError{}, err) @@ -145,18 +181,23 @@ func TestAssociateRanGetE2tInstanceError(t *testing.T) { func TestAssociateRanSaveE2tInstanceError(t *testing.T) { manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true) - nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1} + nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: ""} + updatedNb := *nb - updatedNb.ConnectionAttempts = 0 - updatedNb.AssociatedE2TInstanceAddress = E2TAddress - writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil) + updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNb, ranName+"_CONNECTED").Return(nil) + + updatedNb2 := *nb + updatedNb2.AssociatedE2TInstanceAddress = E2TAddress + updatedNb2.ConnectionStatus = entities.ConnectionStatus_CONNECTED + writerMock.On("UpdateNodebInfo", &updatedNb2).Return(nil) e2tInstance := &entities.E2TInstance{Address: E2TAddress} readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance, nil) updatedE2tInstance := *e2tInstance updatedE2tInstance.AssociatedRanList = append(updatedE2tInstance.AssociatedRanList, RanName) writerMock.On("SaveE2TInstance", &updatedE2tInstance).Return(errors.New("test")) - err := manager.AssociateRan(E2TAddress, nb) + _, err := manager.AssociateRan(E2TAddress, nb) assert.NotNil(t, err) assert.IsType(t, &e2managererrors.RnibDbError{}, err) @@ -168,7 +209,7 @@ func TestAssociateRanSaveE2tInstanceError(t *testing.T) { func TestDissociateRanSuccess(t *testing.T) { manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) mockHttpClient(httpClientMock, clients.DissociateRanE2TInstanceApiSuffix, true) - nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress, ConnectionAttempts: 1} + nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress} readerMock.On("GetNodeb", RanName).Return(nb, nil) updatedNb := *nb updatedNb.AssociatedE2TInstanceAddress = "" @@ -204,7 +245,7 @@ func TestDissociateRanGetNodebError(t *testing.T) { func TestDissociateRanUpdateNodebError(t *testing.T) { manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) - nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress, ConnectionAttempts: 1} + nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress} readerMock.On("GetNodeb", RanName).Return(nb, nil) updatedNb := *nb updatedNb.AssociatedE2TInstanceAddress = "" @@ -221,7 +262,7 @@ func TestDissociateRanUpdateNodebError(t *testing.T) { func TestDissociateRanGetE2tInstanceError(t *testing.T) { manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) - nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress, ConnectionAttempts: 1} + nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress} readerMock.On("GetNodeb", RanName).Return(nb, nil) updatedNb := *nb updatedNb.AssociatedE2TInstanceAddress = "" @@ -240,7 +281,7 @@ func TestDissociateRanGetE2tInstanceError(t *testing.T) { func TestDissociateRanSaveE2tInstanceError(t *testing.T) { manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) - nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress, ConnectionAttempts: 1} + nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress} readerMock.On("GetNodeb", RanName).Return(nb, nil) updatedNb := *nb updatedNb.AssociatedE2TInstanceAddress = "" @@ -264,7 +305,7 @@ func TestDissociateRanSaveE2tInstanceError(t *testing.T) { func TestDissociateRanRoutingManagerError(t *testing.T) { manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) mockHttpClient(httpClientMock, clients.DissociateRanE2TInstanceApiSuffix, false) - nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress, ConnectionAttempts: 1} + nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress} readerMock.On("GetNodeb", RanName).Return(nb, nil) updatedNb := *nb updatedNb.AssociatedE2TInstanceAddress = "" @@ -282,4 +323,102 @@ func TestDissociateRanRoutingManagerError(t *testing.T) { readerMock.AssertExpectations(t) writerMock.AssertExpectations(t) httpClientMock.AssertExpectations(t) -} \ No newline at end of file +} + +func TestRemoveE2tInstanceSuccessWithOrphans(t *testing.T) { + manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) + + ranNamesToBeDissociated := []string{RanName, "test1"} + data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, ranNamesToBeDissociated, nil) + mockHttpClientDelete(httpClientMock, data, true) + + writerMock.On("RemoveE2TInstance", E2TAddress).Return(nil) + e2tAddresses := []string{E2TAddress} + readerMock.On("GetE2TAddresses").Return(e2tAddresses, nil) + e2tAddressesNew := []string{} + writerMock.On("SaveE2TAddresses", e2tAddressesNew).Return(nil) + + e2tInstance1 := &entities.E2TInstance{Address: E2TAddress, AssociatedRanList: ranNamesToBeDissociated} + err := manager.RemoveE2tInstance(e2tInstance1) + + assert.Nil(t, err) + readerMock.AssertExpectations(t) + writerMock.AssertExpectations(t) + httpClientMock.AssertExpectations(t) +} + +func TestRemoveE2tInstanceFailureRoutingManager(t *testing.T) { + manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) + + data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, []string{"test1"}, nil) + mockHttpClientDelete(httpClientMock, data, false) + + writerMock.On("RemoveE2TInstance", E2TAddress).Return(nil) + e2tAddresses := []string{E2TAddress} + readerMock.On("GetE2TAddresses").Return(e2tAddresses, nil) + e2tAddressesNew := []string{} + writerMock.On("SaveE2TAddresses", e2tAddressesNew).Return(nil) + + e2tInstance1 := &entities.E2TInstance{Address: E2TAddress, AssociatedRanList: []string{"test1"}} + //readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance1, e2managererrors.NewRnibDbError()) + err := manager.RemoveE2tInstance(e2tInstance1) + + assert.Nil(t, err) + readerMock.AssertExpectations(t) + writerMock.AssertExpectations(t) + httpClientMock.AssertExpectations(t) +} + +func TestRemoveE2tInstanceFailureInE2TInstanceManager(t *testing.T) { + + data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, []string{"test1"}, nil) + manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) + mockHttpClientDelete(httpClientMock, data, true) + + writerMock.On("RemoveE2TInstance", E2TAddress).Return(nil) + var e2tAddresses []string + readerMock.On("GetE2TAddresses").Return(e2tAddresses, e2managererrors.NewRnibDbError()) + + e2tInstance1 := &entities.E2TInstance{Address: E2TAddress, AssociatedRanList: []string{"test1"}} + err := manager.RemoveE2tInstance(e2tInstance1) + + assert.NotNil(t, err) + readerMock.AssertExpectations(t) + writerMock.AssertExpectations(t) + httpClientMock.AssertExpectations(t) +} + +func TestRemoveE2tInstanceFailureInE2tInstanceAddRansToInstance(t *testing.T) { + manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) + + data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, nil, nil) + mockHttpClientDelete(httpClientMock, data, true) + + writerMock.On("RemoveE2TInstance", E2TAddress).Return(nil) + e2tAddresses := []string{E2TAddress, E2TAddress2, E2TAddress3} + readerMock.On("GetE2TAddresses").Return(e2tAddresses, nil) + e2tAddressesNew := []string{E2TAddress2, E2TAddress3} + writerMock.On("SaveE2TAddresses", e2tAddressesNew).Return(nil) + + e2tInstance1 := &entities.E2TInstance{Address: E2TAddress} + err := manager.RemoveE2tInstance(e2tInstance1) + + assert.Nil(t, err) + readerMock.AssertExpectations(t) + writerMock.AssertExpectations(t) + httpClientMock.AssertExpectations(t) +} + +func mockHttpClientDelete(httpClientMock *mocks.HttpClientMock, data *models.RoutingManagerDeleteRequestModel, isSuccessful bool) { + + marshaled, _ := json.Marshal(data) + body := bytes.NewBuffer(marshaled) + respBody := ioutil.NopCloser(bytes.NewBufferString("")) + var respStatusCode int + if isSuccessful { + respStatusCode = http.StatusCreated + } else { + respStatusCode = http.StatusBadRequest + } + httpClientMock.On("Delete", "e2t", "application/json", body).Return(&http.Response{StatusCode: respStatusCode, Body: respBody}, nil) +}