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,
ConnectionStatus: entities.ConnectionStatus_CONNECTING,
E2ApplicationProtocol: protocol,
RanName: requestDetails.RanName,
- ConnectionAttempts: 0,
}
nbIdentity := &entities.NbIdentity{
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 {
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)
if nodebInfo.ConnectionStatus == entities.ConnectionStatus_CONNECTED {
status = nodebInfo.ConnectionStatus
}
- nodebInfo.ConnectionAttempts = 0
err := h.rNibDataService.UpdateNodebInfo(nodebInfo)
if err != nil {
return err
}
- nodebInfo, nodebIdentity := createInitialNodeInfo(request, protocol, e2tAddress)
+ nodebInfo, nodebIdentity := createInitialNodeInfo(request, protocol)
err = h.rNibDataService.SaveNodeb(nodebIdentity, nodebInfo)
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)