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

[ric-plt/e2mgr.git] / E2Manager / handlers / rmrmsghandlers / ran_lost_connection_handler_test.go

diff --git a/E2Manager/handlers/rmrmsghandlers/ran_lost_connection_handler_test.go b/E2Manager/handlers/rmrmsghandlers/ran_lost_connection_handler_test.go
index 644ce7a..d612932 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/ran_lost_connection_handler_test.go
+++ b/E2Manager/handlers/rmrmsghandlers/ran_lost_connection_handler_test.go
@@ -28,10 +28,12 @@ import (
        "e2mgr/models"
        "e2mgr/services"
        "encoding/json"
-       "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
        "io/ioutil"
        "net/http"
        "testing"
+
+       "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
+       "github.com/stretchr/testify/mock"
 )
 
 const (
@@ -44,7 +46,9 @@ func setupLostConnectionHandlerTest(isSuccessfulHttpPost bool) (*RanLostConnecti
        config := &configuration.Configuration{
                RnibRetryIntervalMs:       10,
                MaxRnibConnectionAttempts: 3,
-               StateChangeMessageChannel: StateChangeMessageChannel,
+               RnibWriter: configuration.RnibWriterConfig{
+                       StateChangeMessageChannel: StateChangeMessageChannel,
+               },
        }
 
        readerMock := &mocks.RnibReaderMock{}
@@ -53,7 +57,7 @@ func setupLostConnectionHandlerTest(isSuccessfulHttpPost bool) (*RanLostConnecti
        e2tInstancesManager := managers.NewE2TInstancesManager(rnibDataService, logger)
        httpClientMock := &mocks.HttpClientMock{}
        routingManagerClient := clients.NewRoutingManagerClient(logger, config, httpClientMock)
-       ranListManager := managers.NewRanListManager(logger)
+       ranListManager := managers.NewRanListManager(logger, rnibDataService)
        ranAlarmService := services.NewRanAlarmService(logger, config)
        ranConnectStatusChangeManager := managers.NewRanConnectStatusChangeManager(logger, rnibDataService, ranListManager, ranAlarmService)
 
@@ -86,11 +90,11 @@ func TestLostConnectionHandlerConnectingRanSuccess(t *testing.T) {
        readerMock.On("GetNodeb", ranName).Return(origNodebInfo, rnibErr)
        updatedNodebInfo1 := *origNodebInfo
        updatedNodebInfo1.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED
-       writerMock.On("UpdateNodebInfo", &updatedNodebInfo1).Return(rnibErr)
+       writerMock.On("UpdateNodebInfo", mock.Anything).Return(rnibErr)
        updatedNodebInfo2 := *origNodebInfo
        updatedNodebInfo2.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED
        updatedNodebInfo2.AssociatedE2TInstanceAddress = ""
-       writerMock.On("UpdateNodebInfo", &updatedNodebInfo2).Return(rnibErr)
+       writerMock.On("UpdateNodebInfo", mock.Anything).Return(rnibErr)
        e2tInstance := &entities.E2TInstance{Address: e2tAddress, AssociatedRanList: []string{ranName}}
        readerMock.On("GetE2TInstance", e2tAddress).Return(e2tInstance, nil)
        e2tInstanceToSave := *e2tInstance
@@ -118,11 +122,11 @@ func TestLostConnectionHandlerConnectedRanSuccess(t *testing.T) {
        readerMock.On("GetNodeb", ranName).Return(origNodebInfo, rnibErr)
        updatedNodebInfo1 := *origNodebInfo
        updatedNodebInfo1.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED
-       writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNodebInfo1, StateChangeMessageChannel, ranName+"_DISCONNECTED").Return(rnibErr)
+       writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, ranName+"_DISCONNECTED").Return(rnibErr)
        updatedNodebInfo2 := *origNodebInfo
        updatedNodebInfo2.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED
        updatedNodebInfo2.AssociatedE2TInstanceAddress = ""
-       writerMock.On("UpdateNodebInfo", &updatedNodebInfo2).Return(rnibErr)
+       writerMock.On("UpdateNodebInfo", mock.Anything).Return(rnibErr)
        e2tInstance := &entities.E2TInstance{Address: e2tAddress, AssociatedRanList: []string{ranName}}
        readerMock.On("GetE2TInstance", e2tAddress).Return(e2tInstance, nil)
        e2tInstanceToSave := *e2tInstance
@@ -145,11 +149,11 @@ func TestLostConnectionHandlerRmDissociateFailure(t *testing.T) {
        readerMock.On("GetNodeb", ranName).Return(origNodebInfo, rnibErr)
        updatedNodebInfo1 := *origNodebInfo
        updatedNodebInfo1.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED
-       writerMock.On("UpdateNodebInfo", &updatedNodebInfo1).Return(rnibErr)
+       writerMock.On("UpdateNodebInfo", mock.Anything).Return(rnibErr)
        updatedNodebInfo2 := *origNodebInfo
        updatedNodebInfo2.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED
        updatedNodebInfo2.AssociatedE2TInstanceAddress = ""
-       writerMock.On("UpdateNodebInfo", &updatedNodebInfo2).Return(rnibErr)
+       writerMock.On("UpdateNodebInfo", mock.Anything).Return(rnibErr)
        e2tInstance := &entities.E2TInstance{Address: e2tAddress, AssociatedRanList: []string{ranName}}
        readerMock.On("GetE2TInstance", e2tAddress).Return(e2tInstance, nil)
        e2tInstanceToSave := *e2tInstance