X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_cell_mgr.c;h=cb7439d066fa3450d919d644424e4e371b200c0d;hb=d62d6a2c96903363a6d7a2f1b23658bfef3590c9;hp=6c4b88802ad33aa0ddb17b11036a400194328425;hpb=aa4c92c065ee9a7f469abeee26e1dd8e00ce11d5;p=o-du%2Fl2.git diff --git a/src/du_app/du_cell_mgr.c b/src/du_app/du_cell_mgr.c index 6c4b88802..cb7439d06 100644 --- a/src/du_app/du_cell_mgr.c +++ b/src/du_app/du_cell_mgr.c @@ -34,7 +34,7 @@ #ifdef O1_ENABLE #include "AlarmInterface.h" -#include "ConfigInterface.h" +#include "CmInterface.h" #endif @@ -173,8 +173,8 @@ uint8_t duGetCellCb(uint16_t cellId, DuCellCb **cellCb) * ****************************************************************/ uint8_t duHandleCellUpInd(Pst *pst, OduCellId *cellId) { - DuCellCb *cellCb = NULLP; - + DuCellCb *cellCb = NULLP; + if(cellId->cellId <=0 || cellId->cellId > MAX_NUM_CELL) { DU_LOG("\nERROR --> DU APP : Invalid Cell Id %d in duHandleCellUpInd()", cellId->cellId); @@ -189,7 +189,9 @@ uint8_t duHandleCellUpInd(Pst *pst, OduCellId *cellId) DU_LOG("\nINFO --> DU APP : 5G-NR Cell %d is UP", cellId->cellId); cellCb->cellStatus = ACTIVATED; gCellStatus = CELL_UP; - + + if(duCfgParam.tempSliceCfg.rrmPolicy) + BuildAndSendSliceConfigReq(duCfgParam.tempSliceCfg.rrmPolicy, duCfgParam.tempSliceCfg.totalRrmPolicy, duCfgParam.tempSliceCfg.totalSliceCount); #ifdef O1_ENABLE DU_LOG("\nINFO --> DU APP : Raise cell UP alarm for cell id=%d", cellId->cellId); raiseCellAlrm(CELL_UP_ALARM_ID, cellId->cellId); @@ -222,6 +224,7 @@ uint8_t DuProcMacCellDeleteRsp(Pst *pst, MacCellDeleteRsp *deleteRsp) { uint8_t ret = ROK; uint16_t cellIdx=0; + if(deleteRsp) { if(deleteRsp->result == SUCCESSFUL_RSP) @@ -242,6 +245,7 @@ uint8_t DuProcMacCellDeleteRsp(Pst *pst, MacCellDeleteRsp *deleteRsp) duCb.numActvCells--; duCb.numCfgCells--; DU_FREE(duCb.actvCellLst[cellIdx], sizeof(DuCellCb)); + } else { @@ -354,13 +358,6 @@ uint8_t duSendCellDeletReq(uint16_t cellId) return RFAILED; } - if(duCb.actvCellLst[cellIdx]->numActvUes) - { - DU_LOG("\nERROR --> DU APP : duSendCellDeletReq(): Active UEs still present in cellId[%d].\ - Failed to delete cell", cellId); - return RFAILED; - } - if(duBuildAndSendMacCellStop(cellId) == RFAILED) { DU_LOG("\nERROR --> DU APP : duSendCellDeletReq(): Failed to build and send cell stop request to MAC for\