Merge "e2managererrors - err removed"

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

diff --git a/E2Manager/handlers/enb_load_information_to_protobuf.go b/E2Manager/handlers/enb_load_information_to_protobuf.go
index 7427c74..51d6efa 100644 (file)
--- a/E2Manager/handlers/enb_load_information_to_protobuf.go
+++ b/E2Manager/handlers/enb_load_information_to_protobuf.go
@@ -12,7 +12,7 @@ import (
 )
 
 const (
-       MaxCellineNb             = 256
+       MaxCellsInEnb            = 256
        MaxNoOfPrbs              = 110
        NaxNoOfCompHypothesisSet = 256
        NaxNoOfCompCells         = 32
@@ -36,7 +36,7 @@ func extractPduCellInformationItemIEs(pdu *C.E2AP_PDU_t) ([]*C.CellInformation_I
 
        initiatingMessage := *(**C.InitiatingMessage_t)(unsafe.Pointer(&pdu.choice[0]))
 
-       if (initiatingMessage == nil || initiatingMessage.value.present != C.InitiatingMessage__value_PR_LoadInformation) {
+       if initiatingMessage == nil || initiatingMessage.value.present != C.InitiatingMessage__value_PR_LoadInformation {
                return nil, fmt.Errorf("#extractPduCellInformationItemIEs - Invalid InitiatingMessage value")
        }
 
@@ -64,7 +64,7 @@ func extractPduCellInformationItemIEs(pdu *C.E2AP_PDU_t) ([]*C.CellInformation_I
 
        loadInformationCellListCount := loadInformationCellList.list.count
 
-       if loadInformationCellListCount == 0 || loadInformationCellListCount > MaxCellineNb {
+       if loadInformationCellListCount == 0 || loadInformationCellListCount > MaxCellsInEnb {
                return nil, fmt.Errorf("#extractPduCellInformationItemIEs - Invalid CellInformation list count")
        }
 
@@ -265,7 +265,7 @@ func extractPduUlHighInterferenceIndicationInfoItems(cellId string, cellInformat
 
        pduUlHighInterferenceIndicationInfoListCount := pduUlHighInterferenceIndicationInfo.list.count
 
-       if pduUlHighInterferenceIndicationInfoListCount == 0 || pduUlHighInterferenceIndicationInfoListCount > MaxCellineNb {
+       if pduUlHighInterferenceIndicationInfoListCount == 0 || pduUlHighInterferenceIndicationInfoListCount > MaxCellsInEnb {
                return nil, fmt.Errorf("#extractPduUlHighInterferenceIndicationInfoItems - cellId: %s - Invalid UL High Interference Indication info list count", cellId)
        }
 
@@ -406,7 +406,7 @@ func extractPaListFromDynamicNaicsInformation(cellId string, dynamicNAICSInforma
        extendedUlInterferenceOverLoadIndicationList := (*[1 << 30]*C.long)(unsafe.Pointer(dynamicNAICSInformation.pA_list.list.array))[:int(paListCount):int(paListCount)]
 
        if (extendedUlInterferenceOverLoadIndicationList == nil) {
-               return nil, fmt.Errorf("#extractPaListFromDynamicNaicsInformation - cellId: %s - Extended Ul Interference OverLoad Indication List is nil")
+               return nil, fmt.Errorf("#extractPaListFromDynamicNaicsInformation - cellId: %s - Extended Ul Interference OverLoad Indication List is nil", cellId)
        }
 
        return extendedUlInterferenceOverLoadIndicationList, nil
@@ -496,7 +496,7 @@ func buildCompHypothesisSets(cellId string, pduCompInformationItemMember *C.CoMP
        pduCompHypothesisSetItemsListCount := pduCompInformationItemMember.coMPHypothesisSet.list.count
 
        if pduCompHypothesisSetItemsListCount == 0 || pduCompHypothesisSetItemsListCount > NaxNoOfCompCells {
-               return nil, fmt.Errorf("#buildCompHypothesisSets - cellId: %s - Invalid Comp Hypothesis Set Items list count")
+               return nil, fmt.Errorf("#buildCompHypothesisSets - cellId: %s - Invalid Comp Hypothesis Set Items list count", cellId)
        }
 
        pduCompHypothesisSetItems := (*[1 << 30]*C.CoMPHypothesisSetItem_t)(unsafe.Pointer(pduCompInformationItemMember.coMPHypothesisSet.list.array))[:int(pduCompHypothesisSetItemsListCount):int(pduCompHypothesisSetItemsListCount)]