From: dhirajverma Date: Tue, 14 Dec 2021 18:17:08 +0000 (-0500) Subject: Adding E2M reassoc of E2T when its already in DB X-Git-Tag: 5.4.19^0 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=d287336cfb4d5c74634fe7af38e7d5e9265671e4;p=ric-plt%2Fe2mgr.git Adding E2M reassoc of E2T when its already in DB Change-Id: Ia164b1d5af71ba50f203a0492dc1660e77d9b631 Signed-off-by: dhirajverma --- diff --git a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go index ef9b779..ca8a4c5 100644 --- a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go +++ b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go @@ -79,7 +79,7 @@ func (h E2TermInitNotificationHandler) Handle(request *models.NotificationReques if len(e2tInstance.AssociatedRanList) == 0 { h.logger.Infof("#E2TermInitNotificationHandler.Handle - E2T Address: %s - E2T instance has no associated RANs", e2tInstance.Address) - //h.UpdateExistingE2TInstanceToRtmgr(e2tAddress) + h.UpdateExistingE2TInstanceToRtmgr(e2tAddress) return } @@ -126,6 +126,7 @@ func (h E2TermInitNotificationHandler) HandleNewE2TInstance(e2tAddress string, p func (h E2TermInitNotificationHandler) UpdateExistingE2TInstanceToRtmgr(e2tAddress string) { + _ = h.e2tInstancesManager.ResetKeepAliveTimestamp(e2tAddress) for i := 1; i < 4; i++ { err := h.routingManagerClient.AddE2TInstance(e2tAddress) @@ -135,7 +136,6 @@ func (h E2TermInitNotificationHandler) UpdateExistingE2TInstanceToRtmgr(e2tAddre } else { h.logger.Errorf("#E2TermInitNotificationHandler.UpdateExistingE2TInstanceToRtmgr - e2t address count - %d : %s - routing manager failure", i, e2tAddress) - _ = h.e2tInstancesManager.ResetKeepAliveTimestamp(e2tAddress) } } diff --git a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go index ac8ee5d..6744b40 100644 --- a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go +++ b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go @@ -173,8 +173,11 @@ func TestE2TermInitNewE2TInstance__RoutingManagerError(t *testing.T) { } func TestE2TermInitExistingE2TInstanceNoAssociatedRans(t *testing.T) { - _, handler, _, _, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) + _, handler, _, _, e2tInstancesManagerMock, routingManagerClientMock := initRanLostConnectionTest(t) e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName) + var rtmgrErr error + e2tInstancesManagerMock.On("ResetKeepAliveTimestamp", e2tInstanceAddress).Return(nil) + routingManagerClientMock.On("AddE2TInstance", e2tInstanceAddress).Return(rtmgrErr, nil) e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil) notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)} handler.Handle(notificationRequest) @@ -501,9 +504,12 @@ func TestE2TermInitHandlerSuccessTwoRansFirstRnibInternalErrorFailure(t *testing } func TestE2TermInitHandlerSuccessZeroRans(t *testing.T) { - _, handler, _, writerMock, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t) + _, handler, _, writerMock, e2tInstancesManagerMock, routingManagerClientMock := initRanLostConnectionTest(t) e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName) + var rtmgrErr error + e2tInstancesManagerMock.On("ResetKeepAliveTimestamp", e2tInstanceAddress).Return(nil) + routingManagerClientMock.On("AddE2TInstance", e2tInstanceAddress).Return(rtmgrErr, nil) e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil) notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}