RIC916 new reconnect timer in E2 to reject new connect for x seconds

[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 0e78b7d..ae536e5 100644 (file)
--- a/E2Manager/managers/e2t_association_manager_test.go
+++ b/E2Manager/managers/e2t_association_manager_test.go
@@ -29,13 +29,15 @@ import (
        "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 (
@@ -45,7 +47,7 @@ const (
 
 func initE2TAssociationManagerTest(t *testing.T) (*E2TAssociationManager, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.HttpClientMock) {
        log := initLog(t)
-       config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3, StateChangeMessageChannel: StateChangeMessageChannel}
+       config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3, RnibWriter: configuration.RnibWriterConfig{StateChangeMessageChannel: StateChangeMessageChannel}}
 
        readerMock := &mocks.RnibReaderMock{}
        writerMock := &mocks.RnibWriterMock{}
@@ -54,7 +56,7 @@ func initE2TAssociationManagerTest(t *testing.T) (*E2TAssociationManager, *mocks
        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)
@@ -81,18 +83,18 @@ func TestAssociateRanSuccess(t *testing.T) {
        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)
@@ -106,9 +108,9 @@ func TestAssociateRan_RnibError(t *testing.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)
@@ -121,9 +123,9 @@ 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)
+       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)
@@ -138,13 +140,13 @@ func TestAssociateRanUpdateNodebError(t *testing.T) {
 
        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)
@@ -160,16 +162,16 @@ func TestAssociateRanGetE2tInstanceError(t *testing.T) {
 
        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)
@@ -185,19 +187,19 @@ func TestAssociateRanSaveE2tInstanceError(t *testing.T) {
 
        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)
@@ -213,7 +215,7 @@ func TestDissociateRanSuccess(t *testing.T) {
        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)
@@ -249,7 +251,7 @@ func TestDissociateRanUpdateNodebError(t *testing.T) {
        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)
 
@@ -266,7 +268,7 @@ func TestDissociateRanGetE2tInstanceError(t *testing.T) {
        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"))
 
@@ -285,7 +287,7 @@ func TestDissociateRanSaveE2tInstanceError(t *testing.T) {
        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)
@@ -309,7 +311,7 @@ func TestDissociateRanRoutingManagerError(t *testing.T) {
        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)