X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fservices%2Frnib_data_service_test.go;h=5460608b701bf291d09958c98a5cf98d2d48d077;hb=a590417b434ba8e556f1a9b26ff7b6edbb2097ce;hp=f6529e38aaf4dd0281ebdce902084283963dff45;hpb=197657e0e814c871b903ef779ad654b13347e430;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/services/rnib_data_service_test.go b/E2Manager/services/rnib_data_service_test.go
index f6529e3..5460608 100644
--- a/E2Manager/services/rnib_data_service_test.go
+++ b/E2Manager/services/rnib_data_service_test.go
@@ -17,7 +17,6 @@
 //  This source code is part of the near-RT RIC (RAN Intelligent Controller)
 //  platform project (RICP).
 
-
 package services
 
 import (
@@ -33,8 +32,6 @@ import (
 	"testing"
 )
 
-const CHANNEL_NAME = "channel"
-
 func setupRnibDataServiceTest(t *testing.T) (*rNibDataService, *mocks.RnibReaderMock, *mocks.RnibWriterMock) {
 	return setupRnibDataServiceTestWithMaxAttempts(t, 3)
 }
@@ -45,14 +42,12 @@ func setupRnibDataServiceTestWithMaxAttempts(t *testing.T, maxAttempts int) (*rN
 		t.Errorf("#... - failed to initialize logger, error: %s", err)
 	}
 
-	config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: maxAttempts, StateChangeMessageChannel: CHANNEL_NAME}
+	config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: maxAttempts, RnibWriter: configuration.RnibWriterConfig{RanManipulationMessageChannel: "RAN_MANIPULATION", StateChangeMessageChannel: "RAN_CONNECTION_STATUS_CHANGE"}}
 
 	readerMock := &mocks.RnibReaderMock{}
 
-
 	writerMock := &mocks.RnibWriterMock{}
 
-
 	rnibDataService := NewRnibDataService(logger, config, readerMock, writerMock)
 	assert.NotNil(t, rnibDataService)
 
@@ -63,10 +58,9 @@ func TestSuccessfulSaveNodeb(t *testing.T) {
 	rnibDataService, _, writerMock := setupRnibDataServiceTest(t)
 
 	nodebInfo := &entities.NodebInfo{}
-	nbIdentity := &entities.NbIdentity{}
-	writerMock.On("SaveNodeb", nbIdentity, nodebInfo).Return(nil)
+	writerMock.On("SaveNodeb", nodebInfo).Return(nil)
 
-	rnibDataService.SaveNodeb(nbIdentity, nodebInfo)
+	rnibDataService.SaveNodeb(nodebInfo)
 	writerMock.AssertNumberOfCalls(t, "SaveNodeb", 1)
 }
 
@@ -74,11 +68,10 @@ func TestConnFailureSaveNodeb(t *testing.T) {
 	rnibDataService, _, writerMock := setupRnibDataServiceTest(t)
 
 	nodebInfo := &entities.NodebInfo{}
-	nbIdentity := &entities.NbIdentity{}
 	mockErr := &common.InternalError{Err: &net.OpError{Err: fmt.Errorf("connection error")}}
-	writerMock.On("SaveNodeb", nbIdentity, nodebInfo).Return(mockErr)
+	writerMock.On("SaveNodeb", nodebInfo).Return(mockErr)
 
-	rnibDataService.SaveNodeb(nbIdentity, nodebInfo)
+	rnibDataService.SaveNodeb(nodebInfo)
 	writerMock.AssertNumberOfCalls(t, "SaveNodeb", 3)
 }
 
@@ -86,11 +79,10 @@ func TestNonConnFailureSaveNodeb(t *testing.T) {
 	rnibDataService, _, writerMock := setupRnibDataServiceTest(t)
 
 	nodebInfo := &entities.NodebInfo{}
-	nbIdentity := &entities.NbIdentity{}
 	mockErr := &common.InternalError{Err: fmt.Errorf("non connection failure")}
-	writerMock.On("SaveNodeb", nbIdentity, nodebInfo).Return(mockErr)
+	writerMock.On("SaveNodeb", nodebInfo).Return(mockErr)
 
-	rnibDataService.SaveNodeb(nbIdentity, nodebInfo)
+	rnibDataService.SaveNodeb(nodebInfo)
 	writerMock.AssertNumberOfCalls(t, "SaveNodeb", 1)
 }
 
@@ -161,7 +153,7 @@ func TestConnFailureGetNodeb(t *testing.T) {
 
 	res, err := rnibDataService.GetNodeb(invName)
 	readerMock.AssertNumberOfCalls(t, "GetNodeb", 3)
-	assert.True(t, strings.Contains(err.Error(), "connection error", ))
+	assert.True(t, strings.Contains(err.Error(), "connection error"))
 	assert.Equal(t, nodeb, res)
 }
 
@@ -186,7 +178,7 @@ func TestConnFailureGetNodebIdList(t *testing.T) {
 
 	res, err := rnibDataService.GetListNodebIds()
 	readerMock.AssertNumberOfCalls(t, "GetListNodebIds", 3)
-	assert.True(t, strings.Contains(err.Error(), "connection error", ))
+	assert.True(t, strings.Contains(err.Error(), "connection error"))
 	assert.Equal(t, nodeIds, res)
 }
 
