[RICPLT-2584,2789] Code fixes + tests for E2T instance shutdown flow

[ric-plt/e2mgr.git] / E2Manager / managers / e2t_association_manager_test.go

diff --git a/E2Manager/managers/e2t_association_manager_test.go b/E2Manager/managers/e2t_association_manager_test.go
index e8090f1..3f31f6b 100644 (file)
--- a/E2Manager/managers/e2t_association_manager_test.go
+++ b/E2Manager/managers/e2t_association_manager_test.go
@@ -31,6 +31,7 @@ import (
        "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"
@@ -286,15 +287,56 @@ func TestDissociateRanRoutingManagerError(t *testing.T) {
 
 func TestRemoveE2tInstanceSuccess(t *testing.T) {
        manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
-       //mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true)
+
+       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)
+
+       ranNamesToBeDissociated := []string{RanName, "test1"}
+       data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, ranNamesToBeDissociated, nil)
+       mockHttpClientDelete(httpClientMock, data, true)
 
        writerMock.On("RemoveE2TInstance", E2TAddress).Return(nil)
-       e2tAddresses := []string{E2TAddress, E2TAddress2}
+       e2tAddresses := []string{E2TAddress}
        readerMock.On("GetE2TAddresses").Return(e2tAddresses, nil)
-       e2tAddressesNew := []string{E2TAddress2}
+       e2tAddressesNew := []string{}
        writerMock.On("SaveE2TAddresses", e2tAddressesNew).Return(nil)
 
-       err := manager.RemoveE2tInstance(E2TAddress, []string{""}, make(map[string][]string))
+       e2tInstance1 := &entities.E2TInstance{Address: E2TAddress}
+       err := manager.RemoveE2tInstance(e2tInstance1, ranNamesToBeDissociated, nil)
 
        assert.Nil(t, err)
        readerMock.AssertExpectations(t)
@@ -302,18 +344,132 @@ func TestRemoveE2tInstanceSuccess(t *testing.T) {
        httpClientMock.AssertExpectations(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)
+       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)
+
+       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)
+
+       assert.NotNil(t, err)
+       readerMock.AssertExpectations(t)
+       writerMock.AssertExpectations(t)
+       httpClientMock.AssertExpectations(t)
+}
+
 func TestRemoveE2tInstanceFailureInE2TInstanceManager(t *testing.T) {
+
+       e2tDataList := models.RoutingManagerE2TDataList{models.NewRoutingManagerE2TData(E2TAddress, RanName)}
+       data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, []string{"test1"}, e2tDataList)
        manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
-       //mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true)
+       mockHttpClientDelete(httpClientMock, data, true)
 
        writerMock.On("RemoveE2TInstance", E2TAddress).Return(nil)
        var e2tAddresses []string
        readerMock.On("GetE2TAddresses").Return(e2tAddresses, e2managererrors.NewRnibDbError())
 
-       err := manager.RemoveE2tInstance(E2TAddress, []string{""}, make(map[string][]string))
+       ranNamesToBeAssociated := make(map[string][]string)
+       ranNamesToBeAssociated[E2TAddress] = []string{"test"}
+       e2tInstance1 := &entities.E2TInstance{Address: E2TAddress}
+       err := manager.RemoveE2tInstance(e2tInstance1, []string{"test1"}, ranNamesToBeAssociated)
+
+       assert.NotNil(t, err)
+       readerMock.AssertExpectations(t)
+       writerMock.AssertExpectations(t)
+       httpClientMock.AssertExpectations(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)
+       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)
+
+       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)
 
        assert.NotNil(t, err)
        readerMock.AssertExpectations(t)
        writerMock.AssertExpectations(t)
        httpClientMock.AssertExpectations(t)
-}
\ No newline at end of file
+}
+
+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)
+}