X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fran_reconnection_manager_test.go;h=a78dd9350e7ad5a8c857377b6af6ef0226d39d6d;hb=3a4f37e98ae155b8d910b0a61c6b88d8832cac90;hp=57d7f4f341e2fe6dcfd0c67c62dc11471acfe538;hpb=5660067626f34d1fac7753ea4eb5c5c99f93192e;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/managers/ran_reconnection_manager_test.go b/E2Manager/managers/ran_reconnection_manager_test.go
index 57d7f4f..a78dd93 100644
--- a/E2Manager/managers/ran_reconnection_manager_test.go
+++ b/E2Manager/managers/ran_reconnection_manager_test.go
@@ -101,13 +101,14 @@ func TestConnectingRanWithMaxAttemptsReconnectionDeassociateSucceeds(t *testing.
 	readerMock.On("GetNodeb", ranName).Return(origNodebInfo, rnibErr)
 	updatedNodebInfo := *origNodebInfo
 	updatedNodebInfo.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED
+	updatedNodebInfo.AssociatedE2TInstanceAddress = ""
 	writerMock.On("UpdateNodebInfo", &updatedNodebInfo).Return(rnibErr)
-	e2tInstancesManagerMock.On("DeassociateRan", ranName, e2tAddress).Return(nil)
+	e2tInstancesManagerMock.On("DissociateRan", ranName, e2tAddress).Return(nil)
 	err := ranReconnectionManager.ReconnectRan(ranName)
 	assert.Nil(t, err)
 	readerMock.AssertCalled(t, "GetNodeb", ranName)
 	writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 1)
-	e2tInstancesManagerMock.AssertCalled(t, "DeassociateRan", ranName, e2tAddress)
+	e2tInstancesManagerMock.AssertCalled(t, "DissociateRan", ranName, e2tAddress)
 }
 
 func TestConnectingRanWithMaxAttemptsReconnectionDeassociateFails(t *testing.T) {
@@ -119,13 +120,14 @@ func TestConnectingRanWithMaxAttemptsReconnectionDeassociateFails(t *testing.T)
 	readerMock.On("GetNodeb", ranName).Return(origNodebInfo, rnibErr)
 	updatedNodebInfo := *origNodebInfo
 	updatedNodebInfo.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED
+	updatedNodebInfo.AssociatedE2TInstanceAddress = ""
 	writerMock.On("UpdateNodebInfo", &updatedNodebInfo).Return(rnibErr)
-	e2tInstancesManagerMock.On("DeassociateRan", ranName, e2tAddress).Return(common.NewInternalError(errors.New("Error")))
+	e2tInstancesManagerMock.On("DissociateRan", ranName, e2tAddress).Return(common.NewInternalError(errors.New("Error")))
 	err := ranReconnectionManager.ReconnectRan(ranName)
 	assert.NotNil(t, err)
 	readerMock.AssertCalled(t, "GetNodeb", ranName)
 	writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 1)
-	e2tInstancesManagerMock.AssertCalled(t, "DeassociateRan", ranName, e2tAddress)
+	e2tInstancesManagerMock.AssertCalled(t, "DissociateRan", ranName, e2tAddress)
 }
 
 func TestUnconnectableRanUpdateNodebInfoFailure(t *testing.T) {
@@ -177,17 +179,10 @@ func TestConnectedRanExecuteSetupFailure(t *testing.T) {
 	writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 1)
 }
 
-func TestUnnecessaryUpdateNodebInfoStatus(t *testing.T) {
-	_, _, _, _, ranReconnectionManager, _ := initRanLostConnectionTest(t)
-	nodebInfo := &entities.NodebInfo{RanName: "ranName", GlobalNbId: &entities.GlobalNbId{PlmnId: "xxx", NbId: "yyy"}, ConnectionStatus: entities.ConnectionStatus_CONNECTED}
-	err := ranReconnectionManager.updateNodebInfoStatus(nodebInfo, entities.ConnectionStatus_CONNECTED)
-	assert.Nil(t, err)
-}
-
 func TestNoSetConnectionStatus(t *testing.T) {
 	_, _, _, _, ranReconnectionManager, _ := initRanLostConnectionTest(t)
 	nodebInfo := &entities.NodebInfo{RanName: "ranName", GlobalNbId: &entities.GlobalNbId{PlmnId: "xxx", NbId: "yyy"}, ConnectionStatus: entities.ConnectionStatus_CONNECTED}
-	err := ranReconnectionManager.setConnectionStatusOfUnconnectableRan(nodebInfo)
+	err := ranReconnectionManager.updateUnconnectableRan(nodebInfo)
 	assert.Nil(t, err)
 }