"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"
- "io/ioutil"
- "net/http"
- "testing"
+ "github.com/stretchr/testify/mock"
)
const (
func initE2TAssociationManagerTest(t *testing.T) (*E2TAssociationManager, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.HttpClientMock) {
log := initLog(t)
- config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3, RnibWriter: configuration.RnibWriterConfig{ StateChangeMessageChannel: StateChangeMessageChannel}}
+ config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3, RnibWriter: configuration.RnibWriterConfig{StateChangeMessageChannel: StateChangeMessageChannel}}
readerMock := &mocks.RnibReaderMock{}
writerMock := &mocks.RnibWriterMock{}
e2tInstancesManager := NewE2TInstancesManager(rnibDataService, log)
httpClientMock := &mocks.HttpClientMock{}
rmClient := clients.NewRoutingManagerClient(log, config, httpClientMock)
- ranListManager := NewRanListManager(log)
+ ranListManager := NewRanListManager(log, rnibDataService)
ranAlarmService := services.NewRanAlarmService(log, config)
ranConnectStatusChangeManager := NewRanConnectStatusChangeManager(log, rnibDataService, ranListManager, ranAlarmService)
e2tAssociationManager := NewE2TAssociationManager(log, rnibDataService, e2tInstancesManager, rmClient, ranConnectStatusChangeManager)
nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: ""}
updatedNb := *nb
updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED
- writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNb, StateChangeMessageChannel, RanName+"_CONNECTED").Return(nil)
+ writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, RanName+"_CONNECTED").Return(nil)
updatedNb2 := *nb
updatedNb2.ConnectionStatus = entities.ConnectionStatus_CONNECTED
updatedNb2.AssociatedE2TInstanceAddress = E2TAddress
- writerMock.On("UpdateNodebInfo", &updatedNb2).Return(nil)
+ 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)
nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: ""}
updatedNb := *nb
updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED
- writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNb, StateChangeMessageChannel, RanName+"_CONNECTED").Return(common.NewInternalError(fmt.Errorf("for tests")))
+ writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, RanName+"_CONNECTED").Return(common.NewInternalError(fmt.Errorf("for tests")))
- err := manager.AssociateRan(E2TAddress, nb)
+ _, err := manager.AssociateRan(E2TAddress, nb)
assert.NotNil(t, err)
assert.IsType(t, &e2managererrors.RnibDbError{}, err)
manager, _, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, false)
nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: ""}
- writerMock.On("UpdateNodebInfo", nb).Return(nil)
+ writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil)
- err := manager.AssociateRan(E2TAddress, nb)
+ _, err := manager.AssociateRan(E2TAddress, nb)
assert.NotNil(t, err)
assert.IsType(t, &e2managererrors.RoutingManagerError{}, err)
updatedNb := *nb
updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED
- writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNb, StateChangeMessageChannel, RanName+"_CONNECTED").Return(nil)
+ writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, RanName+"_CONNECTED").Return(nil)
updatedNb2 := *nb
updatedNb2.ConnectionStatus = entities.ConnectionStatus_CONNECTED
updatedNb2.AssociatedE2TInstanceAddress = E2TAddress
- writerMock.On("UpdateNodebInfo", &updatedNb2).Return(e2managererrors.NewRnibDbError())
+ 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)
updatedNb := *nb
updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED
- writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNb, StateChangeMessageChannel, RanName+"_CONNECTED").Return(nil)
+ writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, RanName+"_CONNECTED").Return(nil)
updatedNb2 := *nb
updatedNb2.AssociatedE2TInstanceAddress = E2TAddress
updatedNb2.ConnectionStatus = entities.ConnectionStatus_CONNECTED
- writerMock.On("UpdateNodebInfo", &updatedNb2).Return(nil)
+ 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)
updatedNb := *nb
updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED
- writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNb, StateChangeMessageChannel, RanName+"_CONNECTED").Return(nil)
+ writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, ranName+"_CONNECTED").Return(nil)
updatedNb2 := *nb
updatedNb2.AssociatedE2TInstanceAddress = E2TAddress
updatedNb2.ConnectionStatus = entities.ConnectionStatus_CONNECTED
- writerMock.On("UpdateNodebInfo", &updatedNb2).Return(nil)
+ 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)
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)
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)
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"))
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)
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)