#include "legtp.h"
#include "du_utils.h"
#include "du_cell_mgr.h"
+#include "du_msg_hdl.h"
#ifdef O1_ENABLE
uint8_t macCfg = 0;
uint8_t macCfgInst = 0;
-DuCfgParams duCfgParam;
-uint8_t packRlcConfigReq(Pst *pst, RlcMngmt *cfg);
-uint8_t cmPkLkwCntrlReq(Pst *pst, RlcMngmt *cfg);
-uint8_t cmPkLrgCfgReq(Pst *pst, RgMngmt *cfg);
-uint8_t egtpHdlDatInd(EgtpMsg egtpMsg);
-uint8_t BuildAndSendDUConfigUpdate();
-uint16_t getTransId();
-uint8_t cmPkLrgSchCfgReq(Pst * pst,RgMngmt * cfg);
-uint8_t sendCellDeleteReqToMac(uint16_t cellId);
-
packMacCellCfgReq packMacCellCfgOpts[] =
{
packMacCellCfg, /* packing for loosely coupled */
packDuMacStatsReq /* Light weight-loose coupling */
};
+DuMacStatsDeleteReqFunc packMacStatsDeleteReqOpts[]=
+{
+ packDuMacStatsDeleteReq, /* Loose Coupling */
+ MacProcStatsDeleteReq, /* Tight Coupling */
+ packDuMacStatsDeleteReq /* Light weight-loose coupling */
+};
+
+DuMacStatsModificationReqFunc packMacStatsModificationReqOpts[]=
+{
+ packDuMacStatsModificationReq, /* Loose Coupling */
+ MacProcStatsModificationReq, /* Tight Coupling */
+ packDuMacStatsModificationReq /* Light weight-loose coupling */
+};
+
/**************************************************************************
* @brief Function to fill configs required by RLC
*
genCfg = &(rlcMngmt.t.cfg.s.gen);
/*----------- Fill General Configuration Parameters ---------*/
- genCfg->maxUe = duCfgParam.maxUe;
+ genCfg->maxUe = MAX_NUM_UE;
genCfg->maxKwuSaps = 2;
genCfg->maxUdxSaps = 1;
genCfg->rlcMode = (inst == RLC_UL_INST) ?
cell->cellInfo.plmn[idx1].mnc[1] = duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.srvdPlmn[0].plmn.mnc[1];
cell->cellInfo.plmn[idx1].mnc[2] = duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.srvdPlmn[0].plmn.mnc[2];
}
- cell->cellInfo.maxUe = duCfgParam.maxUe;
+ cell->cellInfo.maxUe = MAX_NUM_UE;
cell->cellStatus = CELL_OUT_OF_SERVICE;
- gCellStatus = CELL_DOWN;
+ gConfigInfo.gCellStatus = CELL_DOWN;
duCb.cfgCellLst[duCb.numCfgCells] = cell;
duCb.numCfgCells++;
}
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildAndSendStatsReqToMac(uint64_t subscriptionId, RicSubscription *ricSubscriptionInfo)
+uint8_t BuildAndSendStatsReqToMac(RicSubscription *ricSubscriptionInfo)
{
Pst pst;
- uint8_t actionIdx = 0, grpIdx = 0, statsIdx = 0;
- ActionInfo *actionDb = NULLP;
- ActionDefFormat1 *format1Action = NULLP;
MacStatsReq *macStatsReq = NULLP;
/* Fill MAC statistics request */
return RFAILED;
}
- macStatsReq->subscriptionId = subscriptionId;
- for(actionIdx = 0; actionIdx < ricSubscriptionInfo->numOfActions; actionIdx++)
- {
- if(ricSubscriptionInfo->actionSequence[actionIdx].action == CONFIG_ADD)
- {
- actionDb = &ricSubscriptionInfo->actionSequence[actionIdx];
- macStatsReq->statsGrpList[grpIdx].groupId = actionDb->id;
- switch(actionDb->definition.formatType)
- {
- case 1:
- {
- format1Action = &actionDb->definition.choice.format1;
- macStatsReq->statsGrpList[grpIdx].periodicity = format1Action->granularityPeriod;
-
- CmLList *node = NULLP;
- MeasurementInfo *measInfo = NULLP;
- statsIdx = 0;
- /* Update DL PRB Usage for all stats group which requested for DL Total PRB Usage */
- node = cmLListFirst(&format1Action->measurementInfoList);
- while(node)
- {
- measInfo = (MeasurementInfo *)(node->node);
- switch(measInfo->measurementTypeId)
- {
- case 1:
- {
- macStatsReq->statsGrpList[grpIdx].statsList[statsIdx++] = MAC_DL_TOTAL_PRB_USAGE;
- break;
- }
- case 2:
- {
- macStatsReq->statsGrpList[grpIdx].statsList[statsIdx++] = MAC_UL_TOTAL_PRB_USAGE;
- break;
- }
- default:
- {
- DU_LOG("\nERROR --> DU_APP : Invalid measurement name BuildAndSendStatsReqToMac");
- break;
- }
- }
- node = node->next;
- }
- macStatsReq->statsGrpList[grpIdx].numStats = statsIdx;
- break;
- }
- default:
- {
- DU_LOG("\nERROR --> DU_APP : BuildAndSendStatsReqToMac: Only Action Definition Format 1 supported");
- break;
- }
- }
- if(macStatsReq->statsGrpList[grpIdx].numStats)
- grpIdx++;
- }
- }
- macStatsReq->numStatsGroup = grpIdx;
-
- if(macStatsReq->numStatsGroup)
+ /* Fill E2 Subscription Info in MAC Statistics Request and send to MAC */
+ if(fillRicSubsInMacStatsReq(macStatsReq, ricSubscriptionInfo) == ROK)
{
DU_LOG("\nDEBUG --> DU_APP: Sending Statistics Request to MAC ");
FILL_PST_DUAPP_TO_MAC(pst, EVENT_MAC_STATISTICS_REQ);
return RFAILED;
}
-/*******************************************************************
- *
- * @brief Fetch statistics details from Action Definition Format 1
- *
- * @details
- *
- * Function : FetchStatsFromActionDefFormat1()
- *
- * Functionality: Fetch statistics details from Action
- * Definition Format 1 received in an E2 message from
- * RIC.
- *
- * @params[in] ActionDefFormat1
- *
- * @return Statistics
- *
- * ****************************************************************/
-Statistics FetchStatsFromActionDefFormat1(ActionDefFormat1 format1)
-{
- Statistics stats;
-
- /* TODO : When E2AP subscription procedure is implemented:
- * Measurement info list is traveresed
- * Based on KPI type, stats.macStatsReq or stats.rlcstatsReq is filled */
-
- /* Hardcoding values for now for testing purpose
- * Will be removed in next gerrit */
- stats.macStatsReq.subscriptionId = 1;
- stats.macStatsReq.numStatsGroup = 1;
- stats.macStatsReq.statsGrpList[0].groupId = 1;
- stats.macStatsReq.statsGrpList[0].periodicity = 100;
- stats.macStatsReq.statsGrpList[0].numStats = 2;
- stats.macStatsReq.statsGrpList[0].statsList[0] = MAC_DL_TOTAL_PRB_USAGE;
- stats.macStatsReq.statsGrpList[0].statsList[1] = MAC_UL_TOTAL_PRB_USAGE;
-
- return stats;
-}
-
/*******************************************************************
*
* @brief Send Statistics request to DU layers
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildAndSendStatsReq(uint16_t ranFuncId, RicSubscription *ricSubscriptionInfo)
+uint8_t BuildAndSendStatsReq(RicSubscription *ricSubscriptionInfo)
{
- uint64_t subscriptionId = 0;
-
- /* Calculate 64 bit subscription-ID :
- * First 16 MSB is unused
- * Next 16 MSB = RAN-Function-ID
- * Next 16 MSB = Requestor-ID in RIC-Request-ID
- * Last 16 LSB = Instance-ID in RIC-Request-ID
- */
- subscriptionId = ricSubscriptionInfo->requestId.instanceId;
- subscriptionId |= ((uint64_t)ricSubscriptionInfo->requestId.requestorId << 16);
- subscriptionId |= ((uint64_t)ranFuncId << 32);
-
/* Build and sent subscription information to MAC in Statistics Request */
- if(BuildAndSendStatsReqToMac(subscriptionId, ricSubscriptionInfo) != ROK)
+ if(BuildAndSendStatsReqToMac(ricSubscriptionInfo) != ROK)
{
DU_LOG("\nERROR --> DU_APP : Failed at BuildAndSendStatsReqToMac()");
return RFAILED;
/*******************************************************************
*
- * @brief Converts DU specific failure cause to E2 interface
- * failure cause
+ * @brief Process statistics response from MAC
*
* @details
*
- * Function : convertDuCauseToE2Cause
+ * Function : DuProcMacStatsRsp
*
- * Functionality: Converts DU specific failure cause to E2
- * interface failure cause
+ * Functionality: Processes statistics configuration response
+ * from MAC. If configuration is succsessful, DUAPP starts
+ * reporting period timer for this subscription request
+ * from RIC
*
- * @params[in] DU specific failure cause
- * E2 specific failure cause
+ * @params[in]
*
- * @return void
+ * @return ROK - success
+ * RFAILED - failure
*
* ****************************************************************/
-void convertDuCauseToE2Cause(CauseOfResult l2Cause, E2FailureCause *failureCause)
+uint8_t DuProcMacStatsRsp(Pst *pst, MacStatsRsp *statsRsp)
{
- switch(l2Cause)
+ uint8_t ret = RFAILED;
+ DU_LOG("\nINFO --> DU_APP : DuProcMacStatsRsp: Received Statistics Response from MAC");
+
+ if(statsRsp)
{
- case PARAM_INVALID:
- {
- failureCause->causeType = E2_RIC_REQUEST;
- failureCause->cause = E2_ACTION_NOT_SUPPORTED;
- break;
- }
- case RESOURCE_UNAVAILABLE:
- {
- failureCause->causeType = E2_RIC_REQUEST;
- failureCause->cause = E2_FUNCTION_RESOURCE_LIMIT;
- break;
- }
- default:
- {
- failureCause->causeType = E2_RIC_REQUEST;
- failureCause->cause = E2_RIC_REQUEST_CAUSE_UNSPECIFIED;
- break;
- }
+#ifdef DEBUG_PRINT
+ uint8_t idx = 0;
+ DU_LOG("\n Subscription Id [%ld]", statsRsp->subscriptionId);
+
+ DU_LOG("\n Number of Accepted Groups [%d]", statsRsp->numGrpAccepted);
+ for(idx=0; idx<statsRsp->numGrpAccepted; idx++)
+ {
+ DU_LOG("\n Group Id [%d]", statsRsp->statsGrpAcceptedList[idx]);
+ }
+
+ DU_LOG("\n Number of Rejected Groups [%d]", statsRsp->numGrpRejected);
+ for(idx=0; idx<statsRsp->numGrpRejected; idx++)
+ {
+ DU_LOG("\n Group Id [%d]", statsRsp->statsGrpRejectedList[idx].groupId);
+ }
+#endif
+
+ /* Check the list of accepted and rejected statistics group and send
+ * Ric subscription response/failure accordingly */
+ if((ret = e2ProcStatsRsp(statsRsp)) != ROK)
+ {
+ DU_LOG("\nERROR --> DU_APP : DuProcMacStatsRsp: Failed in %s at line %d", __func__, __LINE__);
+ }
+
+ DU_FREE_SHRABL_BUF(pst->region, pst->pool, statsRsp, sizeof(MacStatsRsp));
}
+ else
+ {
+ DU_LOG("\nERROR --> DU_APP : DuProcMacStatsRsp: Received NULL Pointer");
+ }
+ return ret;
}
/*******************************************************************
*
- * @brief Rejects all actions received in a subscription request
+ * @brief Process statistics indication from MAC
*
* @details
*
- * Function : duRejectAllStatsGroup
+ * Function : DuProcMacStatsInd
*
- * Functionality: Rejects all actions received in a subscription
- * request by :
- * a. Removing the subscription entry from RAN function
- * b. Sending RIC Subscription Failure to RIC with appropriate
- * cause of failure
+ * Functionality: Processes statistics indication from MAC.
*
- * @params[in] RAN Function DB
- * Subscription entry in RAN Function subscription list
- * Statistics Response from MAC
+ * @params[in]
*
* @return ROK - success
* RFAILED - failure
*
* ****************************************************************/
-uint8_t duRejectAllStatsGroup(RanFunction *ranFuncDb, CmLList *ricSubscriptionNode, MacStatsRsp *statsRsp)
+uint8_t DuProcMacStatsInd(Pst *pst, MacStatsInd *statsInd)
{
- uint8_t ret = ROK;
- RicRequestId requestId;
- E2FailureCause failureCause;
+ uint8_t ret = RFAILED;
- /* Delete subcription from RAN Function */
- memcpy(&requestId, &((RicSubscription *)ricSubscriptionNode->node)->requestId, sizeof(RicRequestId));
- cmLListDelFrm(&ranFuncDb->subscriptionList, ricSubscriptionNode);
- DU_FREE(ricSubscriptionNode->node, sizeof(RicSubscription));
- DU_FREE(ricSubscriptionNode, sizeof(CmLList));
+ if(statsInd)
+ {
+#ifdef DEBUG_PRINT
+ DU_LOG("\nDEBUG --> DU_APP : DuProcMacStatsInd: Received Statistics Indication");
+ DU_LOG("\n Subscription Id [%ld]", statsInd->subscriptionId);
+ DU_LOG("\n Group Id [%d]", statsInd->groupId);
+ for(int idx = 0; idx < statsInd->numStats; idx++)
+ {
+ DU_LOG("\n Meas type [%d] Meas Value [%lf]", statsInd->measuredStatsList[idx].type,\
+ statsInd->measuredStatsList[idx].value);
+ }
+#endif
- convertDuCauseToE2Cause(statsRsp->statsGrpRejectedList[0].cause, &failureCause);
+ /* Extract statistics from statistics indication message and store in E2 DB */
+ if((ret = e2ProcStatsInd(statsInd)) != ROK)
+ {
+ DU_LOG("\nINFO --> DU_APP : Failed in %s at line %d", __func__, __LINE__);
+ }
- /* Send RIC subscription failure to RIC */
- ret = BuildAndSendRicSubscriptionFailure(requestId, ranFuncDb->id, failureCause);
+ /* Free statistics indication */
+ DU_FREE_SHRABL_BUF(pst->region, pst->pool, statsInd, sizeof(MacStatsInd));
+ }
+ else
+ {
+ DU_LOG("\nINFO --> DU_APP : DuProcMacStatsInd: Received NULL Pointer");
+ }
return ret;
}
/*******************************************************************
*
- * @brief Process statistics response from MAC
+ * @brief Process statistics delete response from MAC
*
* @details
*
- * Function : DuProcMacStatsRsp
- *
- * Functionality: Processes statistics configuration response
- * from MAC. If configuration is succsessful, DUAPP starts
- * reporting period timer for this subscription request
- * from RIC
+ * Function : DuProcMacStatsDeleteRsp
*
+ * Functionality: Processes statistics delete response
+ * from MAC.
+
* @params[in]
+ * Pst Information
+ * Mac stats delete rsp
*
* @return ROK - success
* RFAILED - failure
*
* ****************************************************************/
-uint8_t DuProcMacStatsRsp(Pst *pst, MacStatsRsp *statsRsp)
-{
- uint8_t idx = 0;
- uint8_t actionId = 0;
- uint16_t ranFuncId = 0;
- RicRequestId ricReqId;
- RanFunction *ranFuncDb = NULLP;
- CmLList *ricSubscriptionNode = NULLP;
- RicSubscription *ricSubscriptionInfo = NULLP;
- PendingSubsRspInfo *pendingSubsRsp = NULLP;
- DU_LOG("\nINFO --> DU_APP : DuProcMacStatsRsp: Received Statistics Response from MAC");
+uint8_t DuProcMacStatsDeleteRsp(Pst *pst, MacStatsDeleteRsp *statsDeleteRsp)
+{
+ uint8_t ret = RFAILED;
+ DU_LOG("\nINFO --> DU_APP : DuProcMacStatsDeleteRsp: Received Statistics Response from MAC");
- if(statsRsp)
+ if(statsDeleteRsp)
{
-#ifdef DEBUG_PRINT
- DU_LOG("\n Subscription Id [%ld]", statsRsp->subscriptionId);
-
- DU_LOG("\n Number of Accepted Groups [%d]", statsRsp->numGrpAccepted);
- for(idx=0; idx<statsRsp->numGrpAccepted; idx++)
+ /* numStatsGroup == 0, received a response for complete ric
+ * subscription deletion else, received a response
+ * for RIC_SUBS_MOD_REQ's actionToBeDeleted*/
+ if(statsDeleteRsp->numStatsGroupDeleted ==0)
{
- DU_LOG("\n Group Id [%d]", statsRsp->statsGrpAcceptedList[idx]);
- }
-
- DU_LOG("\n Number of Rejected Groups [%d]", statsRsp->numGrpRejected);
- for(idx=0; idx<statsRsp->numGrpRejected; idx++)
- {
- DU_LOG("\n Group Id [%d]", statsRsp->statsGrpRejectedList[idx].groupId);
- }
-#endif
-
- /* Extract following from 64 bit subscription-ID :
- * First 16 MSB is unused
- * Next 16 MSB = RAN-Function-ID
- * Next 16 MSB = Requestor-ID in RIC-Request-ID
- * Last 16 LSB = Instance-ID in RIC-Request-ID
- */
- ricReqId.instanceId = statsRsp->subscriptionId & 0xFFFF;
- ricReqId.requestorId = (statsRsp->subscriptionId >> 16) & 0xFFFF;
- ranFuncId = (statsRsp->subscriptionId >> 32) & 0xFFFF;
-
- /* Fetch RAN Function DB */
- if(duCb.e2apDb.ranFunction[ranFuncId-1].id == ranFuncId)
- {
- ranFuncDb = &duCb.e2apDb.ranFunction[ranFuncId-1];
+ if((ret = e2ProcStatsDeleteRsp(statsDeleteRsp)) != ROK)
+ {
+ DU_LOG("\nINFO --> DU_APP : Failed in %s at line %d", __func__, __LINE__);
+ }
}
else
{
- DU_LOG("\nERROR --> DU_APP : DuProcMacStatsRsp: Invalid RAN Function ID[%d] with Subscription ID [%ld]", \
- ranFuncId, statsRsp->subscriptionId);
- DU_FREE_SHRABL_BUF(pst->region, pst->pool, statsRsp, sizeof(MacStatsRsp));
- return RFAILED;
- }
-
- /* Fetch subscription detail in RAN Function DB */
- CM_LLIST_FIRST_NODE(&ranFuncDb->subscriptionList, ricSubscriptionNode);
- while(ricSubscriptionNode)
- {
- ricSubscriptionInfo = (RicSubscription *)ricSubscriptionNode->node;
- if(ricSubscriptionInfo && (ricSubscriptionInfo->requestId.requestorId == ricReqId.requestorId) &&
- (ricSubscriptionInfo->requestId.instanceId == ricReqId.instanceId))
+ if((ret = e2ProcActionDeleteRsp(statsDeleteRsp)) != ROK)
{
- break;
+ DU_LOG("\nINFO --> DU_APP : Failed in %s at line %d", __func__, __LINE__);
}
- ricSubscriptionNode = ricSubscriptionNode->next;
}
+ DU_FREE_SHRABL_BUF(pst->region, pst->pool, statsDeleteRsp, sizeof(MacStatsDeleteRsp));
+ }
+ else
+ {
+ DU_LOG("\nERROR --> DU_APP : DuProcMacStatsDeleteRsp: Received NULL Pointer");
+ }
+ return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief Send Statistics delete req to MAC
+ *
+ * @details
+ *
+ * Function : BuildAndSendStatsDeleteReqToMac()
+ *
+ * Functionality: Send Statistics delete req To Mac
+ *
+ * @params[in]
+ * Subscription Info
+ * delete All Stats
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildAndSendStatsDeleteReqToMac(RicSubscription *ricSubscriptionInfo, bool deleteAllStats)
+{
+ Pst pst;
+ uint8_t actionIdx=0;
+ CmLList *actionNode=NULLP;
+ ActionInfo *actionDb = NULLP;
+ E2FailureCause failureCause;
+ MacStatsDeleteReq *macStatsDelete = NULLP;
- if(ricSubscriptionNode == NULLP)
+ /* Fill MAC statistics delete */
+ DU_ALLOC_SHRABL_BUF(macStatsDelete, sizeof(MacStatsDeleteReq));
+ if(macStatsDelete == NULLP)
+ {
+ DU_LOG("\nERROR --> DU_APP : Memory allocation failed for macStatsDelete in BuildAndSendStatsDeleteReqToMac");
+ failureCause.causeType = E2_MISCELLANEOUS;
+ failureCause.cause = E2_MISCELLANEOUS_CAUSE_UNSPECIFIED;
+
+ if(BuildAndSendRicSubscriptionDeleteFailure(ricSubscriptionInfo->ranFuncId, ricSubscriptionInfo->requestId, failureCause) != ROK)
{
- DU_LOG("\nERROR --> DU_APP : DuProcMacStatsRsp: Subscription not found for Requestor ID [%d] Instance ID [%d]",\
- ricReqId.requestorId, ricReqId.instanceId);
- DU_FREE_SHRABL_BUF(pst->region, pst->pool, statsRsp, sizeof(MacStatsRsp));
+ DU_LOG("\nERROR --> E2AP : e2ProcStatsDeleteRsp: failed to build and send ric subs delete failure");
return RFAILED;
}
-
- /* Fetch pre-stored statistics response info by DU APP */
- for(idx=0; idx<ranFuncDb->numPendingSubsRsp; idx++)
+ return RFAILED;
+ }
+
+ memset(macStatsDelete, 0, sizeof(MacStatsDeleteReq));
+ /* Generate subscription ID using RIC Request ID and RAN Function ID */
+ encodeSubscriptionId(&macStatsDelete->subscriptionId, ricSubscriptionInfo->ranFuncId, ricSubscriptionInfo->requestId);
+
+ /* If deleteAllStats is true, then we don't need to fill in the
+ * statsGrpIdToBeDelList with action details; otherwise, we must fill in the
+ * statsGrpIdToBeDelList with action-related data that is set to CONFIG_DEL.*/
+ if(!deleteAllStats)
+ {
+ actionIdx=0;
+ CM_LLIST_FIRST_NODE(&ricSubscriptionInfo->actionSequence, actionNode);
+ while(actionNode)
{
- if((ranFuncDb->pendingSubsRspInfo[idx].requestId.requestorId == ricReqId.requestorId) &&
- (ricSubscriptionInfo->requestId.instanceId == ricReqId.instanceId))
+ actionDb = (ActionInfo*)(actionNode->node);
+ if(actionDb->action == CONFIG_DEL)
{
- pendingSubsRsp = &ranFuncDb->pendingSubsRspInfo[idx];
- break;
+ macStatsDelete->statsGrpIdToBeDelList[actionIdx] = actionDb->actionId;
+ actionIdx++;
}
+ actionNode= actionNode->next;
}
+ macStatsDelete->numStatsGroupToBeDeleted=actionIdx;
+ }
- /* If no action is accepted
- * a. Remove subcription entry from RAN Function
- * b. Send RIC subscription failure */
- if(statsRsp->numGrpAccepted == 0)
- {
- duRejectAllStatsGroup(ranFuncDb, ricSubscriptionNode, statsRsp);
- }
- else
- {
- /* If even 1 action is accepted :
- *
- * For accepted groups:
- * Mark subscribed-action's -> action = CONFIG_UNKNOWN
- * Add to accepted-action-list of subscription response
- */
- for(idx=0; idx<statsRsp->numGrpAccepted; idx++)
- {
- actionId = statsRsp->statsGrpAcceptedList[idx];
- if((ricSubscriptionInfo->actionSequence[actionId-1].id == actionId) &&
- (ricSubscriptionInfo->actionSequence[actionId-1].action == CONFIG_ADD))
- {
- ricSubscriptionInfo->actionSequence[actionId-1].action = CONFIG_UNKNOWN;
+ DU_LOG("\nDEBUG --> DU_APP: Sending Statistics delete req to MAC ");
+ FILL_PST_DUAPP_TO_MAC(pst, EVENT_MAC_STATS_DELETE_REQ);
+
+ if( (*packMacStatsDeleteReqOpts[pst.selector])(&pst, macStatsDelete) != ROK)
+ {
+ DU_LOG("\nERROR --> DU_APP: Failed to send Statistics delete req to MAC");
+ DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, macStatsDelete, sizeof(MacStatsDeleteReq));
+ return RFAILED;
+ }
+
+ return ROK;
+}
- pendingSubsRsp->acceptedActionList[pendingSubsRsp->numOfAcceptedActions++] = actionId;
- }
- }
- /* For rejected groups:
- * Remove entry from DU's RAN Function->subscription->actionList
- * Add to rejected-action-list in subscription response
- */
- for(idx=0; idx<statsRsp->numGrpRejected; idx++)
- {
- actionId = statsRsp->statsGrpRejectedList[idx].groupId;
- if(ricSubscriptionInfo->actionSequence[actionId-1].id == actionId)
- {
- memset(&ricSubscriptionInfo->actionSequence[actionId-1], 0, sizeof(ActionInfo));
- ricSubscriptionInfo->numOfActions--;
+/*******************************************************************
+ *
+ * @brief Statistics delete to DU layers
+ *
+ * @details
+ *
+ * Function : BuildAndSendStatsDeleteReq()
+ *
+ * Functionality: Statistics delete to DU layers
+ *
+ * @params[in]
+ * Subscription Info
+ * delete All Stats
+ *
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildAndSendStatsDeleteReq(RicSubscription *ricSubscriptionInfo, bool deleteAllStats)
+{
+ /* Build and sent subscription information to MAC in Statistics delete */
+ if(BuildAndSendStatsDeleteReqToMac(ricSubscriptionInfo, deleteAllStats) != ROK)
+ {
+ DU_LOG("\nERROR --> DU_APP : Failed at BuildAndSendStatsDeleteReqToMac()");
+ return RFAILED;
+ }
+ return ROK;
+}
- pendingSubsRsp->rejectedActionList[pendingSubsRsp->numOfRejectedActions].id = actionId;
- convertDuCauseToE2Cause(statsRsp->statsGrpRejectedList[idx].cause, \
- &pendingSubsRsp->rejectedActionList[pendingSubsRsp->numOfRejectedActions].failureCause);
- pendingSubsRsp->numOfRejectedActions++;
- }
- }
-
- /* Send subscription response with accepted and rejected action lists to
- * RIC */
- BuildAndSendRicSubscriptionRsp(pendingSubsRsp);
- }
+ /*******************************************************************
+ *
+ * @brief Send Statistics Modification request to MAC
+ *
+ * @details
+ *
+ * Function : BuildAndSendStatsModificationReqToMac()
+ *
+ * Functionality: Send Statistics Modification Request To Mac
+ *
+ * @params[in] Ric subscription info
+ *
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildAndSendStatsModificationReqToMac(RicSubscription *ricSubscriptionInfo)
+{
+ Pst pst;
+ MacStatsModificationReq *macStatsModificationReq = NULLP;
- memset(pendingSubsRsp, 0, sizeof(PendingSubsRspInfo));
- DU_FREE_SHRABL_BUF(pst->region, pst->pool, statsRsp, sizeof(MacStatsRsp));
- return ROK;
+ /* Fill MAC statistics modification request */
+ DU_ALLOC_SHRABL_BUF(macStatsModificationReq, sizeof(MacStatsModificationReq));
+ if(macStatsModificationReq == NULLP)
+ {
+ DU_LOG("\nERROR --> DU_APP : Memory allocation failed for macStatsModificationReq in BuildAndSendStatsModificationReqToMac");
+ return RFAILED;
}
- DU_LOG("\nERROR --> DU_APP : DuProcMacStatsRsp: Received NULL Pointer");
+ /* Fill E2 Subscription Info in MAC Statistics Modification Request and send to MAC */
+ if(fillRicSubsInMacStatsModificationReq(macStatsModificationReq, ricSubscriptionInfo) == ROK)
+ {
+ DU_LOG("\nDEBUG --> DU_APP: Sending Statistics Modification Request to MAC ");
+ FILL_PST_DUAPP_TO_MAC(pst, EVENT_MAC_STATISTICS_MODIFY_REQ);
+
+ if( (*packMacStatsModificationReqOpts[pst.selector])(&pst, macStatsModificationReq) == ROK)
+ return ROK;
+
+ DU_LOG("\nERROR --> DU_APP: Failed to send Statistics Modification Request to MAC");
+ }
+
+ DU_LOG("\nERROR --> DU_APP: No Statistics group found valid. Hence statistics Modification request is not sent to MAC");
+ DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, macStatsModificationReq, sizeof(MacStatsModificationReq));
return RFAILED;
}
/*******************************************************************
*
- * @brief Process statistics indication from MAC
+ * @brief Send Statistics Modification request to DU layers
*
* @details
*
- * Function : DuProcMacStatsInd
+ * Function : BuildAndSendStatsModificationReq()
*
- * Functionality: Processes statistics indication from MAC.
+ * Functionality: Check if there is an update in statistics
+ * reporting configuration. If so, send the update Modification to
+ * respective layer.
+ *
+ * @params[in] Subscription Info
+ *
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildAndSendStatsModificationReq(RicSubscription *ricSubscriptionInfo)
+{
+ /* Build and sent subscription information to MAC in Statistics Modification Request */
+ if(BuildAndSendStatsModificationReqToMac(ricSubscriptionInfo) != ROK)
+ {
+ DU_LOG("\nERROR --> DU_APP : Failed at BuildAndSendStatsModificationReqToMac()");
+ return RFAILED;
+ }
+
+ return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Process statistics modification response from MAC
+ *
+ * @details
+ *
+ * Function : DuProcMacStatsModificationRsp
+ *
+ * Functionality: Processes statistics modification configuration
+ * response from MAC. If configuration is succsessful, DUAPP starts
+ * reporting period timer for this subscription request
+ * from RIC
*
* @params[in]
+ * PST structure
+ * MAC stats modification rsp
*
* @return ROK - success
* RFAILED - failure
*
* ****************************************************************/
-uint8_t DuProcMacStatsInd(Pst *pst, MacStatsInd *statsInd)
+uint8_t DuProcMacStatsModificationRsp(Pst *pst, MacStatsModificationRsp *statsModificationRsp)
{
- if(statsInd)
+ uint8_t ret = RFAILED;
+ DU_LOG("\nINFO --> DU_APP : DuProcMacStatsModificationRsp: Received Statistics Modification Response from MAC");
+
+ if(statsModificationRsp)
{
-#ifdef DEBUG_PRINT
- DU_LOG("\nDEBUG --> DU_APP : DuProcMacStatsInd: Received Statistics Indication");
- DU_LOG("\n Subscription Id [%ld]", statsInd->subscriptionId);
- DU_LOG("\n Group Id [%d]", statsInd->groupId);
- for(int idx = 0; idx < statsInd->numStats; idx++)
+#ifdef DEBUG_PRINT
+ uint8_t idx = 0;
+ DU_LOG("\n Subscription Id [%ld]", statsModificationRsp->subscriptionId);
+
+ DU_LOG("\n Number of Accepted Groups [%d]", statsModificationRsp->numGrpAccepted);
+ for(idx=0; idx<statsModificationRsp->numGrpAccepted; idx++)
{
- DU_LOG("\n Meas type [%d] Meas Value [%lf]", statsInd->measuredStatsList[idx].type,\
- statsInd->measuredStatsList[idx].value);
+ DU_LOG("\n Group Id [%d]", statsModificationRsp->statsGrpAcceptedList[idx]);
}
-#endif
-
- /* TODO : When stats indication is received
- * DU APP searches for the message type in E2AP RIC subscription database
- * and stores in the value in the list of subscribed measurements
- *
- * This will be implemented in next gerrit.
- */
- DU_FREE_SHRABL_BUF(pst->region, pst->pool, statsInd, sizeof(MacStatsInd));
- return ROK;
+ DU_LOG("\n Number of Rejected Groups [%d]", statsModificationRsp->numGrpRejected);
+ for(idx=0; idx<statsModificationRsp->numGrpRejected; idx++)
+ {
+ DU_LOG("\n Group Id [%d]", statsModificationRsp->statsGrpRejectedList[idx].groupId);
+ }
+#endif
+ if((ret = e2ProcStatsModificationRsp(statsModificationRsp)) != ROK)
+ {
+ DU_LOG("\nERROR --> DU_APP : DuProcMacStatsModificationRsp: Failed in %s at line %d", __func__, __LINE__);
+ }
+ DU_FREE_SHRABL_BUF(pst->region, pst->pool, statsModificationRsp, sizeof(MacStatsModificationRsp));
}
-
- DU_LOG("\nINFO --> DU_APP : DuProcMacStatsInd: Received NULL Pointer");
- return RFAILED;
+ else
+ {
+ DU_LOG("\nERROR --> DU_APP : DuProcMacStatsModificationRsp: Received NULL Pointer");
+ }
+ return ret;
}
/**********************************************************************