Add R5 content to master

[ric-plt/e2mgr.git] / E2Manager / handlers / httpmsghandlers / setup_request_handler.go

diff --git a/E2Manager/handlers/httpmsghandlers/setup_request_handler.go b/E2Manager/handlers/httpmsghandlers/setup_request_handler.go
index c5ce648..dae75a9 100644 (file)
--- a/E2Manager/handlers/httpmsghandlers/setup_request_handler.go
+++ b/E2Manager/handlers/httpmsghandlers/setup_request_handler.go
@@ -94,7 +94,7 @@ func (h *SetupRequestHandler) Handle(request models.Request) (models.IResponse,
        return nil, result
 }
 
-func createInitialNodeInfo(requestDetails *models.SetupRequest, protocol entities.E2ApplicationProtocol, e2tAddress string) (*entities.NodebInfo, *entities.NbIdentity) {
+func createInitialNodeInfo(requestDetails *models.SetupRequest, protocol entities.E2ApplicationProtocol) (*entities.NodebInfo, *entities.NbIdentity) {
 
        nodebInfo := &entities.NodebInfo{
                Ip:                    requestDetails.RanIp,
@@ -102,7 +102,6 @@ func createInitialNodeInfo(requestDetails *models.SetupRequest, protocol entitie
                ConnectionStatus:      entities.ConnectionStatus_CONNECTING,
                E2ApplicationProtocol: protocol,
                RanName:               requestDetails.RanName,
-               ConnectionAttempts:    0,
        }
 
        nbIdentity := &entities.NbIdentity{
@@ -118,12 +117,11 @@ func (h *SetupRequestHandler) connectExistingRanWithoutAssociatedE2TAddress(node
        if err != nil {
                h.logger.Errorf("#SetupRequestHandler.connectExistingRanWithoutAssociatedE2TAddress - RAN name: %s - failed selecting E2T instance", nodebInfo.RanName)
 
-               if nodebInfo.ConnectionStatus == entities.ConnectionStatus_DISCONNECTED && nodebInfo.ConnectionAttempts == 0 {
+               if nodebInfo.ConnectionStatus == entities.ConnectionStatus_DISCONNECTED{
                        return err
                }
 
                nodebInfo.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED
-               nodebInfo.ConnectionAttempts = 0
                updateError := h.rNibDataService.UpdateNodebInfo(nodebInfo)
 
                if updateError != nil {
@@ -133,7 +131,7 @@ func (h *SetupRequestHandler) connectExistingRanWithoutAssociatedE2TAddress(node
                return err
        }
 
-       err = h.e2tAssociationManager.AssociateRan(e2tAddress, nodebInfo.RanName)
+       err = h.e2tAssociationManager.AssociateRan(e2tAddress, nodebInfo)
 
        if err != nil {
                h.logger.Errorf("#SetupRequestHandler.connectExistingRanWithoutAssociatedE2TAddress - RAN name: %s - failed associating ran to e2t address %s. error: %s", nodebInfo.RanName, e2tAddress, err)
@@ -151,7 +149,6 @@ func (h *SetupRequestHandler) connectExistingRanWithAssociatedE2TAddress(nodebIn
        if nodebInfo.ConnectionStatus == entities.ConnectionStatus_CONNECTED {
                status = nodebInfo.ConnectionStatus
        }
-       nodebInfo.ConnectionAttempts = 0
        err := h.rNibDataService.UpdateNodebInfo(nodebInfo)
 
        if err != nil {
@@ -174,7 +171,7 @@ func (h *SetupRequestHandler) connectNewRan(request *models.SetupRequest, protoc
                return err
        }
 
-       nodebInfo, nodebIdentity := createInitialNodeInfo(request, protocol, e2tAddress)
+       nodebInfo, nodebIdentity := createInitialNodeInfo(request, protocol)
 
        err = h.rNibDataService.SaveNodeb(nodebIdentity, nodebInfo)
 
@@ -185,7 +182,7 @@ func (h *SetupRequestHandler) connectNewRan(request *models.SetupRequest, protoc
 
        h.logger.Infof("#SetupRequestHandler.connectNewRan - RAN name: %s - initial nodeb entity was saved to rNib", request.RanName)
 
-       err = h.e2tAssociationManager.AssociateRan(e2tAddress, request.RanName)
+       err = h.e2tAssociationManager.AssociateRan(e2tAddress, nodebInfo)
 
        if err != nil {
                h.logger.Errorf("#SetupRequestHandler.connectNewRan - RAN name: %s - failed associating ran to e2t address %s. error: %s", request.RanName, e2tAddress, err)