[RICPLT-2789] Refactor HttpClient | Add DeleteE2TInstance method

[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 cdaed68..937330a 100644 (file)
--- a/E2Manager/managers/e2t_association_manager_test.go
+++ b/E2Manager/managers/e2t_association_manager_test.go
@@ -72,7 +72,6 @@ func TestAssociateRanSuccess(t *testing.T) {
        manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
        mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true)
        nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1}
-       readerMock.On("GetNodeb", RanName).Return(nb, nil)
        updatedNb := *nb
        updatedNb.ConnectionAttempts = 0
        updatedNb.AssociatedE2TInstanceAddress = E2TAddress
@@ -83,7 +82,7 @@ func TestAssociateRanSuccess(t *testing.T) {
        updatedE2tInstance.AssociatedRanList = append(updatedE2tInstance.AssociatedRanList, RanName)
        writerMock.On("SaveE2TInstance", &updatedE2tInstance).Return(nil)
 
-       err := manager.AssociateRan(E2TAddress, RanName)
+       err := manager.AssociateRan(E2TAddress, nb)
 
        assert.Nil(t, err)
        readerMock.AssertExpectations(t)
@@ -95,7 +94,8 @@ func TestAssociateRanRoutingManagerError(t *testing.T) {
        manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
        mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, false)
 
-       err := manager.AssociateRan(E2TAddress, RanName)
+       nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1}
+       err := manager.AssociateRan(E2TAddress, nb)
 
        assert.NotNil(t, err)
        assert.IsType(t, &e2managererrors.RoutingManagerError{}, err)
@@ -104,32 +104,16 @@ func TestAssociateRanRoutingManagerError(t *testing.T) {
        httpClientMock.AssertExpectations(t)
 }
 
-func TestAssociateRanGetNodebError(t *testing.T) {
-       manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
-       mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true)
-       var nb *entities.NodebInfo
-       readerMock.On("GetNodeb", RanName).Return(nb, e2managererrors.NewRnibDbError())
-
-       err := manager.AssociateRan(E2TAddress, RanName)
-
-       assert.NotNil(t, err)
-       assert.IsType(t, &e2managererrors.RnibDbError{}, 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}
-       readerMock.On("GetNodeb", RanName).Return(nb, nil)
        updatedNb := *nb
        updatedNb.ConnectionAttempts = 0
        updatedNb.AssociatedE2TInstanceAddress = E2TAddress
        writerMock.On("UpdateNodebInfo", &updatedNb).Return(e2managererrors.NewRnibDbError())
 
-       err := manager.AssociateRan(E2TAddress, RanName)
+       err := manager.AssociateRan(E2TAddress, nb)
 
        assert.NotNil(t, err)
        assert.IsType(t, &e2managererrors.RnibDbError{}, err)
@@ -142,7 +126,6 @@ func TestAssociateRanGetE2tInstanceError(t *testing.T) {
        manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
        mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true)
        nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1}
-       readerMock.On("GetNodeb", RanName).Return(nb, nil)
        updatedNb := *nb
        updatedNb.ConnectionAttempts = 0
        updatedNb.AssociatedE2TInstanceAddress = E2TAddress
@@ -150,7 +133,7 @@ func TestAssociateRanGetE2tInstanceError(t *testing.T) {
        var e2tInstance *entities.E2TInstance
        readerMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance, errors.New("test"))
 
-       err := manager.AssociateRan(E2TAddress, RanName)
+       err := manager.AssociateRan(E2TAddress, nb)
 
        assert.NotNil(t, err)
        assert.IsType(t, &e2managererrors.RnibDbError{}, err)
@@ -163,7 +146,6 @@ func TestAssociateRanSaveE2tInstanceError(t *testing.T) {
        manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
        mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true)
        nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1}
-       readerMock.On("GetNodeb", RanName).Return(nb, nil)
        updatedNb := *nb
        updatedNb.ConnectionAttempts = 0
        updatedNb.AssociatedE2TInstanceAddress = E2TAddress
@@ -174,7 +156,7 @@ func TestAssociateRanSaveE2tInstanceError(t *testing.T) {
        updatedE2tInstance.AssociatedRanList = append(updatedE2tInstance.AssociatedRanList, RanName)
        writerMock.On("SaveE2TInstance", &updatedE2tInstance).Return(errors.New("test"))
 
-       err := manager.AssociateRan(E2TAddress, RanName)
+       err := manager.AssociateRan(E2TAddress, nb)
 
        assert.NotNil(t, err)
        assert.IsType(t, &e2managererrors.RnibDbError{}, err)
@@ -300,4 +282,38 @@ func TestDissociateRanRoutingManagerError(t *testing.T) {
        readerMock.AssertExpectations(t)
        writerMock.AssertExpectations(t)
        httpClientMock.AssertExpectations(t)
-}
\ No newline at end of file
+}
+
+//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