MacMessageRouter(&rspPst, (void *)&sliceCfgRsp);
}
+
/*******************************************************************************
*
- * @brief fill slice configuration response
+ * @brief This function is used to store or modify the slice configuration Sch DB
*
* @details
*
- * Function : fillSliceCfgRsp
+ * Function : addOrModifySliceCfgInSchDb
*
* Functionality:
- * fill slice configuration response
+ * function is used to store or modify the slice configuration Sch DB
*
- * @params[in] SchCellCb, SchSliceCfgReq, SchSliceCfgRsp,uint8_t count
+ * @params[in] SchSliceCfg *storeSliceCfg, SchSliceCfgReq *cfgReq,
+ * SchSliceCfgRsp cfgRsp, uint8_t count
*
* @return
* ROK - Success
* RFAILED - Failure
*
* ********************************************************************************/
-uint8_t fillSliceCfgRsp(bool sliceRecfg, SchSliceCfg *storedSliceCfg, SchCellCb *cellCb, SchSliceCfgReq *schSliceCfgReq, SchSliceCfgRsp *schSliceCfgRsp, uint8_t *count)
+uint8_t addSliceCfgInSchDb(CmLListCp *sliceCfgInDb, SchRrmPolicyOfSlice *cfgReq)
{
- bool sliceFound = false;
- uint8_t cfgIdx = 0, sliceIdx = 0, plmnIdx = 0;
+ SchRrmPolicyOfSlice *sliceToStore;
- schSliceCfgRsp->numSliceCfgRsp = schSliceCfgReq->numOfConfiguredSlice;
- SCH_ALLOC(schSliceCfgRsp->listOfSliceCfgRsp, schSliceCfgRsp->numSliceCfgRsp * sizeof(SliceRsp*));
- if(schSliceCfgRsp->listOfSliceCfgRsp == NULLP)
+ SCH_ALLOC(sliceToStore, sizeof(SchRrmPolicyOfSlice));
+ if(sliceToStore)
{
- DU_LOG("\nERROR --> SCH : Memory allocation failed at fillSliceCfgRsp");
- return RFAILED;
+ memcpy(&sliceToStore->snssai, &cfgReq->snssai, sizeof(Snssai));
+ memcpy(&sliceToStore->rrmPolicyRatioInfo, &cfgReq->rrmPolicyRatioInfo, sizeof(SchRrmPolicyRatio));
+ addNodeToLList(sliceCfgInDb, sliceToStore, NULL);
}
-
- for(cfgIdx = 0; cfgIdx<schSliceCfgRsp->numSliceCfgRsp ; cfgIdx++)
+ else
{
- sliceFound = false;
- /* Here comparing the slice cfg request with the slice stored in cellCfg */
- if(sliceRecfg != true)
- {
- for(plmnIdx = 0; plmnIdx < MAX_PLMN; plmnIdx++)
- {
- for(sliceIdx = 0; sliceIdx<cellCb->cellCfg.plmnInfoList[plmnIdx].numSliceSupport; sliceIdx++)
- {
- if(!memcmp(&schSliceCfgReq->listOfSlices[cfgIdx]->snssai, cellCb->cellCfg.plmnInfoList[plmnIdx].snssai[sliceIdx], sizeof(Snssai)))
- {
- (*count)++;
- sliceFound = true;
- break;
- }
- }
- if(sliceFound == true)
- {
- break;
- }
- }
- }
- else
- {
- /* Here comparing the slice cfg request with the slice stored in SchDb */
- if(storedSliceCfg->listOfSlices)
- {
- for(sliceIdx = 0; sliceIdx<storedSliceCfg->numOfSliceConfigured; sliceIdx++)
- {
- if(!memcmp(&schSliceCfgReq->listOfSlices[cfgIdx]->snssai, &storedSliceCfg->listOfSlices[sliceIdx]->snssai,\
- sizeof(Snssai)))
- {
- (*count)++;
- sliceFound = true;
- break;
- }
- }
- }
- }
-
- SCH_ALLOC(schSliceCfgRsp->listOfSliceCfgRsp[cfgIdx], sizeof(SliceRsp));
- if(schSliceCfgRsp->listOfSliceCfgRsp[cfgIdx] == NULLP)
- {
- DU_LOG("\nERROR --> SCH : Failed to allocate memory in fillSliceCfgRsp");
- return RFAILED;
- }
-
-
- schSliceCfgRsp->listOfSliceCfgRsp[cfgIdx]->snssai = schSliceCfgReq->listOfSlices[cfgIdx]->snssai;
- if(sliceFound == true)
- schSliceCfgRsp->listOfSliceCfgRsp[cfgIdx]->rsp = RSP_OK;
- else
- {
- schSliceCfgRsp->listOfSliceCfgRsp[cfgIdx]->rsp = RSP_NOK;
- schSliceCfgRsp->listOfSliceCfgRsp[cfgIdx]->cause = SLICE_NOT_FOUND;
- }
+ DU_LOG("\nERROR --> SCH : Memory allocation failed in addOrModifySliceCfgInSchDb");
+ return RFAILED;
}
return ROK;
}
/*******************************************************************************
*
- * @brief This function is used to store the slice configuration Sch DB
+ * @brief fill slice configuration response
*
* @details
*
- * Function : addSliceCfgInSchDb
+ * Function : fillSliceCfgRsp
*
* Functionality:
- * function is used to store the slice configuration Sch DB
+ * fill slice configuration response
*
- * @params[in] SchSliceCfg *storeSliceCfg, SchSliceCfgReq *cfgReq,
- * SchSliceCfgRsp cfgRsp, uint8_t count
+ * @params[in] SchCellCb, SchSliceCfgReq, SchSliceCfgRsp,uint8_t count
*
* @return
* ROK - Success
* RFAILED - Failure
*
* ********************************************************************************/
-uint8_t addSliceCfgInSchDb(SchSliceCfg *storeSliceCfg, SchSliceCfgReq *cfgReq, SchSliceCfgRsp cfgRsp, uint8_t count)
+uint8_t fillSliceCfgRsp(Inst inst, CmLListCp *storedSliceCfg, SchCellCb *cellCb, SchSliceCfgReq *schSliceCfgReq)
{
- uint8_t cfgIdx = 0, sliceIdx = 0;
-
- if(count)
- {
- storeSliceCfg->numOfSliceConfigured = count;
- SCH_ALLOC(storeSliceCfg->listOfSlices, storeSliceCfg->numOfSliceConfigured * sizeof(SchRrmPolicyOfSlice*));
- if(storeSliceCfg->listOfSlices == NULLP)
- {
- DU_LOG("\nERROR --> SCH : Failed to allocate memory in addSliceCfgInSchDb");
- return RFAILED;
- }
+ SchMacRsp sliceFound;
+ uint8_t cfgIdx = 0, sliceIdx = 0, plmnIdx = 0, ret =ROK;
+ SchSliceCfgRsp schSliceCfgRsp;
- for(cfgIdx = 0; cfgIdx<storeSliceCfg->numOfSliceConfigured; cfgIdx++)
+ for(cfgIdx = 0; cfgIdx<schSliceCfgReq->numOfConfiguredSlice; cfgIdx++)
+ {
+ sliceFound = RSP_NOK;
+ /* Here comparing the slice cfg request with the slice stored in cellCfg */
+ for(plmnIdx = 0; plmnIdx < MAX_PLMN; plmnIdx++)
{
- if(cfgRsp.listOfSliceCfgRsp[cfgIdx]->rsp == RSP_OK)
+ for(sliceIdx = 0; sliceIdx<cellCb->cellCfg.plmnInfoList[plmnIdx].numSliceSupport; sliceIdx++)
{
- SCH_ALLOC(storeSliceCfg->listOfSlices[sliceIdx], sizeof(SchRrmPolicyOfSlice));
- if(storeSliceCfg->listOfSlices[sliceIdx] == NULLP)
+ /* If we find the SliceCfgReq's SNSSAI in CellCb's SNSSAI DB, we mark this slice as configured and add it to Sch's DB. */
+ if(!memcmp(&schSliceCfgReq->listOfSlices[cfgIdx]->snssai, cellCb->cellCfg.plmnInfoList[plmnIdx].snssai[sliceIdx], sizeof(Snssai)))
{
- DU_LOG("\nERROR --> SCH : Failed to allocate memory in addSliceCfgInSchDb");
- return RFAILED;
+ if(addSliceCfgInSchDb(storedSliceCfg, schSliceCfgReq->listOfSlices[cfgIdx]) == ROK)
+ {
+ sliceFound = RSP_OK;
+ schSliceCfgRsp.cause = SLICE_CONFIGURED;
+ }
+ else
+ {
+ DU_LOG("\nERROR --> SCH : Failed to store slice configuration in SchDb");
+ schSliceCfgRsp.cause = RESOURCE_NOT_AVAILABLE;
+ ret = RFAILED;
+ }
+ plmnIdx = MAX_PLMN;
+ break;
}
-
- memcpy(&storeSliceCfg->listOfSlices[sliceIdx]->snssai, &cfgReq->listOfSlices[sliceIdx]->snssai, sizeof(Snssai));
- memcpy(&storeSliceCfg->listOfSlices[sliceIdx]->rrmPolicyRatioInfo, &cfgReq->listOfSlices[sliceIdx]->rrmPolicyRatioInfo,
- sizeof(SchRrmPolicyRatio));
- sliceIdx++;
}
}
+
+ if((sliceFound == RSP_NOK) && (schSliceCfgRsp.cause != RESOURCE_NOT_AVAILABLE))
+ schSliceCfgRsp.cause = SLICE_NOT_FOUND;
+
+ schSliceCfgRsp.snssai = schSliceCfgReq->listOfSlices[cfgIdx]->snssai;
+ schSliceCfgRsp.rsp = sliceFound;
+ SchSendSliceCfgRspToMac(inst, schSliceCfgRsp);
}
- return ROK;
+ return ret;
}
/*******************************************************************************
* ********************************************************************************/
uint8_t SchProcSliceCfgReq(Pst *pst, SchSliceCfgReq *schSliceCfgReq)
{
- uint8_t count = 0;
+ uint8_t ret = ROK;
Inst inst = pst->dstInst - SCH_INST_START;
- SchSliceCfgRsp sliceCfgRsp;
DU_LOG("\nINFO --> SCH : Received Slice Cfg request from MAC");
if(schSliceCfgReq)
if(schSliceCfgReq->listOfSlices)
{
/* filling the slice configuration response of each slice */
- if(fillSliceCfgRsp(false, NULLP, schCb[inst].cells[0], schSliceCfgReq, &sliceCfgRsp, &count) != ROK)
+ if(fillSliceCfgRsp(inst, &schCb[inst].sliceCfg, schCb[inst].cells[0], schSliceCfgReq) != ROK)
{
DU_LOG("\nERROR --> SCH : Failed to fill the slice cfg rsp");
- return RFAILED;
- }
-
- if(addSliceCfgInSchDb(&schCb[inst].sliceCfg, schSliceCfgReq, sliceCfgRsp, count) != ROK)
- {
- DU_LOG("\nERROR --> SCH : Failed to add slice cfg in sch database");
- return RFAILED;
+ ret = RFAILED;
}
freeSchSliceCfgReq(schSliceCfgReq);
- SchSendSliceCfgRspToMac(inst, sliceCfgRsp);
}
}
else
{
DU_LOG("\nERROR --> SCH : Received SchSliceCfgReq is NULL");
+ ret = RFAILED;
}
- return ROK;
+ return ret;
}
-/*******************************************************************************
- *
- * @brief This function is used to store the slice reconfiguration Sch DB
- *
- * @details
- *
- * Function : modifySliceCfgInSchDb
- *
- * Functionality:
- * function is used to store the slice re configuration Sch DB
- *
- * @params[in] Pst *pst, SchSliceCfgReq *schSliceCfgReq
- *
- * @return
- * ROK - Success
- * RFAILED - Failure
- *
- * ********************************************************************************/
-uint8_t modifySliceCfgInSchDb(SchSliceCfg *storeSliceCfg, SchSliceRecfgReq *recfgReq, SchSliceRecfgRsp recfgRsp, uint8_t count)
-{
- uint8_t cfgIdx = 0, sliceIdx = 0;
-
- if(count)
- {
- if(storeSliceCfg->listOfSlices == NULLP)
- {
- DU_LOG("\nINFO --> SCH : Memory allocation failed in modifySliceCfgInSchDb");
- return RFAILED;
- }
-
- for(cfgIdx = 0; cfgIdx<recfgReq->numOfConfiguredSlice; cfgIdx++)
- {
- if(recfgRsp.listOfSliceCfgRsp[cfgIdx]->rsp == RSP_OK)
- {
- for(sliceIdx = 0; sliceIdx<storeSliceCfg->numOfSliceConfigured; sliceIdx++)
- {
- if(!memcmp(&storeSliceCfg->listOfSlices[sliceIdx]->snssai, &recfgReq->listOfSlices[cfgIdx]->snssai, sizeof(Snssai)))
- {
- memcpy(&storeSliceCfg->listOfSlices[sliceIdx]->rrmPolicyRatioInfo, &recfgReq->listOfSlices[cfgIdx]->rrmPolicyRatioInfo,
- sizeof(SchRrmPolicyRatio));
- break;
- }
- }
- }
- }
- }
- freeSchSliceCfgReq(recfgReq);
- return ROK;
-}
/*******************************************************************************
*
* @brief This function is used to send Slice re Cfg rsp to MAC
MacMessageRouter(&rspPst, (void *)&schSliceRecfgRsp);
}
+
+/*******************************************************************************
+ *
+ * @brief fill slice configuration response
+ *
+ * @details
+ *
+ * Function : fillSliceRecfgRsp
+ *
+ * Functionality: fill slice reconfiguration response
+ *
+ * @params[in] SchCellCb, SchSliceCfgReq, SchSliceCfgRsp,uint8_t count
+ *
+ * @return
+ * ROK - Success
+ * RFAILED - Failure
+ *
+ * ********************************************************************************/
+
+uint8_t fillSliceRecfgRsp(Inst inst, CmLListCp *storedSliceCfg, SchSliceRecfgReq *schSliceRecfgReq)
+{
+ SchMacRsp sliceFound;
+ uint8_t cfgIdx = 0;
+ SchRrmPolicyOfSlice *rrmPolicyOfSlices;
+ SchSliceRecfgRsp schSliceRecfgRsp;
+
+ for(cfgIdx = 0; cfgIdx<schSliceRecfgReq->numOfConfiguredSlice; cfgIdx++)
+ {
+ sliceFound = RSP_NOK;
+ /* Here comparing the slice recfg request with the StoredSliceCfg */
+ CmLList *sliceCfg = storedSliceCfg->first;
+
+ while(sliceCfg)
+ {
+ rrmPolicyOfSlices = (SchRrmPolicyOfSlice*)sliceCfg->node;
+
+ if(rrmPolicyOfSlices && (memcmp(&schSliceRecfgReq->listOfSlices[cfgIdx]->snssai, &(rrmPolicyOfSlices->snssai), sizeof(Snssai)) == 0))
+ {
+ memcpy(&rrmPolicyOfSlices->rrmPolicyRatioInfo, &schSliceRecfgReq->listOfSlices[cfgIdx]->rrmPolicyRatioInfo, sizeof(SchRrmPolicyRatio));
+ sliceFound = RSP_OK;
+ break;
+ }
+ sliceCfg = sliceCfg->next;
+ }
+
+ schSliceRecfgRsp.snssai = schSliceRecfgReq->listOfSlices[cfgIdx]->snssai;
+ schSliceRecfgRsp.rsp = sliceFound;
+ if(schSliceRecfgRsp.rsp == RSP_OK)
+ schSliceRecfgRsp.cause = SLICE_RECONFIGURED;
+ else
+ schSliceRecfgRsp.cause = SLICE_NOT_FOUND;
+ SchSendSliceRecfgRspToMac(inst, schSliceRecfgRsp);
+ }
+ return ROK;
+}
/*******************************************************************************
*
* @brief This function is used to store the slice reconfiguration Sch DB
* ********************************************************************************/
uint8_t SchProcSliceRecfgReq(Pst *pst, SchSliceRecfgReq *schSliceRecfgReq)
{
- uint8_t count = 0;
+ uint8_t ret = ROK;
Inst inst = pst->dstInst - SCH_INST_START;
- SchSliceRecfgRsp schSliceRecfgRsp;
DU_LOG("\nINFO --> SCH : Received Slice ReCfg request from MAC");
if(schSliceRecfgReq)
if(schSliceRecfgReq->listOfSlices)
{
/* filling the slice configuration response of each slice */
- if(fillSliceCfgRsp(true, &schCb[inst].sliceCfg, NULLP, schSliceRecfgReq, &schSliceRecfgRsp, &count) != ROK)
+ if(fillSliceRecfgRsp(inst, &schCb[inst].sliceCfg, schSliceRecfgReq) != ROK)
{
DU_LOG("\nERROR --> SCH : Failed to fill sch slice cfg response");
- return RFAILED;
+ ret = RFAILED;
}
-
- /* Modify the slice configuration stored in schCb */
- if(modifySliceCfgInSchDb(&schCb[inst].sliceCfg, schSliceRecfgReq, schSliceRecfgRsp, count) != ROK)
- {
- DU_LOG("\nERROR --> SCH : Failed to modify slice cfg of SchDb");
- return RFAILED;
- }
- SchSendSliceRecfgRspToMac(inst, schSliceRecfgRsp);
+ freeSchSliceCfgReq(schSliceRecfgReq);
}
}
else
{
DU_LOG("\nERROR --> SCH : Received SchSliceRecfgReq is NULL");
+
}
- return ROK;
+ return ret;
}
/****************************************************************************
Code Review / o-du / l2.git / blobdiff