E2 reset request message model

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

diff --git a/E2Manager/handlers/rmrmsghandlers/e2_reset_request_handler.go b/E2Manager/handlers/rmrmsghandlers/e2_reset_request_handler.go
index 5fb36c8..eb20f13 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/e2_reset_request_handler.go
+++ b/E2Manager/handlers/rmrmsghandlers/e2_reset_request_handler.go
@@ -21,6 +21,7 @@ package rmrmsghandlers
 import (\r
        "e2mgr/configuration"\r
        "e2mgr/logger"\r
+       "e2mgr/managers"\r
        "e2mgr/models"\r
        "e2mgr/rmrCgo"\r
        "e2mgr/services"\r
@@ -39,18 +40,22 @@ var (
 )\r
 \r
 type E2ResetRequestNotificationHandler struct {\r
-       logger          *logger.Logger\r
-       rnibDataService services.RNibDataService\r
-       config          *configuration.Configuration\r
-       rmrSender       *rmrsender.RmrSender\r
+       logger                            *logger.Logger\r
+       rnibDataService                   services.RNibDataService\r
+       config                            *configuration.Configuration\r
+       rmrSender                         *rmrsender.RmrSender\r
+       ranResetManager                   *managers.RanResetManager\r
+       changeStatusToConnectedRanManager *managers.ChangeStatusToConnectedRanManager\r
 }\r
 \r
-func NewE2ResetRequestNotificationHandler(logger *logger.Logger, rnibDataService services.RNibDataService, config *configuration.Configuration, rmrSender *rmrsender.RmrSender) *E2ResetRequestNotificationHandler {\r
+func NewE2ResetRequestNotificationHandler(logger *logger.Logger, rnibDataService services.RNibDataService, config *configuration.Configuration, rmrSender *rmrsender.RmrSender, ranResetManager *managers.RanResetManager, changeStatusToConnectedRanManager *managers.ChangeStatusToConnectedRanManager) *E2ResetRequestNotificationHandler {\r
        return &E2ResetRequestNotificationHandler{\r
-               logger:          logger,\r
-               rnibDataService: rnibDataService,\r
-               config:          config,\r
-               rmrSender:       rmrSender,\r
+               logger:                            logger,\r
+               rnibDataService:                   rnibDataService,\r
+               config:                            config,\r
+               rmrSender:                         rmrSender,\r
+               ranResetManager:                   ranResetManager,\r
+               changeStatusToConnectedRanManager: changeStatusToConnectedRanManager,\r
        }\r
 }\r
 \r
@@ -71,7 +76,21 @@ func (e *E2ResetRequestNotificationHandler) Handle(request *models.NotificationR
 \r
        nodebInfo.ConnectionStatus = entities.ConnectionStatus_UNDER_RESET\r
 \r
-       err = e.rnibDataService.UpdateNodebInfoAndPublish(nodebInfo)\r
+       ranName := request.RanName\r
+       isResetDone, err := e.ranResetManager.ResetRan(ranName)\r
+       if err != nil {\r
+               e.logger.Errorf("#E2ResetRequestNotificationHandler.Handle - failed to update and notify connection status of nodeB entity. RanName: %s. Error: %s", request.RanName, err.Error())\r
+       } else {\r
+               if isResetDone {\r
+                       nodebInfoupdated, err1 := e.getNodebInfo(request.RanName)\r
+                       if err1 != nil {\r
+                               e.logger.Errorf("#E2ResetRequestNotificationHandler.Handle - failed to get updated nodeB entity. RanName: %s. Error: %s", request.RanName, err1.Error())\r
+                       }\r
+                       e.logger.Debugf("#E2ResetRequestNotificationHandler.Handle - Reset Done Successfully ran: %s , Connection status updated : %s", ranName, nodebInfoupdated.ConnectionStatus)\r
+               } else {\r
+                       e.logger.Debugf("#E2ResetRequestNotificationHandler.Handle - Reset Failed")\r
+               }\r
+       }\r
 \r
        if err != nil {\r
                e.logger.Errorf("#E2ResetRequestNotificationHandler.Handle - failed to update connection status of nodeB entity. RanName: %s. Error: %s", request.RanName, err.Error())\r
@@ -83,7 +102,6 @@ func (e *E2ResetRequestNotificationHandler) Handle(request *models.NotificationR
 \r
        e.waitfortimertimeout(request)\r
 \r
-       ranName := request.RanName\r
        resetRequest, err := e.parseE2ResetMessage(request.Payload)\r
        if err != nil {\r
                e.logger.Errorf(err.Error())\r
@@ -92,12 +110,19 @@ func (e *E2ResetRequestNotificationHandler) Handle(request *models.NotificationR
        e.logger.Infof("#E2ResetRequestNotificationHandler.Handle - RIC_RESET_REQUEST has been parsed successfully %+v", resetRequest)\r
        e.handleSuccessfulResponse(ranName, request, resetRequest)\r
 \r
-       nodebInfo.ConnectionStatus = entities.ConnectionStatus_CONNECTED\r
-\r
-       err = e.rnibDataService.UpdateNodebInfoAndPublish(nodebInfo)\r
-\r
+       isConnectedStatus, err := e.changeStatusToConnectedRanManager.ChangeStatusToConnectedRan(ranName)\r
        if err != nil {\r
-               e.logger.Errorf("#E2ResetRequestNotificationHandler.Handle - failed to update connection status of nodeB entity. RanName: %s. Error: %s", request.RanName, err.Error())\r
+               e.logger.Errorf("#E2ResetRequestNotificationHandler.Handle - failed to update and notify connection status of nodeB entity. RanName: %s. Error: %s", request.RanName, err.Error())\r
+       } else {\r
+               if isConnectedStatus {\r
+                       nodebInfoupdated, err1 := e.getNodebInfo(request.RanName)\r
+                       if err1 != nil {\r
+                               e.logger.Errorf("#E2ResetRequestNotificationHandler.Handle - failed to get updated nodeB entity. RanName: %s. Error: %s", request.RanName, err1.Error())\r
+                       }\r
+                       e.logger.Debugf("#E2ResetRequestNotificationHandler.Handle - Connection status Set Successfully ran: %s , Connection status updated : %s", ranName, nodebInfoupdated.ConnectionStatus)\r
+               } else {\r
+                       e.logger.Debugf("#E2ResetRequestNotificationHandler.Handle - Connection status Setting Failed")\r
+               }\r
        }\r
 \r
        e.logger.Debugf("#E2ResetRequestNotificationHandler.Handle - nodeB entity connected state. RanName %s, ConnectionStatus %s", nodebInfo.RanName, nodebInfo.ConnectionStatus)\r
@@ -128,13 +153,13 @@ func (e *E2ResetRequestNotificationHandler) waitfortimertimeout(request *models.
 \r
 func (e *E2ResetRequestNotificationHandler) parseE2ResetMessage(payload []byte) (*models.E2ResetRequestMessage, error) {\r
        e2resetMessage := models.E2ResetRequestMessage{}\r
-       err := xml.Unmarshal(utils.NormalizeXml(payload), &(e2resetMessage.E2APPDU))\r
+       err := xml.Unmarshal(utils.NormalizeXml(payload), &(e2resetMessage.E2ApPDU))\r
 \r
        if err != nil {\r
                e.logger.Errorf("#E2ResetRequestNotificationHandler.Handle - error in parsing request message: %+v", err)\r
                return nil, err\r
        }\r
-       e.logger.Debugf("#E2ResetRequestNotificationHandler.Handle - Unmarshalling is successful %v", e2resetMessage.E2APPDU.InitiatingMessage.ProcedureCode)\r
+       e.logger.Debugf("#E2ResetRequestNotificationHandler.Handle - Unmarshalling is successful %v", e2resetMessage.E2ApPDU.InitiatingMessage.ProcedureCode)\r
        return &e2resetMessage, nil\r
 }\r
 \r