func initE2TAssociationManagerTest(t *testing.T) (*E2TAssociationManager, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.HttpClientMock) {
log := initLog(t)
- config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3}
+ config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3, StateChangeMessageChannel: "RAN_CONNECTION_STATUS_CHANGE"}
readerMock := &mocks.RnibReaderMock{}
writerMock := &mocks.RnibWriterMock{}
e2tInstancesManager := NewE2TInstancesManager(rnibDataService, log)
httpClientMock := &mocks.HttpClientMock{}
rmClient := clients.NewRoutingManagerClient(log, config, httpClientMock)
- manager := NewE2TAssociationManager(log, rnibDataService, e2tInstancesManager, rmClient)
-
- return manager, readerMock, writerMock, httpClientMock
+ ranListManager := NewRanListManager(log)
+ ranAlarmService := services.NewRanAlarmService(log, config)
+ ranConnectStatusChangeManager := NewRanConnectStatusChangeManager(log, rnibDataService,ranListManager, ranAlarmService)
+ e2tAssociationManager := NewE2TAssociationManager(log, rnibDataService, e2tInstancesManager, rmClient, ranConnectStatusChangeManager)
+ return e2tAssociationManager, readerMock, writerMock, httpClientMock
}
func mockHttpClient(httpClientMock *mocks.HttpClientMock, apiSuffix string, isSuccessful bool) {
func TestAssociateRanSuccess(t *testing.T) {
manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true)
- nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1}
+ nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: ""}
updatedNb := *nb
- updatedNb.ConnectionAttempts = 0
- updatedNb.AssociatedE2TInstanceAddress = E2TAddress
- writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil)
+ updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED
+ writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNb, "RAN_CONNECTION_STATUS_CHANGE", RanName+"_CONNECTED").Return(nil)
+ updatedNb2 := *nb
+ updatedNb2.ConnectionStatus = entities.ConnectionStatus_CONNECTED
+ updatedNb2.AssociatedE2TInstanceAddress = E2TAddress
+ writerMock.On("UpdateNodebInfo", &updatedNb2).Return(nil)
e2tInstance := &entities.E2TInstance{Address: E2TAddress}
readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance, nil)
updatedE2tInstance := *e2tInstance
}
func TestAssociateRanRoutingManagerError(t *testing.T) {
- manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
+ manager, _, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, false)
+ nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: ""}
+ writerMock.On("UpdateNodebInfo", nb).Return(nil)
- nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1}
err := manager.AssociateRan(E2TAddress, nb)
assert.NotNil(t, err)
assert.IsType(t, &e2managererrors.RoutingManagerError{}, err)
- readerMock.AssertExpectations(t)
writerMock.AssertExpectations(t)
httpClientMock.AssertExpectations(t)
}
func TestAssociateRanUpdateNodebError(t *testing.T) {
manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true)
- nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1}
+ nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: ""}
+
updatedNb := *nb
- updatedNb.ConnectionAttempts = 0
- updatedNb.AssociatedE2TInstanceAddress = E2TAddress
- writerMock.On("UpdateNodebInfo", &updatedNb).Return(e2managererrors.NewRnibDbError())
+ updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED
+ writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNb, "RAN_CONNECTION_STATUS_CHANGE", RanName+"_CONNECTED").Return(nil)
+ updatedNb2 := *nb
+ updatedNb2.ConnectionStatus = entities.ConnectionStatus_CONNECTED
+ updatedNb2.AssociatedE2TInstanceAddress = E2TAddress
+ writerMock.On("UpdateNodebInfo", &updatedNb2).Return(e2managererrors.NewRnibDbError())
err := manager.AssociateRan(E2TAddress, nb)
func TestAssociateRanGetE2tInstanceError(t *testing.T) {
manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true)
- nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1}
+ nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: ""}
+
updatedNb := *nb
- updatedNb.ConnectionAttempts = 0
- updatedNb.AssociatedE2TInstanceAddress = E2TAddress
- writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil)
+ updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED
+ writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNb, "RAN_CONNECTION_STATUS_CHANGE", RanName+"_CONNECTED").Return(nil)
+
+ updatedNb2 := *nb
+ updatedNb2.AssociatedE2TInstanceAddress = E2TAddress
+ updatedNb2.ConnectionStatus = entities.ConnectionStatus_CONNECTED
+ writerMock.On("UpdateNodebInfo", &updatedNb2).Return(nil)
var e2tInstance *entities.E2TInstance
readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance, errors.New("test"))
func TestAssociateRanSaveE2tInstanceError(t *testing.T) {
manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true)
- nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1}
+ nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: ""}
+
updatedNb := *nb
- updatedNb.ConnectionAttempts = 0
- updatedNb.AssociatedE2TInstanceAddress = E2TAddress
- writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil)
+ updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED
+ writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNb, "RAN_CONNECTION_STATUS_CHANGE", RanName+"_CONNECTED").Return(nil)
+
+ updatedNb2 := *nb
+ updatedNb2.AssociatedE2TInstanceAddress = E2TAddress
+ updatedNb2.ConnectionStatus = entities.ConnectionStatus_CONNECTED
+ writerMock.On("UpdateNodebInfo", &updatedNb2).Return(nil)
e2tInstance := &entities.E2TInstance{Address: E2TAddress}
readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance, nil)
updatedE2tInstance := *e2tInstance
func TestDissociateRanSuccess(t *testing.T) {
manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
mockHttpClient(httpClientMock, clients.DissociateRanE2TInstanceApiSuffix, true)
- nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress, ConnectionAttempts: 1}
+ nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress}
readerMock.On("GetNodeb", RanName).Return(nb, nil)
updatedNb := *nb
updatedNb.AssociatedE2TInstanceAddress = ""
func TestDissociateRanUpdateNodebError(t *testing.T) {
manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
- nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress, ConnectionAttempts: 1}
+ nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress}
readerMock.On("GetNodeb", RanName).Return(nb, nil)
updatedNb := *nb
updatedNb.AssociatedE2TInstanceAddress = ""
func TestDissociateRanGetE2tInstanceError(t *testing.T) {
manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
- nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress, ConnectionAttempts: 1}
+ nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress}
readerMock.On("GetNodeb", RanName).Return(nb, nil)
updatedNb := *nb
updatedNb.AssociatedE2TInstanceAddress = ""
func TestDissociateRanSaveE2tInstanceError(t *testing.T) {
manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
- nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress, ConnectionAttempts: 1}
+ nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress}
readerMock.On("GetNodeb", RanName).Return(nb, nil)
updatedNb := *nb
updatedNb.AssociatedE2TInstanceAddress = ""
func TestDissociateRanRoutingManagerError(t *testing.T) {
manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
mockHttpClient(httpClientMock, clients.DissociateRanE2TInstanceApiSuffix, false)
- nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress, ConnectionAttempts: 1}
+ nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress}
readerMock.On("GetNodeb", RanName).Return(nb, nil)
updatedNb := *nb
updatedNb.AssociatedE2TInstanceAddress = ""
httpClientMock.AssertExpectations(t)
}
-//func TestRemoveE2tInstanceSuccess(t *testing.T) {
-// manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
-// //mockHttpClient(httpClientMock, clients.DeleteE2TInstanceApiSuffix, true)
-//
-// writerMock.On("RemoveE2TInstance", E2TAddress).Return(nil)
-// e2tAddresses := []string{E2TAddress, E2TAddress2}
-// readerMock.On("GetE2TAddresses").Return(e2tAddresses, nil)
-// e2tAddressesNew := []string{E2TAddress2}
-// writerMock.On("SaveE2TAddresses", e2tAddressesNew).Return(nil)
-//
-// err := manager.RemoveE2tInstance(E2TAddress, []string{""}, make(map[string][]string))
-//
-// assert.Nil(t, err)
-// readerMock.AssertExpectations(t)
-// writerMock.AssertExpectations(t)
-// httpClientMock.AssertExpectations(t)
-//}
-
-//func TestRemoveE2tInstanceFailureInE2TInstanceManager(t *testing.T) {
-// manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
-// //mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true)
-//
-// writerMock.On("RemoveE2TInstance", E2TAddress).Return(nil)
-// var e2tAddresses []string
-// readerMock.On("GetE2TAddresses").Return(e2tAddresses, e2managererrors.NewRnibDbError())
-//
-// err := manager.RemoveE2tInstance(E2TAddress, []string{""}, make(map[string][]string))
-//
-// assert.NotNil(t, err)
-// readerMock.AssertExpectations(t)
-// writerMock.AssertExpectations(t)
-// httpClientMock.AssertExpectations(t)
-//}
\ No newline at end of file
+func TestRemoveE2tInstanceSuccessWithOrphans(t *testing.T) {
+ manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
+
+ ranNamesToBeDissociated := []string{RanName, "test1"}
+ data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, ranNamesToBeDissociated, nil)
+ mockHttpClientDelete(httpClientMock, data, true)
+
+ writerMock.On("RemoveE2TInstance", E2TAddress).Return(nil)
+ e2tAddresses := []string{E2TAddress}
+ readerMock.On("GetE2TAddresses").Return(e2tAddresses, nil)
+ e2tAddressesNew := []string{}
+ writerMock.On("SaveE2TAddresses", e2tAddressesNew).Return(nil)
+
+ e2tInstance1 := &entities.E2TInstance{Address: E2TAddress, AssociatedRanList:ranNamesToBeDissociated}
+ err := manager.RemoveE2tInstance(e2tInstance1)
+
+ assert.Nil(t, err)
+ readerMock.AssertExpectations(t)
+ writerMock.AssertExpectations(t)
+ httpClientMock.AssertExpectations(t)
+}
+
+func TestRemoveE2tInstanceFailureRoutingManager(t *testing.T) {
+ manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
+
+ data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, []string{"test1"}, nil)
+ mockHttpClientDelete(httpClientMock, data, false)
+
+ writerMock.On("RemoveE2TInstance", E2TAddress).Return(nil)
+ e2tAddresses := []string{E2TAddress}
+ readerMock.On("GetE2TAddresses").Return(e2tAddresses, nil)
+ e2tAddressesNew := []string{}
+ writerMock.On("SaveE2TAddresses", e2tAddressesNew).Return(nil)
+
+ e2tInstance1 := &entities.E2TInstance{Address: E2TAddress, AssociatedRanList:[]string{"test1"}}
+ //readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance1, e2managererrors.NewRnibDbError())
+ err := manager.RemoveE2tInstance(e2tInstance1)
+
+ assert.Nil(t, err)
+ readerMock.AssertExpectations(t)
+ writerMock.AssertExpectations(t)
+ httpClientMock.AssertExpectations(t)
+}
+
+func TestRemoveE2tInstanceFailureInE2TInstanceManager(t *testing.T) {
+
+ data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, []string{"test1"}, nil)
+ manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
+ mockHttpClientDelete(httpClientMock, data, true)
+
+ writerMock.On("RemoveE2TInstance", E2TAddress).Return(nil)
+ var e2tAddresses []string
+ readerMock.On("GetE2TAddresses").Return(e2tAddresses, e2managererrors.NewRnibDbError())
+
+ e2tInstance1 := &entities.E2TInstance{Address: E2TAddress, AssociatedRanList:[]string{"test1"}}
+ err := manager.RemoveE2tInstance(e2tInstance1)
+
+ assert.NotNil(t, err)
+ readerMock.AssertExpectations(t)
+ writerMock.AssertExpectations(t)
+ httpClientMock.AssertExpectations(t)
+}
+
+func TestRemoveE2tInstanceFailureInE2tInstanceAddRansToInstance(t *testing.T) {
+ manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
+
+ data := models.NewRoutingManagerDeleteRequestModel(E2TAddress, nil, nil)
+ mockHttpClientDelete(httpClientMock, data, true)
+
+ writerMock.On("RemoveE2TInstance", E2TAddress).Return(nil)
+ e2tAddresses := []string{E2TAddress, E2TAddress2, E2TAddress3}
+ readerMock.On("GetE2TAddresses").Return(e2tAddresses, nil)
+ e2tAddressesNew := []string{E2TAddress2, E2TAddress3}
+ writerMock.On("SaveE2TAddresses", e2tAddressesNew).Return(nil)
+
+ e2tInstance1 := &entities.E2TInstance{Address: E2TAddress}
+ err := manager.RemoveE2tInstance(e2tInstance1)
+
+ assert.Nil(t, err)
+ readerMock.AssertExpectations(t)
+ writerMock.AssertExpectations(t)
+ httpClientMock.AssertExpectations(t)
+}
+
+func mockHttpClientDelete(httpClientMock *mocks.HttpClientMock, data *models.RoutingManagerDeleteRequestModel, isSuccessful bool) {
+
+ marshaled, _ := json.Marshal(data)
+ body := bytes.NewBuffer(marshaled)
+ respBody := ioutil.NopCloser(bytes.NewBufferString(""))
+ var respStatusCode int
+ if isSuccessful {
+ respStatusCode = http.StatusCreated
+ } else {
+ respStatusCode = http.StatusBadRequest
+ }
+ httpClientMock.On("Delete", "e2t", "application/json", body).Return(&http.Response{StatusCode: respStatusCode, Body: respBody}, nil)
+}