X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fe2t_instances_manager_test.go;h=41fea42d8556bb640957daeadd8ee44922313d36;hb=b23d04b0a9b31a525ecb3a55dacb6c22008339e1;hp=5c83954eff334519c636872735748f9c1af23c9d;hpb=e611aee31f24b6944597fa3725a23b762716f305;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/managers/e2t_instances_manager_test.go b/E2Manager/managers/e2t_instances_manager_test.go
index 5c83954..41fea42 100644
--- a/E2Manager/managers/e2t_instances_manager_test.go
+++ b/E2Manager/managers/e2t_instances_manager_test.go
@@ -21,6 +21,7 @@ package managers
 
 import (
 	"e2mgr/configuration"
+	"e2mgr/e2managererrors"
 	"e2mgr/logger"
 	"e2mgr/mocks"
 	"e2mgr/services"
@@ -139,7 +140,7 @@ func TestAddRanToInstanceGetInstanceFailure(t *testing.T) {
 	var e2tInstance1 *entities.E2TInstance
 	rnibReaderMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance1, common.NewInternalError(fmt.Errorf("for test")))
 
-	err := e2tInstancesManager.AddRanToInstance("test1", E2TAddress)
+	err := e2tInstancesManager.AddRansToInstance(E2TAddress, []string{"test1"})
 	assert.NotNil(t, err)
 	rnibWriterMock.AssertNotCalled(t, "SaveE2TInstance")
 }
@@ -150,7 +151,7 @@ func TestAddRanToInstanceSaveInstanceFailure(t *testing.T) {
 	rnibReaderMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance1, nil)
 	rnibWriterMock.On("SaveE2TInstance", mock.Anything).Return(common.NewInternalError(fmt.Errorf("for test")))
 
-	err := e2tInstancesManager.AddRanToInstance("test1", E2TAddress)
+	err := e2tInstancesManager.AddRansToInstance(E2TAddress, []string{"test1"})
 	assert.NotNil(t, err)
 	rnibReaderMock.AssertExpectations(t)
 	rnibWriterMock.AssertExpectations(t)
@@ -166,7 +167,7 @@ func TestAddRanToInstanceSuccess(t *testing.T) {
 
 	rnibWriterMock.On("SaveE2TInstance", &updateE2TInstance).Return(nil)
 
-	err := e2tInstancesManager.AddRanToInstance("test1", E2TAddress)
+	err := e2tInstancesManager.AddRansToInstance(E2TAddress, []string{"test1"})
 	assert.Nil(t, err)
 	rnibReaderMock.AssertExpectations(t)
 	rnibWriterMock.AssertExpectations(t)
@@ -296,37 +297,38 @@ func TestSelectE2TInstancesSuccess(t *testing.T) {
 }
 
 func TestActivateE2TInstanceSuccess(t *testing.T) {
-	_, rnibWriterMock, e2tInstancesManager := initE2TInstancesManagerTest(t)
+	rnibReaderMock, rnibWriterMock, e2tInstancesManager := initE2TInstancesManagerTest(t)
 
 	e2tInstance1 := entities.NewE2TInstance(E2TAddress)
 	e2tInstance1.State = entities.RoutingManagerFailure
 	e2tInstance1.AssociatedRanList = []string{"test1","test2","test3"}
+	rnibReaderMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance1, nil)
+	rnibWriterMock.On("SaveE2TInstance", mock.MatchedBy(func(e2tInstance *entities.E2TInstance) bool { return e2tInstance.State == entities.Active })).Return(nil)
 
-	rnibWriterMock.On("SaveE2TInstance", mock.Anything).Return(nil)
-
-	err := e2tInstancesManager.ActivateE2TInstance(e2tInstance1)
+	err := e2tInstancesManager.SetE2tInstanceState(E2TAddress, entities.RoutingManagerFailure, entities.Active)
 	assert.Nil(t, err)
 	assert.Equal(t, entities.Active, e2tInstance1.State)
 	rnibWriterMock.AssertExpectations(t)
 }
 
 func TestActivateE2TInstance_RnibError(t *testing.T) {
-	_, rnibWriterMock, e2tInstancesManager := initE2TInstancesManagerTest(t)
-
-	e2tInstance1 := entities.NewE2TInstance(E2TAddress)
-	e2tInstance1.State = entities.RoutingManagerFailure
-	e2tInstance1.AssociatedRanList = []string{"test1","test2","test3"}
+	rnibReaderMock, rnibWriterMock, e2tInstancesManager := initE2TInstancesManagerTest(t)
 
-	rnibWriterMock.On("SaveE2TInstance", mock.Anything).Return(common.NewInternalError(errors.New("Error")))
+	var e2tInstance1 *entities.E2TInstance
+	rnibReaderMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance1, common.NewInternalError(errors.New("for test")))
 
-	err := e2tInstancesManager.ActivateE2TInstance(e2tInstance1)
+	err := e2tInstancesManager.SetE2tInstanceState(E2TAddress, entities.RoutingManagerFailure, entities.Active)
 	assert.NotNil(t, err)
