Adding E2M reassoc of E2T when its already in DB

[ric-plt/e2mgr.git] / E2Manager / handlers / rmrmsghandlers / e2_term_init_notification_handler.go

diff --git a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go
index 7063f57..ca8a4c5 100644 (file)
--- 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 (
@@ -31,18 +30,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,
        }
 }
 
@@ -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,27 +73,21 @@ func (h E2TermInitNotificationHandler) Handle(request *models.NotificationReques
                        return
                }
 
-               h.HandleNewE2TInstance(e2tAddress)
+               h.HandleNewE2TInstance(e2tAddress, unmarshalledPayload.PodName)
                return
        }
 
        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
        }
 
-       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
        }
 
-       if e2tInstance.State == entities.RoutingManagerFailure {
-               err := h.e2tInstancesManager.ActivateE2TInstance(e2tInstance)
-               if err != nil {
-                       return
-               }
-       }
-
        h.HandleExistingE2TInstance(e2tInstance)
 
        h.logger.Infof("#E2TermInitNotificationHandler.Handle - Completed handling of E2_TERM_INIT")
@@ -104,24 +97,48 @@ func (h E2TermInitNotificationHandler) HandleExistingE2TInstance(e2tInstance *en
 
        for _, ranName := range e2tInstance.AssociatedRanList {
 
-               if err := h.ranReconnectionManager.ReconnectRan(ranName); err != nil {
-                       h.logger.Errorf("#E2TermInitNotificationHandler.HandleExistingE2TInstance - Ran name: %s - connection attempt failure, error: %s", ranName, err)
-                       _, ok := err.(*common.ResourceNotFoundError)
-                       if !ok {
+               if err := h.ranDisconnectionManager.DisconnectRan(ranName); err != nil {
+                       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)
+    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)
-}
\ No newline at end of file