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=c36438df1a2da03f8a76d06bebcd7af70766766f;hb=2ed06429ecae26f8591f2f7b6a8b64fe15c9b3d8;hp=7063f57e5547e7c84629efec93b17c7652be722a;hpb=e597612ca39c11bb5b562b9e492e5340a618dba9;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 7063f57..c36438d 100644 --- a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go +++ b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go @@ -31,18 +31,18 @@ import ( ) type E2TermInitNotificationHandler struct { - logger *logger.Logger - ranReconnectionManager *managers.RanReconnectionManager - e2tInstancesManager managers.IE2TInstancesManager - routingManagerClient clients.IRoutingManagerClient + logger *logger.Logger + ranDisconnectionManager *managers.RanDisconnectionManager + e2tInstancesManager managers.IE2TInstancesManager + routingManagerClient clients.IRoutingManagerClient } -func NewE2TermInitNotificationHandler(logger *logger.Logger, ranReconnectionManager *managers.RanReconnectionManager, e2tInstancesManager managers.IE2TInstancesManager, routingManagerClient clients.IRoutingManagerClient) E2TermInitNotificationHandler { +func NewE2TermInitNotificationHandler(logger *logger.Logger, ranDisconnectionManager *managers.RanDisconnectionManager, e2tInstancesManager managers.IE2TInstancesManager, routingManagerClient clients.IRoutingManagerClient) E2TermInitNotificationHandler { return E2TermInitNotificationHandler{ - logger: logger, - ranReconnectionManager: ranReconnectionManager, - e2tInstancesManager: e2tInstancesManager, - routingManagerClient: routingManagerClient, + logger: logger, + ranDisconnectionManager: ranDisconnectionManager, + e2tInstancesManager: e2tInstancesManager, + routingManagerClient: routingManagerClient, } } @@ -89,7 +89,7 @@ func (h E2TermInitNotificationHandler) Handle(request *models.NotificationReques } if e2tInstance.State == entities.RoutingManagerFailure { - err := h.e2tInstancesManager.ActivateE2TInstance(e2tInstance) + err := h.e2tInstancesManager.SetE2tInstanceState(e2tAddress, e2tInstance.State, entities.Active) if err != nil { return } @@ -104,7 +104,7 @@ func (h E2TermInitNotificationHandler) HandleExistingE2TInstance(e2tInstance *en for _, ranName := range e2tInstance.AssociatedRanList { - if err := h.ranReconnectionManager.ReconnectRan(ranName); err != nil { + if err := h.ranDisconnectionManager.DisconnectRan(ranName); err != nil { h.logger.Errorf("#E2TermInitNotificationHandler.HandleExistingE2TInstance - Ran name: %s - connection attempt failure, error: %s", ranName, err) _, ok := err.(*common.ResourceNotFoundError) if !ok {