+	rnibWriterMock.AssertExpectations(t)
 }
 
 func TestActivateE2TInstance_NoInstance(t *testing.T) {
-	_, rnibWriterMock, e2tInstancesManager := initE2TInstancesManagerTest(t)
+	rnibReaderMock, rnibWriterMock, e2tInstancesManager := initE2TInstancesManagerTest(t)
 
-	err := e2tInstancesManager.ActivateE2TInstance(nil)
+	var e2tInstance1 *entities.E2TInstance
+	rnibReaderMock.On("GetE2TInstance", E2TAddress).Return(e2tInstance1, e2managererrors.NewResourceNotFoundError())
+
+	err := e2tInstancesManager.SetE2tInstanceState(E2TAddress, entities.RoutingManagerFailure, entities.Active)
 
 	assert.NotNil(t, err)
 	rnibWriterMock.AssertNotCalled(t, "SaveE2TInstance")
@@ -399,13 +401,6 @@ func TestResetKeepAliveTimestampRoutingManagerFailure(t *testing.T) {
 	rnibWriterMock.AssertNotCalled(t, "SaveE2TInstance")
 }
 
-func TestRemoveE2TInstance(t *testing.T) {
-	_, _, e2tInstancesManager := initE2TInstancesManagerTest(t)
-	e2tInstance1 := entities.NewE2TInstance(E2TAddress)
-	err := e2tInstancesManager.RemoveE2TInstance(e2tInstance1)
-	assert.Nil(t, err)
-}
-
 func TestResetKeepAliveTimestampsForAllE2TInstancesGetE2TInstancesFailure(t *testing.T) {
 	rnibReaderMock, rnibWriterMock, e2tInstancesManager := initE2TInstancesManagerTest(t)
 	rnibReaderMock.On("GetE2TAddresses").Return([]string{}, common.NewInternalError(errors.New("Error")))
@@ -460,3 +455,56 @@ func TestResetKeepAliveTimestampsForAllE2TInstancesSaveE2TInstanceFailure(t *tes
 	e2tInstancesManager.ResetKeepAliveTimestampsForAllE2TInstances()
 	rnibWriterMock.AssertNumberOfCalls(t, "SaveE2TInstance",1)
 }
+
+func TestRemoveE2TInstanceSuccess(t *testing.T) {
+	rnibReaderMock, rnibWriterMock, e2tInstancesManager := initE2TInstancesManagerTest(t)
+	rnibWriterMock.On("RemoveE2TInstance", E2TAddress).Return(nil)
+	e2tAddresses := []string{E2TAddress, E2TAddress2}
+	rnibReaderMock.On("GetE2TAddresses").Return(e2tAddresses, nil)
+	e2tAddressesNew := []string{E2TAddress2}
+	rnibWriterMock.On("SaveE2TAddresses", e2tAddressesNew).Return(nil)
+
+	err := e2tInstancesManager.RemoveE2TInstance(E2TAddress)
+	assert.Nil(t, err)
+	rnibReaderMock.AssertExpectations(t)
+	rnibWriterMock.AssertExpectations(t)
+}
+
+func TestRemoveE2TInstanceRnibErrorInRemoveInstance(t *testing.T) {
+	rnibReaderMock, rnibWriterMock, e2tInstancesManager := initE2TInstancesManagerTest(t)
+	rnibWriterMock.On("RemoveE2TInstance", E2TAddress).Return(e2managererrors.NewRnibDbError())
+
+	err := e2tInstancesManager.RemoveE2TInstance(E2TAddress)
+	assert.NotNil(t, err)
+	assert.IsType(t, e2managererrors.NewRnibDbError(), err)
+	rnibReaderMock.AssertExpectations(t)
+	rnibWriterMock.AssertExpectations(t)
+}
+
+func TestRemoveE2TInstanceRnibErrorInGetAddresses(t *testing.T) {
+	rnibReaderMock, rnibWriterMock, e2tInstancesManager := initE2TInstancesManagerTest(t)
+	rnibWriterMock.On("RemoveE2TInstance", E2TAddress).Return(nil)
+	var e2tAddresses []string
+	rnibReaderMock.On("GetE2TAddresses").Return(e2tAddresses, e2managererrors.NewRnibDbError())
+
+	err := e2tInstancesManager.RemoveE2TInstance(E2TAddress)
+	assert.NotNil(t, err)
+	assert.IsType(t, e2managererrors.NewRnibDbError(), err)
+	rnibReaderMock.AssertExpectations(t)
+	rnibWriterMock.AssertExpectations(t)
+}
+
+func TestRemoveE2TInstanceRnibErrorInSaveAddresses(t *testing.T) {
+	rnibReaderMock, rnibWriterMock, e2tInstancesManager := initE2TInstancesManagerTest(t)
+	rnibWriterMock.On("RemoveE2TInstance", E2TAddress).Return(nil)
+	e2tAddresses := []string{E2TAddress, E2TAddress2}
+	rnibReaderMock.On("GetE2TAddresses").Return(e2tAddresses, nil)
+	e2tAddressesNew := []string{E2TAddress2}
+	rnibWriterMock.On("SaveE2TAddresses", e2tAddressesNew).Return(e2managererrors.NewRnibDbError())
+
+	err := e2tInstancesManager.RemoveE2TInstance(E2TAddress)
+	assert.NotNil(t, err)
+	assert.IsType(t, e2managererrors.NewRnibDbError(), err)
+	rnibReaderMock.AssertExpectations(t)
+	rnibWriterMock.AssertExpectations(t)
+}