X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_cell_mgr.c;h=b81ddca814d09ab1dd13118587917162c5cd4d8f;hb=b6b9cd39450a3cbf7ec962f2d8c65540af28eb29;hp=cb7439d066fa3450d919d644424e4e371b200c0d;hpb=a7f840464c3f12d15f6fb451a73b90ab14ad3a1d;p=o-du%2Fl2.git diff --git a/src/du_app/du_cell_mgr.c b/src/du_app/du_cell_mgr.c index cb7439d06..b81ddca81 100644 --- a/src/du_app/du_cell_mgr.c +++ b/src/du_app/du_cell_mgr.c @@ -174,7 +174,27 @@ uint8_t duGetCellCb(uint16_t cellId, DuCellCb **cellCb) uint8_t duHandleCellUpInd(Pst *pst, OduCellId *cellId) { DuCellCb *cellCb = NULLP; - + +#ifndef O1_ENABLE + + /*Note: Static Configuration, when O1 is not configuring the RRM policy*/ + RrmPolicy *rrmPolicy; + DU_ALLOC(rrmPolicy, sizeof(RrmPolicy)); + rrmPolicy->rsrcType = RSRC_PRB; + rrmPolicy->numMemberList = 1; + DU_ALLOC(rrmPolicy->memberList, sizeof(PolicyMemberList *)); + DU_ALLOC(rrmPolicy->memberList[0], sizeof(PolicyMemberList)); + + memset(&rrmPolicy->memberList[0]->plmn, 0, sizeof(Plmn)); + rrmPolicy->memberList[0]->snssai.sst = 1; + rrmPolicy->memberList[0]->snssai.sd[0] = 2; + rrmPolicy->memberList[0]->snssai.sd[1] = 3; + rrmPolicy->memberList[0]->snssai.sd[2] = 4; + rrmPolicy->policyMinRatio = 30; + rrmPolicy->policyMaxRatio = 90; + rrmPolicy->policyDedicatedRatio = 10; +#endif + if(cellId->cellId <=0 || cellId->cellId > MAX_NUM_CELL) { DU_LOG("\nERROR --> DU APP : Invalid Cell Id %d in duHandleCellUpInd()", cellId->cellId); @@ -189,14 +209,17 @@ 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 + if(duCfgParam.tempSliceCfg.rrmPolicy) + BuildAndSendSliceConfigReq(duCfgParam.tempSliceCfg.rrmPolicy, duCfgParam.tempSliceCfg.totalRrmPolicy, duCfgParam.tempSliceCfg.totalSliceCount); DU_LOG("\nINFO --> DU APP : Raise cell UP alarm for cell id=%d", cellId->cellId); raiseCellAlrm(CELL_UP_ALARM_ID, cellId->cellId); setCellOpState(cellId->cellId, ENABLED, ACTIVE); +#else + BuildAndSendSliceConfigReq(&rrmPolicy,1, rrmPolicy->numMemberList); #endif + } if((pst->selector == ODU_SELECTOR_LWLC) || (pst->selector == ODU_SELECTOR_TC))