Merge "Split build steps out of Dockerfile to script"

[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 283de35..c75140f 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go
+++ b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go
@@ -25,7 +25,6 @@ import (
        "e2mgr/logger"
        "e2mgr/managers"
        "e2mgr/models"
-       "e2mgr/services"
        "encoding/json"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
@@ -33,16 +32,14 @@ import (
 
 type E2TermInitNotificationHandler struct {
        logger                 *logger.Logger
-       rnibDataService        services.RNibDataService
        ranReconnectionManager *managers.RanReconnectionManager
        e2tInstancesManager    managers.IE2TInstancesManager
        routingManagerClient   clients.IRoutingManagerClient
 }
 
-func NewE2TermInitNotificationHandler(logger *logger.Logger, ranReconnectionManager *managers.RanReconnectionManager, rnibDataService services.RNibDataService, e2tInstancesManager managers.IE2TInstancesManager, routingManagerClient clients.IRoutingManagerClient) E2TermInitNotificationHandler {
+func NewE2TermInitNotificationHandler(logger *logger.Logger, ranReconnectionManager *managers.RanReconnectionManager, e2tInstancesManager managers.IE2TInstancesManager, routingManagerClient clients.IRoutingManagerClient) E2TermInitNotificationHandler {
        return E2TermInitNotificationHandler{
                logger:                 logger,
-               rnibDataService:        rnibDataService,
                ranReconnectionManager: ranReconnectionManager,
                e2tInstancesManager:    e2tInstancesManager,
                routingManagerClient:   routingManagerClient,
@@ -92,7 +89,7 @@ func (h E2TermInitNotificationHandler) Handle(request *models.NotificationReques
        }
 
        if e2tInstance.State == entities.RoutingManagerFailure {
-               err := h.e2tInstancesManager.ActivateE2TInstance(e2tInstance)
+               err := h.e2tInstancesManager.SetE2tInstanceState(e2tAddress, e2tInstance.State, entities.Active)
                if err != nil {
                        return
                }