@@ -202,12 +194,12 @@ func TestConnFailureTwiceGetNodebIdList(t *testing.T) {
 
 	res, err := rnibDataService.GetListNodebIds()
 	readerMock.AssertNumberOfCalls(t, "GetListNodebIds", 3)
-	assert.True(t, strings.Contains(err.Error(), "connection error", ))
+	assert.True(t, strings.Contains(err.Error(), "connection error"))
 	assert.Equal(t, nodeIds, res)
 
 	res2, err := rnibDataService.GetNodeb(invName)
 	readerMock.AssertNumberOfCalls(t, "GetNodeb", 3)
-	assert.True(t, strings.Contains(err.Error(), "connection error", ))
+	assert.True(t, strings.Contains(err.Error(), "connection error"))
 	assert.Equal(t, nodeb, res2)
 }
 
@@ -220,7 +212,7 @@ func TestConnFailureWithAnotherConfig(t *testing.T) {
 
 	res, err := rnibDataService.GetListNodebIds()
 	readerMock.AssertNumberOfCalls(t, "GetListNodebIds", 5)
-	assert.True(t, strings.Contains(err.Error(), "connection error", ))
+	assert.True(t, strings.Contains(err.Error(), "connection error"))
 	assert.Equal(t, nodeIds, res)
 }
 
@@ -264,7 +256,7 @@ func TestSuccessfulUpdateNodebInfoOnConnectionStatusInversion(t *testing.T) {
 	event := "event"
 
 	nodebInfo := &entities.NodebInfo{}
-	writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", nodebInfo, CHANNEL_NAME, event).Return(nil)
+	writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", nodebInfo, event).Return(nil)
 
 	rnibDataService.UpdateNodebInfoOnConnectionStatusInversion(nodebInfo, event)
 	writerMock.AssertNumberOfCalls(t, "UpdateNodebInfoOnConnectionStatusInversion", 1)
@@ -276,27 +268,12 @@ func TestConnFailureUpdateNodebInfoOnConnectionStatusInversion(t *testing.T) {
 
 	nodebInfo := &entities.NodebInfo{}
 	mockErr := &common.InternalError{Err: &net.OpError{Err: fmt.Errorf("connection error")}}
-	writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", nodebInfo, CHANNEL_NAME, event).Return(mockErr)
+	writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", nodebInfo, event).Return(mockErr)
 
 	rnibDataService.UpdateNodebInfoOnConnectionStatusInversion(nodebInfo, event)
 	writerMock.AssertNumberOfCalls(t, "UpdateNodebInfoOnConnectionStatusInversion", 3)
 }
 
-//func TestConnFailureThenSuccessGetNodebIdList(t *testing.T) {
-//	rnibDataService, readerMock, _ := setupRnibDataServiceTest(t)
-//
-//	var nilNodeIds []*entities.NbIdentity = nil
-//	nodeIds := []*entities.NbIdentity{}
-//	mockErr := &common.InternalError{Err: &net.OpError{Err:fmt.Errorf("connection error")}}
-//	//readerMock.On("GetListNodebIds").Return(nilNodeIds, mockErr)
-//	//readerMock.On("GetListNodebIds").Return(nodeIds, nil)
-//
-//	res, err := rnibDataService.GetListNodebIds()
-//	readerMock.AssertNumberOfCalls(t, "GetListNodebIds", 2)
-//	assert.True(t, strings.Contains(err.Error(),"connection failure", ))
-//	assert.Equal(t, nodeIds, res)
-//}
-
 func TestGetE2TInstanceConnFailure(t *testing.T) {
 	rnibDataService, readerMock, _ := setupRnibDataServiceTest(t)
 
@@ -337,3 +314,38 @@ func TestGetE2TInstanceOkOtherError(t *testing.T) {
 	assert.Nil(t, res)
 	assert.NotNil(t, err)
 }
+
+func TestRemoveEnbConnFailure(t *testing.T) {
+	rnibDataService, _, writerMock := setupRnibDataServiceTest(t)
+
+	mockErr := &common.InternalError{Err: &net.OpError{Err: fmt.Errorf("connection error")}}
+	nodebInfo := &entities.NodebInfo{}
+	writerMock.On("RemoveEnb", nodebInfo).Return(mockErr)
+
+	err := rnibDataService.RemoveEnb(nodebInfo)
+	writerMock.AssertNumberOfCalls(t, "RemoveEnb", 3)
+	assert.NotNil(t, err)
+}
+
+func TestRemoveEnbOkNoError(t *testing.T) {
+	rnibDataService, _, writerMock := setupRnibDataServiceTest(t)
+
+	nodebInfo := &entities.NodebInfo{}
+	writerMock.On("RemoveEnb", nodebInfo).Return(nil)
+
+	err := rnibDataService.RemoveEnb(nodebInfo)
+	writerMock.AssertNumberOfCalls(t, "RemoveEnb", 1)
+	assert.Nil(t, err)
+}
+
+func TestRemoveEnbOtherError(t *testing.T) {
+	rnibDataService, _, writerMock := setupRnibDataServiceTest(t)
+
+	mockErr := &common.InternalError{Err: fmt.Errorf("non connection error")}
+	nodebInfo := &entities.NodebInfo{}
+	writerMock.On("RemoveEnb", nodebInfo).Return(mockErr)
+
+	err := rnibDataService.RemoveEnb(nodebInfo)
+	writerMock.AssertNumberOfCalls(t, "RemoveEnb", 1)
+	assert.NotNil(t, err)
+}