X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fe2t_association_manager_test.go;h=ae536e5de486bcafa72ec04b2ba8f9bda2ae5e0a;hb=edeb7325d2d9e796f21d0c7d2e6e5731876af719;hp=3f31f6b8e6f6b55c1586bad89832cd2b240b81de;hpb=380b7a2a46087a054ebfac57f3dbf7949d318cc6;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/managers/e2t_association_manager_test.go b/E2Manager/managers/e2t_association_manager_test.go index 3f31f6b..ae536e5 100644 --- a/E2Manager/managers/e2t_association_manager_test.go +++ b/E2Manager/managers/e2t_association_manager_test.go @@ -28,20 +28,26 @@ import ( "e2mgr/models" "e2mgr/services" "encoding/json" + "fmt" + "io/ioutil" + "net/http" + "testing" + + "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" "github.com/stretchr/testify/mock" - "io/ioutil" - "net/http" - "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{} @@ -50,9 +56,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) { @@ -72,18 +80,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", mock.Anything, RanName+"_CONNECTED").Return(nil) + updatedNb2 := *nb + updatedNb2.ConnectionStatus = entities.ConnectionStatus_CONNECTED + updatedNb2.AssociatedE2TInstanceAddress = E2TAddress + writerMock.On("UpdateNodebInfo", mock.Anything).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) @@ -91,16 +102,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", mock.Anything, 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", mock.Anything).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) } @@ -108,13 +136,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", mock.Anything, RanName+"_CONNECTED").Return(nil) + updatedNb2 := *nb + updatedNb2.ConnectionStatus = entities.ConnectionStatus_CONNECTED + updatedNb2.AssociatedE2TInstanceAddress = E2TAddress + writerMock.On("UpdateNodebInfo", mock.Anything).Return(e2managererrors.NewRnibDbError()) - err := manager.AssociateRan(E2TAddress, nb) + _, err := manager.AssociateRan(E2TAddress, nb) assert.NotNil(t, err) assert.IsType(t, &e2managererrors.RnibDbError{}, err) @@ -126,15 +158,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", mock.Anything, RanName+"_CONNECTED").Return(nil) + + updatedNb2 := *nb + updatedNb2.AssociatedE2TInstanceAddress = E2TAddress + updatedNb2.ConnectionStatus = entities.ConnectionStatus_CONNECTED + writerMock.On("UpdateNodebInfo", mock.Anything).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) @@ -146,18 +183,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", mock.Anything, ranName+"_CONNECTED").Return(nil) + + updatedNb2 := *nb + updatedNb2.AssociatedE2TInstanceAddress = E2TAddress + updatedNb2.ConnectionStatus = entities.ConnectionStatus_CONNECTED + writerMock.On("UpdateNodebInfo", mock.Anything).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) @@ -169,11 +211,11 @@ 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 = "" - writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) e2tInstance := &entities.E2TInstance{Address: E2TAddress} e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance, nil) @@ -205,11 +247,11 @@ 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 = "" - writerMock.On("UpdateNodebInfo", &updatedNb).Return(e2managererrors.NewRnibDbError()) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(e2managererrors.NewRnibDbError()) err := manager.DissociateRan(E2TAddress, RanName) @@ -222,11 +264,11 @@ 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 = "" - writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) var e2tInstance *entities.E2TInstance readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance, errors.New("test")) @@ -241,11 +283,11 @@ 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 = "" - writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) e2tInstance := &entities.E2TInstance{Address: E2TAddress} e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance, nil) @@ -265,11 +307,11 @@ 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 = "" - writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) e2tInstance := &entities.E2TInstance{Address: E2TAddress} e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance, nil) @@ -285,43 +327,6 @@ func TestDissociateRanRoutingManagerError(t *testing.T) { httpClientMock.AssertExpectations(t) } -func TestRemoveE2tInstanceSuccess(t *testing.T) { - manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) - - e2tDataList := models.RoutingManagerE2TDataList{models.NewRoutingManagerE2TData(E2TAddress2, RanName), models.NewRoutingManagerE2TData(E2TAddress3, "test1")} - data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, nil, e2tDataList) - 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} - e2tInstance2 := &entities.E2TInstance{Address: E2TAddress2} - readerMock.On("GetE2TInstance", E2TAddress2).Return(e2tInstance2, nil) - e2tInstance3 := &entities.E2TInstance{Address: E2TAddress3} - readerMock.On("GetE2TInstance", E2TAddress3).Return(e2tInstance3, nil) - - e2tInstance2updated := *e2tInstance2 - e2tInstance2updated.AssociatedRanList = []string{RanName} - writerMock.On("SaveE2TInstance", &e2tInstance2updated).Return(nil) - e2tInstance3updated := *e2tInstance3 - e2tInstance3updated.AssociatedRanList = []string{"test1"} - writerMock.On("SaveE2TInstance", &e2tInstance3updated).Return(nil) - - ranNamesToBeAssociated := make(map[string][]string) - ranNamesToBeAssociated[E2TAddress2] = []string{RanName} - ranNamesToBeAssociated[E2TAddress3] = []string{"test1"} - err := manager.RemoveE2tInstance(e2tInstance1, nil, ranNamesToBeAssociated) - - assert.Nil(t, err) - readerMock.AssertExpectations(t) - writerMock.AssertExpectations(t) - httpClientMock.AssertExpectations(t) -} - func TestRemoveE2tInstanceSuccessWithOrphans(t *testing.T) { manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) @@ -335,8 +340,8 @@ func TestRemoveE2tInstanceSuccessWithOrphans(t *testing.T) { e2tAddressesNew := []string{} writerMock.On("SaveE2TAddresses", e2tAddressesNew).Return(nil) - e2tInstance1 := &entities.E2TInstance{Address: E2TAddress} - err := manager.RemoveE2tInstance(e2tInstance1, ranNamesToBeDissociated, nil) + e2tInstance1 := &entities.E2TInstance{Address: E2TAddress, AssociatedRanList: ranNamesToBeDissociated} + err := manager.RemoveE2tInstance(e2tInstance1) assert.Nil(t, err) readerMock.AssertExpectations(t) @@ -347,63 +352,20 @@ func TestRemoveE2tInstanceSuccessWithOrphans(t *testing.T) { func TestRemoveE2tInstanceFailureRoutingManager(t *testing.T) { manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) - e2tDataList := models.RoutingManagerE2TDataList{models.NewRoutingManagerE2TData(E2TAddress, RanName)} - data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, []string{"test1"}, e2tDataList) - mockHttpClientDelete(httpClientMock, data, false) - - e2tInstance1 := entities.NewE2TInstance(E2TAddress) - e2tInstance1.State = entities.Active - readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance1, nil) - e2tInstance2 := *e2tInstance1 - e2tInstance2.State = entities.RoutingManagerFailure - writerMock.On("SaveE2TInstance", &e2tInstance2).Return(nil) - ranNamesToBeAssociated := make(map[string][]string) - ranNamesToBeAssociated[E2TAddress] = []string{"test"} - err := manager.RemoveE2tInstance(e2tInstance1, []string{"test1"}, ranNamesToBeAssociated) - - assert.NotNil(t, err) - readerMock.AssertExpectations(t) - writerMock.AssertExpectations(t) - httpClientMock.AssertExpectations(t) -} - -func TestRemoveE2tInstanceFailureRoutingManagerAndGetInstance(t *testing.T) { - manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) - - e2tDataList := models.RoutingManagerE2TDataList{models.NewRoutingManagerE2TData(E2TAddress, RanName)} - data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, []string{"test1"}, e2tDataList) + data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, []string{"test1"}, nil) mockHttpClientDelete(httpClientMock, data, false) - e2tInstance1 := &entities.E2TInstance{Address: E2TAddress} - readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance1, e2managererrors.NewRnibDbError()) - ranNamesToBeAssociated := make(map[string][]string) - ranNamesToBeAssociated[E2TAddress] = []string{"test"} - err := manager.RemoveE2tInstance(e2tInstance1, []string{"test1"}, ranNamesToBeAssociated) - - assert.NotNil(t, err) - readerMock.AssertExpectations(t) - writerMock.AssertExpectations(t) - httpClientMock.AssertExpectations(t) -} - -func TestRemoveE2tInstanceFailureRoutingManagerAndSetInstanceState(t *testing.T) { - manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) - - e2tDataList := models.RoutingManagerE2TDataList{models.NewRoutingManagerE2TData(E2TAddress, RanName)} - data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, []string{"test1"}, e2tDataList) - 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.NewE2TInstance(E2TAddress) - e2tInstance1.State = entities.Active - readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance1, nil) - e2tInstance2 := *e2tInstance1 - e2tInstance2.State = entities.RoutingManagerFailure - writerMock.On("SaveE2TInstance", &e2tInstance2).Return(e2managererrors.NewRnibDbError()) - ranNamesToBeAssociated := make(map[string][]string) - ranNamesToBeAssociated[E2TAddress] = []string{"test"} - err := manager.RemoveE2tInstance(e2tInstance1, []string{"test1"}, ranNamesToBeAssociated) + e2tInstance1 := &entities.E2TInstance{Address: E2TAddress, AssociatedRanList: []string{"test1"}} + //readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance1, e2managererrors.NewRnibDbError()) + err := manager.RemoveE2tInstance(e2tInstance1) - assert.NotNil(t, err) + assert.Nil(t, err) readerMock.AssertExpectations(t) writerMock.AssertExpectations(t) httpClientMock.AssertExpectations(t) @@ -411,8 +373,7 @@ func TestRemoveE2tInstanceFailureRoutingManagerAndSetInstanceState(t *testing.T) func TestRemoveE2tInstanceFailureInE2TInstanceManager(t *testing.T) { - e2tDataList := models.RoutingManagerE2TDataList{models.NewRoutingManagerE2TData(E2TAddress, RanName)} - data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, []string{"test1"}, e2tDataList) + data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, []string{"test1"}, nil) manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) mockHttpClientDelete(httpClientMock, data, true) @@ -420,10 +381,8 @@ func TestRemoveE2tInstanceFailureInE2TInstanceManager(t *testing.T) { var e2tAddresses []string readerMock.On("GetE2TAddresses").Return(e2tAddresses, e2managererrors.NewRnibDbError()) - ranNamesToBeAssociated := make(map[string][]string) - ranNamesToBeAssociated[E2TAddress] = []string{"test"} - e2tInstance1 := &entities.E2TInstance{Address: E2TAddress} - err := manager.RemoveE2tInstance(e2tInstance1, []string{"test1"}, ranNamesToBeAssociated) + e2tInstance1 := &entities.E2TInstance{Address: E2TAddress, AssociatedRanList: []string{"test1"}} + err := manager.RemoveE2tInstance(e2tInstance1) assert.NotNil(t, err) readerMock.AssertExpectations(t) @@ -434,8 +393,7 @@ func TestRemoveE2tInstanceFailureInE2TInstanceManager(t *testing.T) { func TestRemoveE2tInstanceFailureInE2tInstanceAddRansToInstance(t *testing.T) { manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) - e2tDataList := models.RoutingManagerE2TDataList{models.NewRoutingManagerE2TData(E2TAddress2, RanName), models.NewRoutingManagerE2TData(E2TAddress3, "test1")} - data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, nil, e2tDataList) + data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, nil, nil) mockHttpClientDelete(httpClientMock, data, true) writerMock.On("RemoveE2TInstance", E2TAddress).Return(nil) @@ -444,17 +402,10 @@ func TestRemoveE2tInstanceFailureInE2tInstanceAddRansToInstance(t *testing.T) { e2tAddressesNew := []string{E2TAddress2, E2TAddress3} writerMock.On("SaveE2TAddresses", e2tAddressesNew).Return(nil) - var e2tInstance2 *entities.E2TInstance - readerMock.On("GetE2TInstance", mock.Anything).Return(e2tInstance2, e2managererrors.NewRnibDbError()) - - ranNamesToBeAssociated := make(map[string][]string) - ranNamesToBeAssociated[E2TAddress2] = []string{RanName} - ranNamesToBeAssociated[E2TAddress3] = []string{"test1"} - e2tInstance1 := &entities.E2TInstance{Address: E2TAddress} - err := manager.RemoveE2tInstance(e2tInstance1, nil, ranNamesToBeAssociated) + err := manager.RemoveE2tInstance(e2tInstance1) - assert.NotNil(t, err) + assert.Nil(t, err) readerMock.AssertExpectations(t) writerMock.AssertExpectations(t) httpClientMock.AssertExpectations(t)