X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fe2t_shutdown_manager_test.go;h=7cbd1952eb0a12619b631459e7b48e93f0a0fd77;hb=d2f1a29d3f1cc779045148a82729f644e6110776;hp=570cf62fab96001b308f6e665bb63959a67d57c2;hpb=a75da9a56d61ca4754650d44a54bbf0b04f610d1;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/managers/e2t_shutdown_manager_test.go b/E2Manager/managers/e2t_shutdown_manager_test.go index 570cf62..7cbd195 100644 --- a/E2Manager/managers/e2t_shutdown_manager_test.go +++ b/E2Manager/managers/e2t_shutdown_manager_test.go @@ -30,11 +30,15 @@ import ( "e2mgr/services" "encoding/json" "fmt" + "io/ioutil" + "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/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "io/ioutil" + + //"k8s.io/apimachinery/pkg/runtime" + //"k8s.io/client-go/kubernetes/fake" "net/http" "testing" "time" @@ -44,7 +48,7 @@ const E2TAddress3 = "10.10.2.17:9800" func initE2TShutdownManagerTest(t *testing.T) (*E2TShutdownManager, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.HttpClientMock) { log := initLog(t) - config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3, E2TInstanceDeletionTimeoutMs: 15000} + config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3, E2TInstanceDeletionTimeoutMs: 15000, RnibWriter: configuration.RnibWriterConfig{StateChangeMessageChannel: "RAN_CONNECTION_STATUS_CHANGE"}} readerMock := &mocks.RnibReaderMock{} writerMock := &mocks.RnibWriterMock{} @@ -53,9 +57,12 @@ func initE2TShutdownManagerTest(t *testing.T) (*E2TShutdownManager, *mocks.RnibR e2tInstancesManager := NewE2TInstancesManager(rnibDataService, log) httpClientMock := &mocks.HttpClientMock{} rmClient := clients.NewRoutingManagerClient(log, config, httpClientMock) - associationManager := NewE2TAssociationManager(log, rnibDataService, e2tInstancesManager, rmClient) - shutdownManager := NewE2TShutdownManager(log, config, rnibDataService, e2tInstancesManager, associationManager) + ranListManager := NewRanListManager(log, rnibDataService) + ranAlarmService := services.NewRanAlarmService(log, config) + ranConnectStatusChangeManager := NewRanConnectStatusChangeManager(log, rnibDataService, ranListManager, ranAlarmService) + associationManager := NewE2TAssociationManager(log, rnibDataService, e2tInstancesManager, rmClient, ranConnectStatusChangeManager) + shutdownManager := NewE2TShutdownManager(log, config, rnibDataService, e2tInstancesManager, associationManager, ranConnectStatusChangeManager) return shutdownManager, readerMock, writerMock, httpClientMock } @@ -63,25 +70,27 @@ func initE2TShutdownManagerTest(t *testing.T) (*E2TShutdownManager, *mocks.RnibR func TestShutdownSuccess1OutOf3Instances(t *testing.T) { shutdownManager, readerMock, writerMock, httpClientMock := initE2TShutdownManagerTest(t) - e2tInstance1 := entities.NewE2TInstance(E2TAddress) + e2tInstance1 := entities.NewE2TInstance(E2TAddress, PodName) e2tInstance1.State = entities.Active e2tInstance1.AssociatedRanList = []string{"test1", "test2", "test5"} - e2tInstance2 := entities.NewE2TInstance(E2TAddress2) + e2tInstance2 := entities.NewE2TInstance(E2TAddress2, PodName) e2tInstance2.State = entities.Active e2tInstance2.AssociatedRanList = []string{"test3"} - e2tInstance3 := entities.NewE2TInstance(E2TAddress3) + e2tInstance3 := entities.NewE2TInstance(E2TAddress3, PodName) e2tInstance3.State = entities.Active e2tInstance3.AssociatedRanList = []string{"test4"} - writerMock.On("SaveE2TInstance", mock.MatchedBy(func(e2tInstance *entities.E2TInstance) bool { return e2tInstance.Address == E2TAddress && e2tInstance.State == entities.ToBeDeleted })).Return(nil) + writerMock.On("SaveE2TInstance", mock.MatchedBy(func(e2tInstance *entities.E2TInstance) bool { + return e2tInstance.Address == E2TAddress && e2tInstance.State == entities.ToBeDeleted + })).Return(nil) - nodeb1 := &entities.NodebInfo{RanName:"test1", AssociatedE2TInstanceAddress:E2TAddress, ConnectionStatus:entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol:entities.E2ApplicationProtocol_X2_SETUP_REQUEST} + nodeb1 := &entities.NodebInfo{RanName: "test1", AssociatedE2TInstanceAddress: E2TAddress, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} readerMock.On("GetNodeb", "test1").Return(nodeb1, nil) - nodeb2 := &entities.NodebInfo{RanName:"test2", AssociatedE2TInstanceAddress:E2TAddress, ConnectionStatus:entities.ConnectionStatus_SHUTTING_DOWN, E2ApplicationProtocol:entities.E2ApplicationProtocol_X2_SETUP_REQUEST} + nodeb2 := &entities.NodebInfo{RanName: "test2", AssociatedE2TInstanceAddress: E2TAddress, ConnectionStatus: entities.ConnectionStatus_SHUTTING_DOWN, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} readerMock.On("GetNodeb", "test2").Return(nodeb2, nil) - nodeb5 := &entities.NodebInfo{RanName:"test5", AssociatedE2TInstanceAddress:E2TAddress, ConnectionStatus:entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol:entities.E2ApplicationProtocol_X2_SETUP_REQUEST} + nodeb5 := &entities.NodebInfo{RanName: "test5", AssociatedE2TInstanceAddress: E2TAddress, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} readerMock.On("GetNodeb", "test5").Return(nodeb5, nil) - e2tAddresses := []string{E2TAddress, E2TAddress2,E2TAddress3} + e2tAddresses := []string{E2TAddress, E2TAddress2, E2TAddress3} readerMock.On("GetE2TAddresses").Return(e2tAddresses, nil) data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, e2tInstance1.AssociatedRanList, nil) @@ -91,20 +100,37 @@ func TestShutdownSuccess1OutOf3Instances(t *testing.T) { httpClientMock.On("Delete", "e2t", "application/json", body).Return(&http.Response{StatusCode: http.StatusCreated, Body: respBody}, nil) writerMock.On("RemoveE2TInstance", E2TAddress).Return(nil) - writerMock.On("SaveE2TAddresses", []string{E2TAddress2,E2TAddress3}).Return(nil) + writerMock.On("SaveE2TAddresses", []string{E2TAddress2, E2TAddress3}).Return(nil) + /*** nodeb 1 ***/ nodeb1connected := *nodeb1 - nodeb1connected.AssociatedE2TInstanceAddress = "" nodeb1connected.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED - writerMock.On("UpdateNodebInfo", &nodeb1connected).Return(nil) + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, "test1_DISCONNECTED").Return(nil) + + nodeb1NotAssociated := *nodeb1 + nodeb1NotAssociated.AssociatedE2TInstanceAddress = "" + nodeb1NotAssociated.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) + + /*** nodeb 2 ***/ nodeb2connected := *nodeb2 - nodeb2connected.AssociatedE2TInstanceAddress = "" nodeb2connected.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED - writerMock.On("UpdateNodebInfo", &nodeb2connected).Return(nil) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) + + nodeb2NotAssociated := *nodeb2 + nodeb2NotAssociated.AssociatedE2TInstanceAddress = "" + nodeb2NotAssociated.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) + + /*** nodeb 5 ***/ nodeb5connected := *nodeb5 - nodeb5connected.AssociatedE2TInstanceAddress = "" nodeb5connected.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED - writerMock.On("UpdateNodebInfo", &nodeb5connected).Return(nil) + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, "test5_DISCONNECTED").Return(nil) + + nodeb5NotAssociated := *nodeb5 + nodeb5NotAssociated.AssociatedE2TInstanceAddress = "" + nodeb5NotAssociated.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) err := shutdownManager.Shutdown(e2tInstance1) @@ -117,10 +143,12 @@ func TestShutdownSuccess1OutOf3Instances(t *testing.T) { func TestShutdownSuccess1InstanceWithoutRans(t *testing.T) { shutdownManager, readerMock, writerMock, httpClientMock := initE2TShutdownManagerTest(t) - e2tInstance1 := entities.NewE2TInstance(E2TAddress) + e2tInstance1 := entities.NewE2TInstance(E2TAddress, PodName) e2tInstance1.State = entities.Active e2tInstance1.AssociatedRanList = []string{} - writerMock.On("SaveE2TInstance", mock.MatchedBy(func(e2tInstance *entities.E2TInstance) bool { return e2tInstance.Address == E2TAddress && e2tInstance.State == entities.ToBeDeleted })).Return(nil) + writerMock.On("SaveE2TInstance", mock.MatchedBy(func(e2tInstance *entities.E2TInstance) bool { + return e2tInstance.Address == E2TAddress && e2tInstance.State == entities.ToBeDeleted + })).Return(nil) data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, nil, nil) marshaled, _ := json.Marshal(data) @@ -143,14 +171,16 @@ func TestShutdownSuccess1InstanceWithoutRans(t *testing.T) { func TestShutdownSuccess1Instance2Rans(t *testing.T) { shutdownManager, readerMock, writerMock, httpClientMock := initE2TShutdownManagerTest(t) - e2tInstance1 := entities.NewE2TInstance(E2TAddress) + e2tInstance1 := entities.NewE2TInstance(E2TAddress, PodName) e2tInstance1.State = entities.Active e2tInstance1.AssociatedRanList = []string{"test1", "test2"} - writerMock.On("SaveE2TInstance", mock.MatchedBy(func(e2tInstance *entities.E2TInstance) bool { return e2tInstance.Address == E2TAddress && e2tInstance.State == entities.ToBeDeleted })).Return(nil) + writerMock.On("SaveE2TInstance", mock.MatchedBy(func(e2tInstance *entities.E2TInstance) bool { + return e2tInstance.Address == E2TAddress && e2tInstance.State == entities.ToBeDeleted + })).Return(nil) - nodeb1 := &entities.NodebInfo{RanName:"test1", AssociatedE2TInstanceAddress:E2TAddress, ConnectionStatus:entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol:entities.E2ApplicationProtocol_X2_SETUP_REQUEST} + nodeb1 := &entities.NodebInfo{RanName: "test1", AssociatedE2TInstanceAddress: E2TAddress, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} readerMock.On("GetNodeb", "test1").Return(nodeb1, nil) - nodeb2 := &entities.NodebInfo{RanName:"test2", AssociatedE2TInstanceAddress:E2TAddress, ConnectionStatus:entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol:entities.E2ApplicationProtocol_X2_SETUP_REQUEST} + nodeb2 := &entities.NodebInfo{RanName: "test2", AssociatedE2TInstanceAddress: E2TAddress, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} readerMock.On("GetNodeb", "test2").Return(nodeb2, nil) data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, []string{"test1", "test2"}, nil) @@ -163,14 +193,25 @@ func TestShutdownSuccess1Instance2Rans(t *testing.T) { readerMock.On("GetE2TAddresses").Return([]string{E2TAddress}, nil) writerMock.On("SaveE2TAddresses", []string{}).Return(nil) + /*** nodeb 1 connected ***/ nodeb1new := *nodeb1 - nodeb1new.AssociatedE2TInstanceAddress = "" nodeb1new.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED - writerMock.On("UpdateNodebInfo", &nodeb1new).Return(nil) + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, "test1_DISCONNECTED").Return(nil) + + nodeb1NotAssociated := *nodeb1 + nodeb1NotAssociated.AssociatedE2TInstanceAddress = "" + nodeb1NotAssociated.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) + + /*** nodeb 2 disconnected ***/ nodeb2new := *nodeb2 - nodeb2new.AssociatedE2TInstanceAddress = "" nodeb2new.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED - writerMock.On("UpdateNodebInfo", &nodeb2new).Return(nil) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) + + nodeb2NotAssociated := *nodeb2 + nodeb2NotAssociated.AssociatedE2TInstanceAddress = "" + nodeb2NotAssociated.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) err := shutdownManager.Shutdown(e2tInstance1) @@ -178,13 +219,12 @@ func TestShutdownSuccess1Instance2Rans(t *testing.T) { readerMock.AssertExpectations(t) writerMock.AssertExpectations(t) httpClientMock.AssertExpectations(t) - } func TestShutdownE2tInstanceAlreadyBeingDeleted(t *testing.T) { shutdownManager, readerMock, writerMock, httpClientMock := initE2TShutdownManagerTest(t) - e2tInstance1 := entities.NewE2TInstance(E2TAddress) + e2tInstance1 := entities.NewE2TInstance(E2TAddress, PodName) e2tInstance1.State = entities.ToBeDeleted e2tInstance1.AssociatedRanList = []string{"test1"} e2tInstance1.DeletionTimestamp = time.Now().UnixNano() @@ -195,16 +235,17 @@ func TestShutdownE2tInstanceAlreadyBeingDeleted(t *testing.T) { readerMock.AssertExpectations(t) writerMock.AssertExpectations(t) httpClientMock.AssertExpectations(t) - } func TestShutdownFailureMarkInstanceAsToBeDeleted(t *testing.T) { shutdownManager, readerMock, writerMock, httpClientMock := initE2TShutdownManagerTest(t) - e2tInstance1 := entities.NewE2TInstance(E2TAddress) + e2tInstance1 := entities.NewE2TInstance(E2TAddress, PodName) e2tInstance1.State = entities.Active e2tInstance1.AssociatedRanList = []string{"test1", "test2", "test5"} - writerMock.On("SaveE2TInstance", mock.MatchedBy(func(e2tInstance *entities.E2TInstance) bool { return e2tInstance.Address == E2TAddress && e2tInstance.State == entities.ToBeDeleted })).Return(e2managererrors.NewRnibDbError()) + writerMock.On("SaveE2TInstance", mock.MatchedBy(func(e2tInstance *entities.E2TInstance) bool { + return e2tInstance.Address == E2TAddress && e2tInstance.State == entities.ToBeDeleted + })).Return(e2managererrors.NewRnibDbError()) err := shutdownManager.Shutdown(e2tInstance1) @@ -212,31 +253,32 @@ func TestShutdownFailureMarkInstanceAsToBeDeleted(t *testing.T) { readerMock.AssertExpectations(t) writerMock.AssertExpectations(t) httpClientMock.AssertExpectations(t) - } func TestShutdownFailureRoutingManagerError(t *testing.T) { shutdownManager, readerMock, writerMock, httpClientMock := initE2TShutdownManagerTest(t) - e2tInstance1 := entities.NewE2TInstance(E2TAddress) + e2tInstance1 := entities.NewE2TInstance(E2TAddress, PodName) e2tInstance1.State = entities.Active e2tInstance1.AssociatedRanList = []string{"test1", "test2", "test5"} - e2tInstance2 := entities.NewE2TInstance(E2TAddress2) + e2tInstance2 := entities.NewE2TInstance(E2TAddress2, PodName) e2tInstance2.State = entities.Active e2tInstance2.AssociatedRanList = []string{"test3"} - e2tInstance3 := entities.NewE2TInstance(E2TAddress3) + e2tInstance3 := entities.NewE2TInstance(E2TAddress3, PodName) e2tInstance3.State = entities.Active e2tInstance3.AssociatedRanList = []string{"test4"} - writerMock.On("SaveE2TInstance", mock.MatchedBy(func(e2tInstance *entities.E2TInstance) bool { return e2tInstance.Address == E2TAddress && e2tInstance.State == entities.ToBeDeleted })).Return(nil) + writerMock.On("SaveE2TInstance", mock.MatchedBy(func(e2tInstance *entities.E2TInstance) bool { + return e2tInstance.Address == E2TAddress && e2tInstance.State == entities.ToBeDeleted + })).Return(nil) - nodeb1 := &entities.NodebInfo{RanName:"test1", AssociatedE2TInstanceAddress:E2TAddress, ConnectionStatus:entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol:entities.E2ApplicationProtocol_X2_SETUP_REQUEST} + nodeb1 := &entities.NodebInfo{RanName: "test1", AssociatedE2TInstanceAddress: E2TAddress, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} readerMock.On("GetNodeb", "test1").Return(nodeb1, nil) - nodeb2 := &entities.NodebInfo{RanName:"test2", AssociatedE2TInstanceAddress:E2TAddress, ConnectionStatus:entities.ConnectionStatus_SHUTTING_DOWN, E2ApplicationProtocol:entities.E2ApplicationProtocol_X2_SETUP_REQUEST} + nodeb2 := &entities.NodebInfo{RanName: "test2", AssociatedE2TInstanceAddress: E2TAddress, ConnectionStatus: entities.ConnectionStatus_SHUTTING_DOWN, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} readerMock.On("GetNodeb", "test2").Return(nodeb2, nil) - nodeb5 := &entities.NodebInfo{RanName:"test5", AssociatedE2TInstanceAddress:E2TAddress, ConnectionStatus:entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol:entities.E2ApplicationProtocol_X2_SETUP_REQUEST} + nodeb5 := &entities.NodebInfo{RanName: "test5", AssociatedE2TInstanceAddress: E2TAddress, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} readerMock.On("GetNodeb", "test5").Return(nodeb5, nil) - e2tAddresses := []string{E2TAddress, E2TAddress2,E2TAddress3} + e2tAddresses := []string{E2TAddress, E2TAddress2, E2TAddress3} readerMock.On("GetE2TAddresses").Return(e2tAddresses, nil) data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, e2tInstance1.AssociatedRanList, nil) @@ -246,20 +288,37 @@ func TestShutdownFailureRoutingManagerError(t *testing.T) { httpClientMock.On("Delete", "e2t", "application/json", body).Return(&http.Response{StatusCode: http.StatusBadRequest, Body: respBody}, nil) writerMock.On("RemoveE2TInstance", E2TAddress).Return(nil) - writerMock.On("SaveE2TAddresses", []string{E2TAddress2,E2TAddress3}).Return(nil) + writerMock.On("SaveE2TAddresses", []string{E2TAddress2, E2TAddress3}).Return(nil) + /*** nodeb 1 connected ***/ nodeb1connected := *nodeb1 - nodeb1connected.AssociatedE2TInstanceAddress = "" nodeb1connected.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED - writerMock.On("UpdateNodebInfo", &nodeb1connected).Return(nil) + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, "test1_DISCONNECTED").Return(nil) + + nodeb1NotAssociated := *nodeb1 + nodeb1NotAssociated.AssociatedE2TInstanceAddress = "" + nodeb1NotAssociated.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) + + /*** nodeb 2 shutting down ***/ nodeb2connected := *nodeb2 - nodeb2connected.AssociatedE2TInstanceAddress = "" nodeb2connected.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED - writerMock.On("UpdateNodebInfo", &nodeb2connected).Return(nil) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) + + nodeb2NotAssociated := *nodeb2 + nodeb2NotAssociated.AssociatedE2TInstanceAddress = "" + nodeb2NotAssociated.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) + + /*** nodeb 5 connected ***/ nodeb5connected := *nodeb5 - nodeb5connected.AssociatedE2TInstanceAddress = "" nodeb5connected.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED - writerMock.On("UpdateNodebInfo", &nodeb5connected).Return(nil) + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, "test5_DISCONNECTED").Return(nil) + + nodeb5NotAssociated := *nodeb5 + nodeb5NotAssociated.AssociatedE2TInstanceAddress = "" + nodeb5NotAssociated.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) err := shutdownManager.Shutdown(e2tInstance1) @@ -267,24 +326,54 @@ func TestShutdownFailureRoutingManagerError(t *testing.T) { readerMock.AssertExpectations(t) writerMock.AssertExpectations(t) httpClientMock.AssertExpectations(t) - } func TestShutdownFailureInClearNodebsAssociation(t *testing.T) { shutdownManager, readerMock, writerMock, httpClientMock := initE2TShutdownManagerTest(t) - e2tInstance1 := entities.NewE2TInstance(E2TAddress) + e2tInstance1 := entities.NewE2TInstance(E2TAddress, PodName) + e2tInstance1.State = entities.Active + e2tInstance1.AssociatedRanList = []string{"test1", "test2"} + writerMock.On("SaveE2TInstance", mock.MatchedBy(func(e2tInstance *entities.E2TInstance) bool { + return e2tInstance.Address == E2TAddress && e2tInstance.State == entities.ToBeDeleted + })).Return(nil) + + nodeb1 := &entities.NodebInfo{RanName: "test1", AssociatedE2TInstanceAddress: E2TAddress, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} + readerMock.On("GetNodeb", "test1").Return(nodeb1, nil) + + nodeb1new := *nodeb1 + nodeb1new.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, "test1_DISCONNECTED").Return(nil) + + nodeb1NotAssociated := *nodeb1 + nodeb1NotAssociated.AssociatedE2TInstanceAddress = "" + nodeb1NotAssociated.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED + writerMock.On("UpdateNodebInfo", mock.Anything).Return(common.NewInternalError(fmt.Errorf("for tests"))) + + err := shutdownManager.Shutdown(e2tInstance1) + + assert.NotNil(t, err) + readerMock.AssertExpectations(t) + writerMock.AssertExpectations(t) + httpClientMock.AssertExpectations(t) +} + +func TestShutdownFailureInClearNodebsAssociation_UpdateConnectionStatus(t *testing.T) { + shutdownManager, readerMock, writerMock, httpClientMock := initE2TShutdownManagerTest(t) + + e2tInstance1 := entities.NewE2TInstance(E2TAddress, PodName) e2tInstance1.State = entities.Active e2tInstance1.AssociatedRanList = []string{"test1", "test2"} - writerMock.On("SaveE2TInstance", mock.MatchedBy(func(e2tInstance *entities.E2TInstance) bool { return e2tInstance.Address == E2TAddress && e2tInstance.State == entities.ToBeDeleted })).Return(nil) + writerMock.On("SaveE2TInstance", mock.MatchedBy(func(e2tInstance *entities.E2TInstance) bool { + return e2tInstance.Address == E2TAddress && e2tInstance.State == entities.ToBeDeleted + })).Return(nil) - nodeb1 := &entities.NodebInfo{RanName:"test1", AssociatedE2TInstanceAddress:E2TAddress, ConnectionStatus:entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol:entities.E2ApplicationProtocol_X2_SETUP_REQUEST} + nodeb1 := &entities.NodebInfo{RanName: "test1", AssociatedE2TInstanceAddress: E2TAddress, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} readerMock.On("GetNodeb", "test1").Return(nodeb1, nil) nodeb1new := *nodeb1 - nodeb1new.AssociatedE2TInstanceAddress = "" nodeb1new.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED - writerMock.On("UpdateNodebInfo", &nodeb1new).Return(common.NewInternalError(fmt.Errorf("for tests"))) + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, "test1_DISCONNECTED").Return(common.NewInternalError(fmt.Errorf("for tests"))) err := shutdownManager.Shutdown(e2tInstance1) @@ -297,20 +386,26 @@ func TestShutdownFailureInClearNodebsAssociation(t *testing.T) { func TestShutdownResourceNotFoundErrorInGetNodeb(t *testing.T) { shutdownManager, readerMock, writerMock, httpClientMock := initE2TShutdownManagerTest(t) - e2tInstance1 := entities.NewE2TInstance(E2TAddress) + e2tInstance1 := entities.NewE2TInstance(E2TAddress, PodName) e2tInstance1.State = entities.Active e2tInstance1.AssociatedRanList = []string{"test1", "test2"} - writerMock.On("SaveE2TInstance", mock.MatchedBy(func(e2tInstance *entities.E2TInstance) bool { return e2tInstance.Address == E2TAddress && e2tInstance.State == entities.ToBeDeleted })).Return(nil) + writerMock.On("SaveE2TInstance", mock.MatchedBy(func(e2tInstance *entities.E2TInstance) bool { + return e2tInstance.Address == E2TAddress && e2tInstance.State == entities.ToBeDeleted + })).Return(nil) - nodeb1 := &entities.NodebInfo{RanName:"test1", AssociatedE2TInstanceAddress:E2TAddress, ConnectionStatus:entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol:entities.E2ApplicationProtocol_X2_SETUP_REQUEST} + nodeb1 := &entities.NodebInfo{RanName: "test1", AssociatedE2TInstanceAddress: E2TAddress, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} readerMock.On("GetNodeb", "test1").Return(nodeb1, nil) var nodeb2 *entities.NodebInfo readerMock.On("GetNodeb", "test2").Return(nodeb2, common.NewResourceNotFoundError("for testing")) nodeb1new := *nodeb1 - nodeb1new.AssociatedE2TInstanceAddress = "" nodeb1new.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED - writerMock.On("UpdateNodebInfo", &nodeb1new).Return(nil) + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, "test1_DISCONNECTED").Return(nil) + + nodeb1NotAssociated := *nodeb1 + nodeb1NotAssociated.AssociatedE2TInstanceAddress = "" + nodeb1NotAssociated.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) err := shutdownManager.Shutdown(e2tInstance1) @@ -323,14 +418,16 @@ func TestShutdownResourceNotFoundErrorInGetNodeb(t *testing.T) { func TestShutdownResourceGeneralErrorInGetNodeb(t *testing.T) { shutdownManager, readerMock, writerMock, httpClientMock := initE2TShutdownManagerTest(t) - e2tInstance1 := entities.NewE2TInstance(E2TAddress) + e2tInstance1 := entities.NewE2TInstance(E2TAddress, PodName) e2tInstance1.State = entities.Active e2tInstance1.AssociatedRanList = []string{"test1", "test2"} - writerMock.On("SaveE2TInstance", mock.MatchedBy(func(e2tInstance *entities.E2TInstance) bool { return e2tInstance.Address == E2TAddress && e2tInstance.State == entities.ToBeDeleted })).Return(nil) + writerMock.On("SaveE2TInstance", mock.MatchedBy(func(e2tInstance *entities.E2TInstance) bool { + return e2tInstance.Address == E2TAddress && e2tInstance.State == entities.ToBeDeleted + })).Return(nil) var nodeb1 *entities.NodebInfo readerMock.On("GetNodeb", "test1").Return(nodeb1, common.NewInternalError(fmt.Errorf("for testing"))) - nodeb2 := &entities.NodebInfo{RanName:"test2", AssociatedE2TInstanceAddress:E2TAddress, ConnectionStatus:entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol:entities.E2ApplicationProtocol_X2_SETUP_REQUEST} + nodeb2 := &entities.NodebInfo{RanName: "test2", AssociatedE2TInstanceAddress: E2TAddress, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} readerMock.On("GetNodeb", "test2").Return(nodeb2, nil) data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, []string{"test1", "test2"}, nil) @@ -344,9 +441,13 @@ func TestShutdownResourceGeneralErrorInGetNodeb(t *testing.T) { writerMock.On("SaveE2TAddresses", []string{}).Return(nil) nodeb2new := *nodeb2 - nodeb2new.AssociatedE2TInstanceAddress = "" nodeb2new.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED - writerMock.On("UpdateNodebInfo", &nodeb2new).Return(nil) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) + + nodeb2NotAssociated := *nodeb2 + nodeb2NotAssociated.AssociatedE2TInstanceAddress = "" + nodeb2NotAssociated.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) err := shutdownManager.Shutdown(e2tInstance1) @@ -360,22 +461,24 @@ func TestShutdownResourceGeneralErrorInGetNodeb(t *testing.T) { func TestShutdownFailureInRemoveE2TInstance(t *testing.T) { shutdownManager, readerMock, writerMock, httpClientMock := initE2TShutdownManagerTest(t) - e2tInstance1 := entities.NewE2TInstance(E2TAddress) + e2tInstance1 := entities.NewE2TInstance(E2TAddress, PodName) e2tInstance1.State = entities.Active e2tInstance1.AssociatedRanList = []string{"test1", "test2", "test5"} - e2tInstance2 := entities.NewE2TInstance(E2TAddress2) + e2tInstance2 := entities.NewE2TInstance(E2TAddress2, PodName) e2tInstance2.State = entities.Active e2tInstance2.AssociatedRanList = []string{"test3"} - e2tInstance3 := entities.NewE2TInstance(E2TAddress3) + e2tInstance3 := entities.NewE2TInstance(E2TAddress3, PodName) e2tInstance3.State = entities.Active e2tInstance3.AssociatedRanList = []string{"test4"} - writerMock.On("SaveE2TInstance", mock.MatchedBy(func(e2tInstance *entities.E2TInstance) bool { return e2tInstance.Address == E2TAddress && e2tInstance.State == entities.ToBeDeleted })).Return(nil) + writerMock.On("SaveE2TInstance", mock.MatchedBy(func(e2tInstance *entities.E2TInstance) bool { + return e2tInstance.Address == E2TAddress && e2tInstance.State == entities.ToBeDeleted + })).Return(nil) - nodeb1 := &entities.NodebInfo{RanName:"test1", AssociatedE2TInstanceAddress:E2TAddress, ConnectionStatus:entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol:entities.E2ApplicationProtocol_X2_SETUP_REQUEST} + nodeb1 := &entities.NodebInfo{RanName: "test1", AssociatedE2TInstanceAddress: E2TAddress, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} readerMock.On("GetNodeb", "test1").Return(nodeb1, nil) - nodeb2 := &entities.NodebInfo{RanName:"test2", AssociatedE2TInstanceAddress:E2TAddress, ConnectionStatus:entities.ConnectionStatus_SHUTTING_DOWN, E2ApplicationProtocol:entities.E2ApplicationProtocol_X2_SETUP_REQUEST} + nodeb2 := &entities.NodebInfo{RanName: "test2", AssociatedE2TInstanceAddress: E2TAddress, ConnectionStatus: entities.ConnectionStatus_SHUTTING_DOWN, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} readerMock.On("GetNodeb", "test2").Return(nodeb2, nil) - nodeb5 := &entities.NodebInfo{RanName:"test5", AssociatedE2TInstanceAddress:E2TAddress, ConnectionStatus:entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol:entities.E2ApplicationProtocol_X2_SETUP_REQUEST} + nodeb5 := &entities.NodebInfo{RanName: "test5", AssociatedE2TInstanceAddress: E2TAddress, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} readerMock.On("GetNodeb", "test5").Return(nodeb5, nil) data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, e2tInstance1.AssociatedRanList, nil) @@ -386,18 +489,35 @@ func TestShutdownFailureInRemoveE2TInstance(t *testing.T) { writerMock.On("RemoveE2TInstance", E2TAddress).Return(common.NewInternalError(fmt.Errorf("for tests"))) + /*** nodeb 1 connected ***/ nodeb1connected := *nodeb1 - nodeb1connected.AssociatedE2TInstanceAddress = "" nodeb1connected.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED - writerMock.On("UpdateNodebInfo", &nodeb1connected).Return(nil) + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, "test1_DISCONNECTED").Return(nil) + + nodeb1NotAssociated := *nodeb1 + nodeb1NotAssociated.AssociatedE2TInstanceAddress = "" + nodeb1NotAssociated.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) + + /*** nodeb 2 shutting down ***/ nodeb2connected := *nodeb2 - nodeb2connected.AssociatedE2TInstanceAddress = "" nodeb2connected.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED - writerMock.On("UpdateNodebInfo", &nodeb2connected).Return(nil) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) + + nodeb2NotAssociated := *nodeb2 + nodeb2NotAssociated.AssociatedE2TInstanceAddress = "" + nodeb2NotAssociated.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) + + /*** nodeb 5 connected ***/ nodeb5connected := *nodeb5 - nodeb5connected.AssociatedE2TInstanceAddress = "" nodeb5connected.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED - writerMock.On("UpdateNodebInfo", &nodeb5connected).Return(nil) + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, "test5_DISCONNECTED").Return(nil) + + nodeb5NotAssociated := *nodeb5 + nodeb5NotAssociated.AssociatedE2TInstanceAddress = "" + nodeb5NotAssociated.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) err := shutdownManager.Shutdown(e2tInstance1) @@ -405,4 +525,4 @@ func TestShutdownFailureInRemoveE2TInstance(t *testing.T) { readerMock.AssertExpectations(t) writerMock.AssertExpectations(t) httpClientMock.AssertExpectations(t) -} \ No newline at end of file +}