X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhandlers%2Frmrmsghandlers%2Fe2_term_init_notification_handler.go;h=ca8a4c53927bb0aba9b731e2a4e258b8a0454405;hb=7a69a44b1566e5f9e42534b40336f59768028641;hp=d11158b069411c8da11b02db955d427f2326f755;hpb=197657e0e814c871b903ef779ad654b13347e430;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go index d11158b..ca8a4c5 100644 --- a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go +++ b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go @@ -79,6 +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) return } @@ -106,12 +107,38 @@ func (h E2TermInitNotificationHandler) HandleExistingE2TInstance(e2tInstance *en func (h E2TermInitNotificationHandler) HandleNewE2TInstance(e2tAddress string, podName string) { - err := h.routingManagerClient.AddE2TInstance(e2tAddress) + for i := 1; i < 4; i++ { - if err != nil { - h.logger.Errorf("#E2TermInitNotificationHandler.HandleNewE2TInstance - e2t address: %s - routing manager failure", e2tAddress) - return - } + err := h.routingManagerClient.AddE2TInstance(e2tAddress) + + if err == nil{ + + _ = h.e2tInstancesManager.AddE2TInstance(e2tAddress, podName) + + break + } else { + + h.logger.Errorf("#E2TermInitNotificationHandler.HandleNewE2TInstance - e2t address count - %d : %s - routing manager failure", i, e2tAddress) + } + + } +} + +func (h E2TermInitNotificationHandler) UpdateExistingE2TInstanceToRtmgr(e2tAddress string) { + + _ = h.e2tInstancesManager.ResetKeepAliveTimestamp(e2tAddress) + for i := 1; i < 4; i++ { + + err := h.routingManagerClient.AddE2TInstance(e2tAddress) + + if err == nil{ + break + } else { + + h.logger.Errorf("#E2TermInitNotificationHandler.UpdateExistingE2TInstanceToRtmgr - e2t address count - %d : %s - routing manager failure", i, e2tAddress) + } + + } - _ = h.e2tInstancesManager.AddE2TInstance(e2tAddress, podName) } +