X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fe2t_association_manager_test.go;h=7b412d467370df84e7fb403764925384e1a7d58e;hb=b3805a9d29e2c7f6f14e3fedfa1ba504f734eea9;hp=75cfb3b3f996154def06d754d33dec02dddb0444;hpb=e597612ca39c11bb5b562b9e492e5340a618dba9;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/managers/e2t_association_manager_test.go b/E2Manager/managers/e2t_association_manager_test.go index 75cfb3b..7b412d4 100644 --- a/E2Manager/managers/e2t_association_manager_test.go +++ b/E2Manager/managers/e2t_association_manager_test.go @@ -37,12 +37,10 @@ import ( ) const RanName = "test" -const BaseRMUrl = "http://10.10.2.15:12020/routingmanager" func initE2TAssociationManagerTest(t *testing.T) (*E2TAssociationManager, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.HttpClientMock) { log := initLog(t) config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3} - config.RoutingManager.BaseUrl = BaseRMUrl readerMock := &mocks.RnibReaderMock{} writerMock := &mocks.RnibWriterMock{} @@ -56,11 +54,10 @@ func initE2TAssociationManagerTest(t *testing.T) (*E2TAssociationManager, *mocks return manager, readerMock, writerMock, httpClientMock } -func mockHttpClientAssociateRan(httpClientMock *mocks.HttpClientMock, isSuccessful bool) { - data := models.NewRoutingManagerE2TData(E2TAddress, RanName) +func mockHttpClient(httpClientMock *mocks.HttpClientMock, apiSuffix string, isSuccessful bool) { + data := models.RoutingManagerE2TDataList{models.NewRoutingManagerE2TData(E2TAddress, RanName)} marshaled, _ := json.Marshal(data) body := bytes.NewBuffer(marshaled) - url := BaseRMUrl + clients.AssociateRanToE2TInstanceApiSuffix respBody := ioutil.NopCloser(bytes.NewBufferString("")) var respStatusCode int if isSuccessful { @@ -68,17 +65,17 @@ func mockHttpClientAssociateRan(httpClientMock *mocks.HttpClientMock, isSuccessf } else { respStatusCode = http.StatusBadRequest } - httpClientMock.On("Post", url, "application/json", body).Return(&http.Response{StatusCode: respStatusCode, Body: respBody}, nil) + httpClientMock.On("Post", apiSuffix, "application/json", body).Return(&http.Response{StatusCode: respStatusCode, Body: respBody}, nil) } func TestAssociateRanSuccess(t *testing.T) { manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) - mockHttpClientAssociateRan(httpClientMock, true) + mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true) nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1} - readerMock.On("GetNodeb", RanName).Return(nb, nil) updatedNb := *nb updatedNb.ConnectionAttempts = 0 updatedNb.AssociatedE2TInstanceAddress = E2TAddress + updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil) e2tInstance := &entities.E2TInstance{Address: E2TAddress} readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance, nil) @@ -86,7 +83,7 @@ func TestAssociateRanSuccess(t *testing.T) { updatedE2tInstance.AssociatedRanList = append(updatedE2tInstance.AssociatedRanList, RanName) writerMock.On("SaveE2TInstance", &updatedE2tInstance).Return(nil) - err := manager.AssociateRan(E2TAddress, RanName) + err := manager.AssociateRan(E2TAddress, nb) assert.Nil(t, err) readerMock.AssertExpectations(t) @@ -95,25 +92,30 @@ func TestAssociateRanSuccess(t *testing.T) { } func TestAssociateRanRoutingManagerError(t *testing.T) { - manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) - mockHttpClientAssociateRan(httpClientMock, false) + manager, _, writerMock, httpClientMock := initE2TAssociationManagerTest(t) + mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, false) + nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1} + writerMock.On("UpdateNodebInfo", nb).Return(nil) - err := manager.AssociateRan(E2TAddress, RanName) + err := manager.AssociateRan(E2TAddress, nb) assert.NotNil(t, err) assert.IsType(t, &e2managererrors.RoutingManagerError{}, err) - readerMock.AssertExpectations(t) writerMock.AssertExpectations(t) httpClientMock.AssertExpectations(t) } -func TestAssociateRanGetNodebError(t *testing.T) { +func TestAssociateRanUpdateNodebError(t *testing.T) { manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) - mockHttpClientAssociateRan(httpClientMock, true) - var nb *entities.NodebInfo - readerMock.On("GetNodeb", RanName).Return(nb, e2managererrors.NewRnibDbError()) + mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true) + nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1} + updatedNb := *nb + updatedNb.ConnectionAttempts = 0 + updatedNb.AssociatedE2TInstanceAddress = E2TAddress + updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED + writerMock.On("UpdateNodebInfo", &updatedNb).Return(e2managererrors.NewRnibDbError()) - err := manager.AssociateRan(E2TAddress, RanName) + err := manager.AssociateRan(E2TAddress, nb) assert.NotNil(t, err) assert.IsType(t, &e2managererrors.RnibDbError{}, err) @@ -122,17 +124,19 @@ func TestAssociateRanGetNodebError(t *testing.T) { httpClientMock.AssertExpectations(t) } -func TestAssociateRanUpdateNodebError(t *testing.T) { +func TestAssociateRanGetE2tInstanceError(t *testing.T) { manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) - mockHttpClientAssociateRan(httpClientMock, true) + mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true) nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1} - readerMock.On("GetNodeb", RanName).Return(nb, nil) updatedNb := *nb updatedNb.ConnectionAttempts = 0 updatedNb.AssociatedE2TInstanceAddress = E2TAddress - writerMock.On("UpdateNodebInfo", &updatedNb).Return(e2managererrors.NewRnibDbError()) + updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED + writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil) + var e2tInstance *entities.E2TInstance + readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance, errors.New("test")) - err := manager.AssociateRan(E2TAddress, RanName) + err := manager.AssociateRan(E2TAddress, nb) assert.NotNil(t, err) assert.IsType(t, &e2managererrors.RnibDbError{}, err) @@ -141,19 +145,95 @@ func TestAssociateRanUpdateNodebError(t *testing.T) { httpClientMock.AssertExpectations(t) } -func TestAssociateRanGetE2tInstanceError(t *testing.T) { +func TestAssociateRanSaveE2tInstanceError(t *testing.T) { manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) - mockHttpClientAssociateRan(httpClientMock, true) + mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true) nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1} - readerMock.On("GetNodeb", RanName).Return(nb, nil) updatedNb := *nb updatedNb.ConnectionAttempts = 0 updatedNb.AssociatedE2TInstanceAddress = E2TAddress + updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED + writerMock.On("UpdateNodebInfo", &updatedNb).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) + + assert.NotNil(t, err) + assert.IsType(t, &e2managererrors.RnibDbError{}, err) + readerMock.AssertExpectations(t) + writerMock.AssertExpectations(t) + httpClientMock.AssertExpectations(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} + readerMock.On("GetNodeb", RanName).Return(nb, nil) + updatedNb := *nb + updatedNb.AssociatedE2TInstanceAddress = "" + writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil) + e2tInstance := &entities.E2TInstance{Address: E2TAddress} + e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) + readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance, nil) + updatedE2tInstance := *e2tInstance + updatedE2tInstance.AssociatedRanList = []string{} + writerMock.On("SaveE2TInstance", &updatedE2tInstance).Return(nil) + + err := manager.DissociateRan(E2TAddress, RanName) + + assert.Nil(t, err) + readerMock.AssertExpectations(t) + writerMock.AssertExpectations(t) + httpClientMock.AssertExpectations(t) +} + +func TestDissociateRanGetNodebError(t *testing.T) { + manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) + var nb *entities.NodebInfo + readerMock.On("GetNodeb", RanName).Return(nb, e2managererrors.NewRnibDbError()) + + err := manager.DissociateRan(E2TAddress, RanName) + + assert.NotNil(t, err) + assert.IsType(t, &e2managererrors.RnibDbError{}, err) + readerMock.AssertExpectations(t) + writerMock.AssertExpectations(t) + httpClientMock.AssertExpectations(t) +} + +func TestDissociateRanUpdateNodebError(t *testing.T) { + manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) + nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress, ConnectionAttempts: 1} + readerMock.On("GetNodeb", RanName).Return(nb, nil) + updatedNb := *nb + updatedNb.AssociatedE2TInstanceAddress = "" + writerMock.On("UpdateNodebInfo", &updatedNb).Return(e2managererrors.NewRnibDbError()) + + err := manager.DissociateRan(E2TAddress, RanName) + + assert.NotNil(t, err) + assert.IsType(t, &e2managererrors.RnibDbError{}, err) + readerMock.AssertExpectations(t) + writerMock.AssertExpectations(t) + httpClientMock.AssertExpectations(t) +} + +func TestDissociateRanGetE2tInstanceError(t *testing.T) { + manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) + nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress, ConnectionAttempts: 1} + readerMock.On("GetNodeb", RanName).Return(nb, nil) + updatedNb := *nb + updatedNb.AssociatedE2TInstanceAddress = "" writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil) var e2tInstance *entities.E2TInstance readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance, errors.New("test")) - err := manager.AssociateRan(E2TAddress, RanName) + err := manager.DissociateRan(E2TAddress, RanName) assert.NotNil(t, err) assert.IsType(t, &e2managererrors.RnibDbError{}, err) @@ -162,22 +242,21 @@ func TestAssociateRanGetE2tInstanceError(t *testing.T) { httpClientMock.AssertExpectations(t) } -func TestAssociateRanSaveE2tInstanceError(t *testing.T) { +func TestDissociateRanSaveE2tInstanceError(t *testing.T) { manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t) - mockHttpClientAssociateRan(httpClientMock, true) - nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1} + nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress, ConnectionAttempts: 1} readerMock.On("GetNodeb", RanName).Return(nb, nil) updatedNb := *nb - updatedNb.ConnectionAttempts = 0 - updatedNb.AssociatedE2TInstanceAddress = E2TAddress + updatedNb.AssociatedE2TInstanceAddress = "" writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil) e2tInstance := &entities.E2TInstance{Address: E2TAddress} + e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance, nil) updatedE2tInstance := *e2tInstance - updatedE2tInstance.AssociatedRanList = append(updatedE2tInstance.AssociatedRanList, RanName) + updatedE2tInstance.AssociatedRanList = []string{} writerMock.On("SaveE2TInstance", &updatedE2tInstance).Return(errors.New("test")) - err := manager.AssociateRan(E2TAddress, RanName) + err := manager.DissociateRan(E2TAddress, RanName) assert.NotNil(t, err) assert.IsType(t, &e2managererrors.RnibDbError{}, err) @@ -185,3 +264,124 @@ func TestAssociateRanSaveE2tInstanceError(t *testing.T) { writerMock.AssertExpectations(t) httpClientMock.AssertExpectations(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} + readerMock.On("GetNodeb", RanName).Return(nb, nil) + updatedNb := *nb + updatedNb.AssociatedE2TInstanceAddress = "" + writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil) + e2tInstance := &entities.E2TInstance{Address: E2TAddress} + e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName) + readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance, nil) + updatedE2tInstance := *e2tInstance + updatedE2tInstance.AssociatedRanList = []string{} + writerMock.On("SaveE2TInstance", &updatedE2tInstance).Return(nil) + + err := manager.DissociateRan(E2TAddress, RanName) + + assert.Nil(t, err) + readerMock.AssertExpectations(t) + writerMock.AssertExpectations(t) + httpClientMock.AssertExpectations(t) +} + +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) +}