X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fe2t_shutdown_manager_test.go;h=570cf62fab96001b308f6e665bb63959a67d57c2;hb=011bb9161ca8e7ad0d0cf282b818672a88a5dfbf;hp=cd69fcfc5a4263d886a19fd110626fa132426c95;hpb=8606e3f5d9501605424efb330854e584d22a2151;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/managers/e2t_shutdown_manager_test.go b/E2Manager/managers/e2t_shutdown_manager_test.go index cd69fcf..570cf62 100644 --- a/E2Manager/managers/e2t_shutdown_manager_test.go +++ b/E2Manager/managers/e2t_shutdown_manager_test.go @@ -25,10 +25,8 @@ import ( "e2mgr/clients" "e2mgr/configuration" "e2mgr/e2managererrors" - "e2mgr/e2pdus" "e2mgr/mocks" "e2mgr/models" - "e2mgr/rmrCgo" "e2mgr/services" "encoding/json" "fmt" @@ -44,7 +42,7 @@ import ( const E2TAddress3 = "10.10.2.17:9800" -func initE2TShutdownManagerTest(t *testing.T) (*E2TShutdownManager, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.HttpClientMock, *mocks.RmrMessengerMock) { +func initE2TShutdownManagerTest(t *testing.T) (*E2TShutdownManager, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.HttpClientMock) { log := initLog(t) config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3, E2TInstanceDeletionTimeoutMs: 15000} @@ -56,16 +54,14 @@ func initE2TShutdownManagerTest(t *testing.T) (*E2TShutdownManager, *mocks.RnibR httpClientMock := &mocks.HttpClientMock{} rmClient := clients.NewRoutingManagerClient(log, config, httpClientMock) associationManager := NewE2TAssociationManager(log, rnibDataService, e2tInstancesManager, rmClient) - rmrMessengerMock := &mocks.RmrMessengerMock{} - rmrSender := initRmrSender(rmrMessengerMock, log) - ranSetupManager := NewRanSetupManager(log, rmrSender, rnibDataService) - shutdownManager := NewE2TShutdownManager(log, config, rnibDataService, e2tInstancesManager, associationManager, ranSetupManager) - return shutdownManager, readerMock, writerMock, httpClientMock, rmrMessengerMock + shutdownManager := NewE2TShutdownManager(log, config, rnibDataService, e2tInstancesManager, associationManager) + + return shutdownManager, readerMock, writerMock, httpClientMock } func TestShutdownSuccess1OutOf3Instances(t *testing.T) { - shutdownManager, readerMock, writerMock, httpClientMock, rmrMessengerMock := initE2TShutdownManagerTest(t) + shutdownManager, readerMock, writerMock, httpClientMock := initE2TShutdownManagerTest(t) e2tInstance1 := entities.NewE2TInstance(E2TAddress) e2tInstance1.State = entities.Active @@ -87,10 +83,8 @@ func TestShutdownSuccess1OutOf3Instances(t *testing.T) { e2tAddresses := []string{E2TAddress, E2TAddress2,E2TAddress3} readerMock.On("GetE2TAddresses").Return(e2tAddresses, nil) - readerMock.On("GetE2TInstances", e2tAddresses).Return([]*entities.E2TInstance{e2tInstance2,e2tInstance3}, nil) - e2tDataList := models.RoutingManagerE2TDataList{models.NewRoutingManagerE2TData(E2TAddress2, "test1", "test5")} - data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, nil, e2tDataList) + data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, e2tInstance1.AssociatedRanList, nil) marshaled, _ := json.Marshal(data) body := bytes.NewBuffer(marshaled) respBody := ioutil.NopCloser(bytes.NewBufferString("")) @@ -99,50 +93,29 @@ func TestShutdownSuccess1OutOf3Instances(t *testing.T) { writerMock.On("RemoveE2TInstance", E2TAddress).Return(nil) writerMock.On("SaveE2TAddresses", []string{E2TAddress2,E2TAddress3}).Return(nil) - readerMock.On("GetE2TInstance", E2TAddress2).Return(e2tInstance2, nil) - e2tInstance2updated := *e2tInstance2 - e2tInstance2updated.AssociatedRanList = append(e2tInstance2updated.AssociatedRanList, "test1", "test5") - writerMock.On("SaveE2TInstance", &e2tInstance2updated).Return(nil) - - nodeb1new := *nodeb1 - nodeb1new.AssociatedE2TInstanceAddress = E2TAddress2 - nodeb1new.ConnectionStatus = entities.ConnectionStatus_CONNECTING - nodeb1new.ConnectionAttempts = 1 - writerMock.On("UpdateNodebInfo", &nodeb1new).Return(nil) - nodeb5new := *nodeb5 - nodeb5new.AssociatedE2TInstanceAddress = E2TAddress2 - nodeb5new.ConnectionStatus = entities.ConnectionStatus_CONNECTING - nodeb5new.ConnectionAttempts = 1 - writerMock.On("UpdateNodebInfo", &nodeb5new).Return(nil) - nodeb1connected := *nodeb1 - nodeb1connected.AssociatedE2TInstanceAddress = E2TAddress2 - nodeb1connected.ConnectionStatus = entities.ConnectionStatus_CONNECTED + nodeb1connected.AssociatedE2TInstanceAddress = "" + nodeb1connected.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED writerMock.On("UpdateNodebInfo", &nodeb1connected).Return(nil) + nodeb2connected := *nodeb2 + nodeb2connected.AssociatedE2TInstanceAddress = "" + nodeb2connected.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED + writerMock.On("UpdateNodebInfo", &nodeb2connected).Return(nil) nodeb5connected := *nodeb5 - nodeb5connected.AssociatedE2TInstanceAddress = E2TAddress2 - nodeb5connected.ConnectionStatus = entities.ConnectionStatus_CONNECTED + nodeb5connected.AssociatedE2TInstanceAddress = "" + nodeb5connected.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED writerMock.On("UpdateNodebInfo", &nodeb5connected).Return(nil) - payload := e2pdus.PackedX2setupRequest - xaction1 := []byte("test1") - msg1 := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), "test1", &payload, &xaction1) - rmrMessengerMock.On("SendMsg",mock.Anything, true).Return(msg1, nil) - xaction5 := []byte("test5") - msg5 := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), "test5", &payload, &xaction5) - rmrMessengerMock.On("SendMsg",mock.Anything, true).Return(msg5, nil) - err := shutdownManager.Shutdown(e2tInstance1) assert.Nil(t, err) readerMock.AssertExpectations(t) writerMock.AssertExpectations(t) httpClientMock.AssertExpectations(t) - rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 2) } func TestShutdownSuccess1InstanceWithoutRans(t *testing.T) { - shutdownManager, readerMock, writerMock, httpClientMock, rmrMessengerMock := initE2TShutdownManagerTest(t) + shutdownManager, readerMock, writerMock, httpClientMock := initE2TShutdownManagerTest(t) e2tInstance1 := entities.NewE2TInstance(E2TAddress) e2tInstance1.State = entities.Active @@ -165,11 +138,10 @@ func TestShutdownSuccess1InstanceWithoutRans(t *testing.T) { readerMock.AssertExpectations(t) writerMock.AssertExpectations(t) httpClientMock.AssertExpectations(t) - rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 0) } func TestShutdownSuccess1Instance2Rans(t *testing.T) { - shutdownManager, readerMock, writerMock, httpClientMock, rmrMessengerMock := initE2TShutdownManagerTest(t) + shutdownManager, readerMock, writerMock, httpClientMock := initE2TShutdownManagerTest(t) e2tInstance1 := entities.NewE2TInstance(E2TAddress) e2tInstance1.State = entities.Active @@ -187,10 +159,6 @@ func TestShutdownSuccess1Instance2Rans(t *testing.T) { respBody := ioutil.NopCloser(bytes.NewBufferString("")) httpClientMock.On("Delete", "e2t", "application/json", body).Return(&http.Response{StatusCode: http.StatusCreated, Body: respBody}, nil) - e2tInstance1updated := *e2tInstance1 - e2tInstance1updated.State = entities.ToBeDeleted - readerMock.On("GetE2TInstances", []string{E2TAddress}).Return([]*entities.E2TInstance{&e2tInstance1updated}, nil) - writerMock.On("RemoveE2TInstance", E2TAddress).Return(nil) readerMock.On("GetE2TAddresses").Return([]string{E2TAddress}, nil) writerMock.On("SaveE2TAddresses", []string{}).Return(nil) @@ -210,13 +178,11 @@ func TestShutdownSuccess1Instance2Rans(t *testing.T) { readerMock.AssertExpectations(t) writerMock.AssertExpectations(t) httpClientMock.AssertExpectations(t) - rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 0) + } - - func TestShutdownE2tInstanceAlreadyBeingDeleted(t *testing.T) { - shutdownManager, readerMock, writerMock, httpClientMock, rmrMessengerMock := initE2TShutdownManagerTest(t) + shutdownManager, readerMock, writerMock, httpClientMock := initE2TShutdownManagerTest(t) e2tInstance1 := entities.NewE2TInstance(E2TAddress) e2tInstance1.State = entities.ToBeDeleted @@ -229,11 +195,11 @@ func TestShutdownE2tInstanceAlreadyBeingDeleted(t *testing.T) { readerMock.AssertExpectations(t) writerMock.AssertExpectations(t) httpClientMock.AssertExpectations(t) - rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 0) + } func TestShutdownFailureMarkInstanceAsToBeDeleted(t *testing.T) { - shutdownManager, readerMock, writerMock, httpClientMock, rmrMessengerMock := initE2TShutdownManagerTest(t) + shutdownManager, readerMock, writerMock, httpClientMock := initE2TShutdownManagerTest(t) e2tInstance1 := entities.NewE2TInstance(E2TAddress) e2tInstance1.State = entities.Active @@ -246,94 +212,11 @@ func TestShutdownFailureMarkInstanceAsToBeDeleted(t *testing.T) { readerMock.AssertExpectations(t) writerMock.AssertExpectations(t) httpClientMock.AssertExpectations(t) - rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 0) -} - -func TestShutdownFailureReassociatingInMemoryNodebNotFound(t *testing.T) { - shutdownManager, readerMock, writerMock, httpClientMock, rmrMessengerMock := initE2TShutdownManagerTest(t) - - e2tInstance1 := entities.NewE2TInstance(E2TAddress) - e2tInstance1.State = entities.Active - e2tInstance1.AssociatedRanList = []string{"test1", "test2"} - e2tInstance2 := entities.NewE2TInstance(E2TAddress2) - e2tInstance2.State = entities.Active - e2tInstance2.AssociatedRanList = []string{"test3"} - 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.NewResourceNotFoundError("for tests")) - nodeb2 := &entities.NodebInfo{RanName:"test2", AssociatedE2TInstanceAddress:E2TAddress, ConnectionStatus:entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol:entities.E2ApplicationProtocol_X2_SETUP_REQUEST} - readerMock.On("GetNodeb", "test2").Return(nodeb2, nil) - - e2tAddresses := []string{E2TAddress, E2TAddress2} - readerMock.On("GetE2TAddresses").Return(e2tAddresses, nil) - readerMock.On("GetE2TInstances", e2tAddresses).Return([]*entities.E2TInstance{e2tInstance2}, nil) - - e2tDataList := models.RoutingManagerE2TDataList{models.NewRoutingManagerE2TData(E2TAddress2, "test2")} - data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, nil, e2tDataList) - marshaled, _ := json.Marshal(data) - body := bytes.NewBuffer(marshaled) - respBody := ioutil.NopCloser(bytes.NewBufferString("")) - 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}).Return(nil) - - readerMock.On("GetE2TInstance", E2TAddress2).Return(e2tInstance2, nil) - e2tInstance2updated := *e2tInstance2 - e2tInstance2updated.AssociatedRanList = append(e2tInstance2updated.AssociatedRanList, "test2") - writerMock.On("SaveE2TInstance", &e2tInstance2updated).Return(nil) - - nodeb2new := *nodeb2 - nodeb2new.AssociatedE2TInstanceAddress = E2TAddress2 - nodeb2new.ConnectionStatus = entities.ConnectionStatus_CONNECTING - nodeb2new.ConnectionAttempts = 1 - writerMock.On("UpdateNodebInfo", &nodeb2new).Return(nil) - - nodeb2connected := *nodeb2 - nodeb2connected.AssociatedE2TInstanceAddress = E2TAddress2 - nodeb2connected.ConnectionStatus = entities.ConnectionStatus_CONNECTED - writerMock.On("UpdateNodebInfo", &nodeb2connected).Return(nil) - - payload := e2pdus.PackedX2setupRequest - xaction2 := []byte("test2") - msg2 := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), "test2", &payload, &xaction2) - rmrMessengerMock.On("SendMsg",mock.Anything, true).Return(msg2, nil) - - err := shutdownManager.Shutdown(e2tInstance1) - - assert.Nil(t, err) - readerMock.AssertExpectations(t) - writerMock.AssertExpectations(t) - httpClientMock.AssertExpectations(t) - rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 1) -} - -func TestShutdownFailureReassociatingInMemoryGetNodebError(t *testing.T) { - shutdownManager, readerMock, writerMock, httpClientMock, rmrMessengerMock := initE2TShutdownManagerTest(t) - - e2tInstance1 := entities.NewE2TInstance(E2TAddress) - e2tInstance1.State = entities.Active - e2tInstance1.AssociatedRanList = []string{"test1", "test2"} - e2tInstance2 := entities.NewE2TInstance(E2TAddress2) - e2tInstance2.State = entities.Active - e2tInstance2.AssociatedRanList = []string{"test3"} - 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 tests"))) - - err := shutdownManager.Shutdown(e2tInstance1) - - assert.NotNil(t, err) - readerMock.AssertExpectations(t) - writerMock.AssertExpectations(t) - httpClientMock.AssertExpectations(t) - rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 0) + } func TestShutdownFailureRoutingManagerError(t *testing.T) { - shutdownManager, readerMock, writerMock, httpClientMock, rmrMessengerMock := initE2TShutdownManagerTest(t) + shutdownManager, readerMock, writerMock, httpClientMock := initE2TShutdownManagerTest(t) e2tInstance1 := entities.NewE2TInstance(E2TAddress) e2tInstance1.State = entities.Active @@ -355,29 +238,40 @@ func TestShutdownFailureRoutingManagerError(t *testing.T) { e2tAddresses := []string{E2TAddress, E2TAddress2,E2TAddress3} readerMock.On("GetE2TAddresses").Return(e2tAddresses, nil) - readerMock.On("GetE2TInstances", e2tAddresses).Return([]*entities.E2TInstance{e2tInstance2,e2tInstance3}, nil) - e2tDataList := models.RoutingManagerE2TDataList{models.NewRoutingManagerE2TData(E2TAddress2, "test1", "test5")} - data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, nil, e2tDataList) + data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, e2tInstance1.AssociatedRanList, nil) marshaled, _ := json.Marshal(data) body := bytes.NewBuffer(marshaled) respBody := ioutil.NopCloser(bytes.NewBufferString("")) httpClientMock.On("Delete", "e2t", "application/json", body).Return(&http.Response{StatusCode: http.StatusBadRequest, Body: respBody}, nil) - readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance1, nil) - writerMock.On("SaveE2TInstance", mock.MatchedBy(func(e2tInstance *entities.E2TInstance) bool { return e2tInstance.Address == E2TAddress && e2tInstance.State == entities.RoutingManagerFailure })).Return(nil) + writerMock.On("RemoveE2TInstance", E2TAddress).Return(nil) + writerMock.On("SaveE2TAddresses", []string{E2TAddress2,E2TAddress3}).Return(nil) + + nodeb1connected := *nodeb1 + nodeb1connected.AssociatedE2TInstanceAddress = "" + nodeb1connected.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED + writerMock.On("UpdateNodebInfo", &nodeb1connected).Return(nil) + nodeb2connected := *nodeb2 + nodeb2connected.AssociatedE2TInstanceAddress = "" + nodeb2connected.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED + writerMock.On("UpdateNodebInfo", &nodeb2connected).Return(nil) + nodeb5connected := *nodeb5 + nodeb5connected.AssociatedE2TInstanceAddress = "" + nodeb5connected.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED + writerMock.On("UpdateNodebInfo", &nodeb5connected).Return(nil) err := shutdownManager.Shutdown(e2tInstance1) - assert.NotNil(t, err) + assert.Nil(t, err) readerMock.AssertExpectations(t) writerMock.AssertExpectations(t) httpClientMock.AssertExpectations(t) - rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 0) + } func TestShutdownFailureInClearNodebsAssociation(t *testing.T) { - shutdownManager, readerMock, writerMock, httpClientMock, rmrMessengerMock := initE2TShutdownManagerTest(t) + shutdownManager, readerMock, writerMock, httpClientMock := initE2TShutdownManagerTest(t) e2tInstance1 := entities.NewE2TInstance(E2TAddress) e2tInstance1.State = entities.Active @@ -386,22 +280,6 @@ func TestShutdownFailureInClearNodebsAssociation(t *testing.T) { 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} - readerMock.On("GetNodeb", "test2").Return(nodeb2, nil) - - data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, []string{"test1", "test2"}, nil) - marshaled, _ := json.Marshal(data) - body := bytes.NewBuffer(marshaled) - respBody := ioutil.NopCloser(bytes.NewBufferString("")) - httpClientMock.On("Delete", "e2t", "application/json", body).Return(&http.Response{StatusCode: http.StatusCreated, Body: respBody}, nil) - - e2tInstance1updated := *e2tInstance1 - e2tInstance1updated.State = entities.ToBeDeleted - readerMock.On("GetE2TInstances", []string{E2TAddress}).Return([]*entities.E2TInstance{&e2tInstance1updated}, nil) - - writerMock.On("RemoveE2TInstance", E2TAddress).Return(nil) - readerMock.On("GetE2TAddresses").Return([]string{E2TAddress}, nil) - writerMock.On("SaveE2TAddresses", []string{}).Return(nil) nodeb1new := *nodeb1 nodeb1new.AssociatedE2TInstanceAddress = "" @@ -414,155 +292,76 @@ func TestShutdownFailureInClearNodebsAssociation(t *testing.T) { readerMock.AssertExpectations(t) writerMock.AssertExpectations(t) httpClientMock.AssertExpectations(t) - rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 0) } -func TestShutdownFailureInRmr(t *testing.T) { - shutdownManager, readerMock, writerMock, httpClientMock, rmrMessengerMock := initE2TShutdownManagerTest(t) +func TestShutdownResourceNotFoundErrorInGetNodeb(t *testing.T) { + shutdownManager, readerMock, writerMock, httpClientMock := initE2TShutdownManagerTest(t) e2tInstance1 := entities.NewE2TInstance(E2TAddress) e2tInstance1.State = entities.Active - e2tInstance1.AssociatedRanList = []string{"test1", "test2", "test5"} - e2tInstance2 := entities.NewE2TInstance(E2TAddress2) - e2tInstance2.State = entities.Active - e2tInstance2.AssociatedRanList = []string{"test3"} - e2tInstance3 := entities.NewE2TInstance(E2TAddress3) - e2tInstance3.State = entities.Active - e2tInstance3.AssociatedRanList = []string{"test4"} + 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) - 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} - readerMock.On("GetNodeb", "test5").Return(nodeb5, nil) - - e2tAddresses := []string{E2TAddress, E2TAddress2,E2TAddress3} - readerMock.On("GetE2TAddresses").Return(e2tAddresses, nil) - readerMock.On("GetE2TInstances", e2tAddresses).Return([]*entities.E2TInstance{e2tInstance2,e2tInstance3}, nil) - - e2tDataList := models.RoutingManagerE2TDataList{models.NewRoutingManagerE2TData(E2TAddress2, "test1", "test5")} - data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, nil, e2tDataList) - marshaled, _ := json.Marshal(data) - body := bytes.NewBuffer(marshaled) - respBody := ioutil.NopCloser(bytes.NewBufferString("")) - 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) - - readerMock.On("GetE2TInstance", E2TAddress2).Return(e2tInstance2, nil) - e2tInstance2updated := *e2tInstance2 - e2tInstance2updated.AssociatedRanList = []string{"test3", "test1", "test5"} - writerMock.On("SaveE2TInstance", &e2tInstance2updated).Return(nil) - - nodeb1reassigned := *nodeb1 - nodeb1reassigned.AssociatedE2TInstanceAddress = E2TAddress2 - writerMock.On("UpdateNodebInfo", &nodeb1reassigned).Return(nil) - nodeb5reassigned := *nodeb5 - nodeb5reassigned.AssociatedE2TInstanceAddress = E2TAddress2 - writerMock.On("UpdateNodebInfo", &nodeb5reassigned).Return(nil) + var nodeb2 *entities.NodebInfo + readerMock.On("GetNodeb", "test2").Return(nodeb2, common.NewResourceNotFoundError("for testing")) nodeb1new := *nodeb1 - nodeb1new.AssociatedE2TInstanceAddress = E2TAddress2 - nodeb1new.ConnectionStatus = entities.ConnectionStatus_CONNECTING - nodeb1new.ConnectionAttempts = 1 + nodeb1new.AssociatedE2TInstanceAddress = "" + nodeb1new.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED writerMock.On("UpdateNodebInfo", &nodeb1new).Return(nil) - nodeb5new := *nodeb5 - nodeb5new.AssociatedE2TInstanceAddress = E2TAddress2 - nodeb5new.ConnectionStatus = entities.ConnectionStatus_CONNECTING - nodeb5new.ConnectionAttempts = 1 - writerMock.On("UpdateNodebInfo", &nodeb5new).Return(nil) - - nodeb1connected := *nodeb1 - nodeb1connected.AssociatedE2TInstanceAddress = E2TAddress2 - nodeb1connected.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED - nodeb1connected.ConnectionAttempts = 0 - //nodeb1connected.E2ApplicationProtocol = entities.E2ApplicationProtocol_X2_SETUP_REQUEST - writerMock.On("UpdateNodebInfo", &nodeb1connected).Return(nil) - nodeb5connected := *nodeb5 - nodeb5connected.AssociatedE2TInstanceAddress = E2TAddress2 - nodeb5connected.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED - nodeb5connected.ConnectionAttempts = 0 - //nodeb5connected.E2ApplicationProtocol = entities.E2ApplicationProtocol_X2_SETUP_REQUEST - writerMock.On("UpdateNodebInfo", &nodeb5connected).Return(nil) - - payload := e2pdus.PackedX2setupRequest - xaction1 := []byte("test1") - msg1 := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), "test1", &payload, &xaction1) - rmrMessengerMock.On("SendMsg",mock.Anything, true).Return(msg1, common.NewInternalError(fmt.Errorf("for test"))) - xaction2 := []byte("test5") - msg2 := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), "test5", &payload, &xaction2) - rmrMessengerMock.On("SendMsg",mock.Anything, true).Return(msg2, common.NewInternalError(fmt.Errorf("for test"))) err := shutdownManager.Shutdown(e2tInstance1) - assert.Nil(t, err) + assert.NotNil(t, err) readerMock.AssertExpectations(t) writerMock.AssertExpectations(t) httpClientMock.AssertExpectations(t) - rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 2) } -func TestShutdownFailureDbErrorInAsociateAndSetupNodebs(t *testing.T) { - shutdownManager, readerMock, writerMock, httpClientMock, rmrMessengerMock := initE2TShutdownManagerTest(t) +func TestShutdownResourceGeneralErrorInGetNodeb(t *testing.T) { + shutdownManager, readerMock, writerMock, httpClientMock := initE2TShutdownManagerTest(t) e2tInstance1 := entities.NewE2TInstance(E2TAddress) e2tInstance1.State = entities.Active - e2tInstance1.AssociatedRanList = []string{"test1", "test2", "test5"} - e2tInstance2 := entities.NewE2TInstance(E2TAddress2) - e2tInstance2.State = entities.Active - e2tInstance2.AssociatedRanList = []string{"test3"} - e2tInstance3 := entities.NewE2TInstance(E2TAddress3) - e2tInstance3.State = entities.Active - e2tInstance3.AssociatedRanList = []string{"test4"} + 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) - nodeb2 := &entities.NodebInfo{RanName:"test2", AssociatedE2TInstanceAddress:E2TAddress, ConnectionStatus:entities.ConnectionStatus_SHUTTING_DOWN, E2ApplicationProtocol:entities.E2ApplicationProtocol_X2_SETUP_REQUEST} + 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} readerMock.On("GetNodeb", "test2").Return(nodeb2, nil) - 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} - readerMock.On("GetE2TAddresses").Return(e2tAddresses, nil) - readerMock.On("GetE2TInstances", e2tAddresses).Return([]*entities.E2TInstance{e2tInstance2,e2tInstance3}, nil) - e2tDataList := models.RoutingManagerE2TDataList{models.NewRoutingManagerE2TData(E2TAddress2, "test1", "test5")} - data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, nil, e2tDataList) + data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, []string{"test1", "test2"}, nil) marshaled, _ := json.Marshal(data) body := bytes.NewBuffer(marshaled) respBody := ioutil.NopCloser(bytes.NewBufferString("")) 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) - - readerMock.On("GetE2TInstance", E2TAddress2).Return(e2tInstance2, nil) - e2tInstance2updated := *e2tInstance2 - e2tInstance2updated.AssociatedRanList = []string{"test3", "test1", "test5"} - writerMock.On("SaveE2TInstance", &e2tInstance2updated).Return(nil) + readerMock.On("GetE2TAddresses").Return([]string{E2TAddress}, nil) + writerMock.On("SaveE2TAddresses", []string{}).Return(nil) - nodeb1reassigned := *nodeb1 - nodeb1reassigned.AssociatedE2TInstanceAddress = E2TAddress2 - writerMock.On("UpdateNodebInfo", &nodeb1reassigned).Return(common.NewInternalError(fmt.Errorf("for tests"))) + nodeb2new := *nodeb2 + nodeb2new.AssociatedE2TInstanceAddress = "" + nodeb2new.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED + writerMock.On("UpdateNodebInfo", &nodeb2new).Return(nil) err := shutdownManager.Shutdown(e2tInstance1) - assert.NotNil(t, err) + assert.Nil(t, err) readerMock.AssertExpectations(t) writerMock.AssertExpectations(t) httpClientMock.AssertExpectations(t) - rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 0) + } -func TestShutdownSuccess1OutOf3InstancesStateIsRoutingManagerFailure(t *testing.T) { - shutdownManager, readerMock, writerMock, httpClientMock, rmrMessengerMock := initE2TShutdownManagerTest(t) +func TestShutdownFailureInRemoveE2TInstance(t *testing.T) { + shutdownManager, readerMock, writerMock, httpClientMock := initE2TShutdownManagerTest(t) e2tInstance1 := entities.NewE2TInstance(E2TAddress) - e2tInstance1.State = entities.RoutingManagerFailure + e2tInstance1.State = entities.Active e2tInstance1.AssociatedRanList = []string{"test1", "test2", "test5"} e2tInstance2 := entities.NewE2TInstance(E2TAddress2) e2tInstance2.State = entities.Active @@ -579,60 +378,31 @@ func TestShutdownSuccess1OutOf3InstancesStateIsRoutingManagerFailure(t *testing. 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} - readerMock.On("GetE2TAddresses").Return(e2tAddresses, nil) - readerMock.On("GetE2TInstances", e2tAddresses).Return([]*entities.E2TInstance{e2tInstance2,e2tInstance3}, nil) - - e2tDataList := models.RoutingManagerE2TDataList{models.NewRoutingManagerE2TData(E2TAddress2, "test1", "test5")} - data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, nil, e2tDataList) + data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, e2tInstance1.AssociatedRanList, nil) marshaled, _ := json.Marshal(data) body := bytes.NewBuffer(marshaled) respBody := ioutil.NopCloser(bytes.NewBufferString("")) 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) - - readerMock.On("GetE2TInstance", E2TAddress2).Return(e2tInstance2, nil) - e2tInstance2updated := *e2tInstance2 - e2tInstance2updated.AssociatedRanList = []string{"test3", "test1", "test5"} - writerMock.On("SaveE2TInstance", &e2tInstance2updated).Return(nil) - - nodeb1new := *nodeb1 - nodeb1new.AssociatedE2TInstanceAddress = E2TAddress2 - nodeb1new.ConnectionStatus = entities.ConnectionStatus_CONNECTING - nodeb1new.ConnectionAttempts = 1 - writerMock.On("UpdateNodebInfo", &nodeb1new).Return(nil) - nodeb5new := *nodeb5 - nodeb5new.AssociatedE2TInstanceAddress = E2TAddress2 - nodeb5new.ConnectionStatus = entities.ConnectionStatus_CONNECTING - nodeb5new.ConnectionAttempts = 1 - writerMock.On("UpdateNodebInfo", &nodeb5new).Return(nil) + writerMock.On("RemoveE2TInstance", E2TAddress).Return(common.NewInternalError(fmt.Errorf("for tests"))) nodeb1connected := *nodeb1 - nodeb1connected.AssociatedE2TInstanceAddress = E2TAddress2 - nodeb1connected.ConnectionStatus = entities.ConnectionStatus_CONNECTED - //nodeb1connected.E2ApplicationProtocol = entities.E2ApplicationProtocol_X2_SETUP_REQUEST + nodeb1connected.AssociatedE2TInstanceAddress = "" + nodeb1connected.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED writerMock.On("UpdateNodebInfo", &nodeb1connected).Return(nil) + nodeb2connected := *nodeb2 + nodeb2connected.AssociatedE2TInstanceAddress = "" + nodeb2connected.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED + writerMock.On("UpdateNodebInfo", &nodeb2connected).Return(nil) nodeb5connected := *nodeb5 - nodeb5connected.AssociatedE2TInstanceAddress = E2TAddress2 - nodeb5connected.ConnectionStatus = entities.ConnectionStatus_CONNECTED - //nodeb5connected.E2ApplicationProtocol = entities.E2ApplicationProtocol_X2_SETUP_REQUEST + nodeb5connected.AssociatedE2TInstanceAddress = "" + nodeb5connected.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED writerMock.On("UpdateNodebInfo", &nodeb5connected).Return(nil) - payload := e2pdus.PackedX2setupRequest - xaction1 := []byte("test1") - msg1 := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), "test1", &payload, &xaction1) - rmrMessengerMock.On("SendMsg",mock.Anything, true).Return(msg1, nil) - xaction5 := []byte("test5") - msg5 := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), "test5", &payload, &xaction5) - rmrMessengerMock.On("SendMsg",mock.Anything, true).Return(msg5, nil) - err := shutdownManager.Shutdown(e2tInstance1) - assert.Nil(t, err) + assert.IsType(t, &e2managererrors.RnibDbError{}, err) readerMock.AssertExpectations(t) writerMock.AssertExpectations(t) httpClientMock.AssertExpectations(t) - rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 2) } \ No newline at end of file