X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=E2Manager%2Fhandlers%2Frmrmsghandlers%2Fe2_term_init_notification_handler.go;h=d11158b069411c8da11b02db955d427f2326f755;hb=ab8f039d2f4288ceba5d0ce6c95172210fe60776;hp=0059b2a94248e059db710c123176c9f069afa170;hpb=011bb9161ca8e7ad0d0cf282b818672a88a5dfbf;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 0059b2a..d11158b 100644 --- a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go +++ b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go @@ -17,7 +17,6 @@ // This source code is part of the near-RT RIC (RAN Intelligent Controller) // platform project (RICP). - package rmrmsghandlers import ( @@ -62,7 +61,7 @@ func (h E2TermInitNotificationHandler) Handle(request *models.NotificationReques return } - h.logger.Infof("#E2TermInitNotificationHandler.Handle - E2T address: %s - handling E2_TERM_INIT", e2tAddress) + h.logger.Infof("#E2TermInitNotificationHandler.Handle - E2T payload: %s - handling E2_TERM_INIT", unmarshalledPayload) e2tInstance, err := h.e2tInstancesManager.GetE2TInstance(e2tAddress) @@ -74,7 +73,7 @@ func (h E2TermInitNotificationHandler) Handle(request *models.NotificationReques return } - h.HandleNewE2TInstance(e2tAddress) + h.HandleNewE2TInstance(e2tAddress, unmarshalledPayload.PodName) return } @@ -83,7 +82,7 @@ func (h E2TermInitNotificationHandler) Handle(request *models.NotificationReques return } - if e2tInstance.State == entities.ToBeDeleted{ + if e2tInstance.State == entities.ToBeDeleted { h.logger.Infof("#E2TermInitNotificationHandler.Handle - E2T Address: %s - E2T instance status is: %s, ignore", e2tInstance.Address, e2tInstance.State) return } @@ -98,21 +97,21 @@ func (h E2TermInitNotificationHandler) HandleExistingE2TInstance(e2tInstance *en for _, ranName := range e2tInstance.AssociatedRanList { if err := h.ranDisconnectionManager.DisconnectRan(ranName); err != nil { - if _, ok := err.(*common.ResourceNotFoundError); !ok{ + if _, ok := err.(*common.ResourceNotFoundError); !ok { break } } } } -func (h E2TermInitNotificationHandler) HandleNewE2TInstance(e2tAddress string) { +func (h E2TermInitNotificationHandler) HandleNewE2TInstance(e2tAddress string, podName string) { err := h.routingManagerClient.AddE2TInstance(e2tAddress) - if err != nil{ + if err != nil { h.logger.Errorf("#E2TermInitNotificationHandler.HandleNewE2TInstance - e2t address: %s - routing manager failure", e2tAddress) return } - _ = h.e2tInstancesManager.AddE2TInstance(e2tAddress) -} \ No newline at end of file + _ = h.e2tInstancesManager.AddE2TInstance(e2tAddress, podName) +}