X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=E2Manager%2Fhandlers%2Frmrmsghandlers%2Fe2_reset_request_handler.go;h=4e1e3f4cf7289a05a950f41cc0c3b680ea8d9a28;hb=refs%2Fchanges%2F59%2F10859%2F3;hp=5fb36c8fc1327c454f2fd31fb512cb304d983429;hpb=d39280d4e5f3b26c12be2f4ab3d829771c55fa7d;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/handlers/rmrmsghandlers/e2_reset_request_handler.go b/E2Manager/handlers/rmrmsghandlers/e2_reset_request_handler.go
index 5fb36c8..4e1e3f4 100644
--- 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 (
 	"e2mgr/configuration"
 	"e2mgr/logger"
+	"e2mgr/managers"
 	"e2mgr/models"
 	"e2mgr/rmrCgo"
 	"e2mgr/services"
@@ -43,14 +44,16 @@ type E2ResetRequestNotificationHandler struct {
 	rnibDataService services.RNibDataService
 	config          *configuration.Configuration
 	rmrSender       *rmrsender.RmrSender
+	ranResetManager *managers.RanResetManager
 }
 
-func NewE2ResetRequestNotificationHandler(logger *logger.Logger, rnibDataService services.RNibDataService, config *configuration.Configuration, rmrSender *rmrsender.RmrSender) *E2ResetRequestNotificationHandler {
+func NewE2ResetRequestNotificationHandler(logger *logger.Logger, rnibDataService services.RNibDataService, config *configuration.Configuration, rmrSender *rmrsender.RmrSender, ranResetManager *managers.RanResetManager) *E2ResetRequestNotificationHandler {
 	return &E2ResetRequestNotificationHandler{
 		logger:          logger,
 		rnibDataService: rnibDataService,
 		config:          config,
 		rmrSender:       rmrSender,
+		ranResetManager: ranResetManager,
 	}
 }
 
@@ -71,7 +74,21 @@ func (e *E2ResetRequestNotificationHandler) Handle(request *models.NotificationR
 
 	nodebInfo.ConnectionStatus = entities.ConnectionStatus_UNDER_RESET
 
-	err = e.rnibDataService.UpdateNodebInfoAndPublish(nodebInfo)
+	ranName := request.RanName
+	isResetDone, err := e.ranResetManager.ResetRan(ranName)
+	if err != nil {
+		e.logger.Errorf("#E2ResetRequestNotificationHandler.Handle - failed to update and notify connection status of nodeB entity. RanName: %s. Error: %s", request.RanName, err.Error())
+	} else {
+		if isResetDone {
+			nodebInfoupdated, err1 := e.getNodebInfo(request.RanName)
+			if err1 != nil {
+				e.logger.Errorf("#E2ResetRequestNotificationHandler.Handle - failed to get updated nodeB entity. RanName: %s. Error: %s", request.RanName, err1.Error())
+			}
+			e.logger.Debugf("#E2ResetRequestNotificationHandler.Handle - Reset Done Successfully ran: %s , Connection status updated : %s", ranName, nodebInfoupdated.ConnectionStatus)
+		} else {
+			e.logger.Debugf("#E2ResetRequestNotificationHandler.Handle - Reset Failed")
+		}
+	}
 
 	if err != nil {
 		e.logger.Errorf("#E2ResetRequestNotificationHandler.Handle - failed to update connection status of nodeB entity. RanName: %s. Error: %s", request.RanName, err.Error())
@@ -83,7 +100,6 @@ func (e *E2ResetRequestNotificationHandler) Handle(request *models.NotificationR
 
 	e.waitfortimertimeout(request)
 
-	ranName := request.RanName
 	resetRequest, err := e.parseE2ResetMessage(request.Payload)
 	if err != nil {
 		e.logger.Errorf(err.Error())