[RICPLT-2523] Update setup flow | Add UTs..........

[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 5de5e2d..904e34b 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go
+++ b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go
@@ -22,6 +22,7 @@ import (
        "e2mgr/managers"
        "e2mgr/models"
        "e2mgr/services"
+       "encoding/json"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
 )
 
@@ -29,13 +30,15 @@ type E2TermInitNotificationHandler struct {
        logger                 *logger.Logger
        rnibDataService        services.RNibDataService
        ranReconnectionManager *managers.RanReconnectionManager
+       e2tInstancesManager    managers.IE2TInstancesManager
 }
 
-func NewE2TermInitNotificationHandler(logger *logger.Logger, ranReconnectionManager *managers.RanReconnectionManager, rnibDataService services.RNibDataService) E2TermInitNotificationHandler {
+func NewE2TermInitNotificationHandler(logger *logger.Logger, ranReconnectionManager *managers.RanReconnectionManager, rnibDataService services.RNibDataService, e2tInstancesManager managers.IE2TInstancesManager) E2TermInitNotificationHandler {
        return E2TermInitNotificationHandler{
                logger:                 logger,
                rnibDataService:        rnibDataService,
                ranReconnectionManager: ranReconnectionManager,
+               e2tInstancesManager:    e2tInstancesManager,
        }
 }
 
@@ -43,21 +46,44 @@ func (h E2TermInitNotificationHandler) Handle(request *models.NotificationReques
 
        h.logger.Infof("#E2TermInitNotificationHandler.Handle - Handling E2_TERM_INIT")
 
-       nbIdentityList, err := h.rnibDataService.GetListNodebIds()
+       unmarshalledPayload := models.E2TermInitPayload{}
+       err :=  json.Unmarshal(request.Payload, &unmarshalledPayload)
+
        if err != nil {
-               h.logger.Errorf("#E2TermInitNotificationHandler.Handle - Failed to get nodes list from RNIB. Error: %s", err.Error())
+               h.logger.Errorf("#E2TermInitNotificationHandler - Error unmarshaling E2 Term Init payload: %s", err)
+               return
+       }
+
+       e2tAddress := unmarshalledPayload.Address
+
+       if len(e2tAddress) == 0 {
+               h.logger.Errorf("#E2TermInitNotificationHandler - Empty E2T address received")
+               return
+       }
+
+       e2tInstance, err := h.e2tInstancesManager.GetE2TInstance(e2tAddress)
+
+       if err != nil {
+               _, ok := err.(*common.ResourceNotFoundError)
+
+               if !ok {
+                       h.logger.Errorf("#E2TermInitNotificationHandler.Handle - Failed retrieving E2TInstance. error: %s", err)
+                       return
+               }
+
+               _ = h.e2tInstancesManager.AddE2TInstance(e2tAddress)
                return
        }
 
-       if len(nbIdentityList) == 0 {
-               h.logger.Warnf("#E2TermInitNotificationHandler.Handle - The Nodes list in RNIB is empty")
+       if len(e2tInstance.AssociatedRanList) == 0 {
+               h.logger.Infof("#E2TermInitNotificationHandler.Handle - E2T Address: %s - E2T instance has no associated RANs", e2tInstance.Address)
                return
        }
 
-       for _, nbIdentity := range nbIdentityList {
+       for _, ranName := range e2tInstance.AssociatedRanList {
 
-               if err := h.ranReconnectionManager.ReconnectRan(nbIdentity.InventoryName); err != nil {
-                       h.logger.Errorf("#E2TermInitNotificationHandler.Handle - Ran name: %s - connection attempt failure, error: %s", (*nbIdentity).GetInventoryName(), err.Error())
+               if err := h.ranReconnectionManager.ReconnectRan(ranName); err != nil {
+                       h.logger.Errorf("#E2TermInitNotificationHandler.Handle - Ran name: %s - connection attempt failure, error: %s", ranName, err)
                        _, ok := err.(*common.ResourceNotFoundError)
                        if !ok {
                                break