#include "du_app_mac_inf.h"
#include "du_app_rlc_inf.h"
#include "du_e2ap_mgr.h"
+#include "du_e2ap_msg_hdl.h"
#include "du_cfg.h"
#include "du_app_rlc_inf.h"
#include "du_mgr.h"
#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
*
* 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;
* ****************************************************************/
uint8_t DuProcMacStatsRsp(Pst *pst, MacStatsRsp *statsRsp)
{
+ uint8_t ret = RFAILED;
DU_LOG("\nINFO --> DU_APP : DuProcMacStatsRsp: Received Statistics Response from MAC");
if(statsRsp)
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]);
+ DU_LOG("\n Group Id [%d]", statsRsp->statsGrpRejectedList[idx].groupId);
}
#endif
-
- /* TODO :
- * For accepted groups:
- * Mark scubscrbed-action's -> action = CONFIG_UNKNOWN
- * Add action ID to accpeted-action-list in Subscription response
- *
- * For rejected groups:
- * Remove entry from DU's RAN Function->subscription->actionList
- * Add Rejected action Id to reject-action-list created by DU APP while
- * processing of subscription request.
- *
- * Send subscription response with accepted and rejected action lists to
- * RIC
- */
+
+ /* 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));
- return ROK;
}
-
- DU_LOG("\nERROR --> DU_APP : DuProcMacStatsRsp: Received NULL Pointer");
- return RFAILED;
+ else
+ {
+ DU_LOG("\nERROR --> DU_APP : DuProcMacStatsRsp: Received NULL Pointer");
+ }
+ return ret;
}
/*******************************************************************
* ****************************************************************/
uint8_t DuProcMacStatsInd(Pst *pst, MacStatsInd *statsInd)
{
+ uint8_t ret = RFAILED;
+
if(statsInd)
{
#ifdef DEBUG_PRINT
}
#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.
- */
+ /* 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__);
+ }
+ /* Free statistics indication */
DU_FREE_SHRABL_BUF(pst->region, pst->pool, statsInd, sizeof(MacStatsInd));
- return ROK;
+ }
+ else
+ {
+ DU_LOG("\nINFO --> DU_APP : DuProcMacStatsInd: Received NULL Pointer");
+ }
+ return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief Process statistics delete response from MAC
+ *
+ * @details
+ *
+ * Function : DuProcMacStatsDeleteRsp
+ *
+ * Functionality: Processes statistics delete response
+ * from MAC.
+
+ * @params[in]
+ * Pst Information
+ * Mac stats delete rsp
+ *
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t DuProcMacStatsDeleteRsp(Pst *pst, MacStatsDeleteRsp *statsDeleteRsp)
+{
+ uint8_t ret = RFAILED;
+ DU_LOG("\nINFO --> DU_APP : DuProcMacStatsDeleteRsp: Received Statistics Response from MAC");
+
+ if(statsDeleteRsp)
+ {
+ /* 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)
+ {
+ if((ret = e2ProcStatsDeleteRsp(statsDeleteRsp)) != ROK)
+ {
+ DU_LOG("\nINFO --> DU_APP : Failed in %s at line %d", __func__, __LINE__);
+ }
+ }
+ else
+ {
+ if((ret = e2ProcActionDeleteRsp(statsDeleteRsp)) != ROK)
+ {
+ DU_LOG("\nINFO --> DU_APP : Failed in %s at line %d", __func__, __LINE__);
+ }
+ }
+ 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;
+
+ /* 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 --> E2AP : e2ProcStatsDeleteRsp: failed to build and send ric subs delete failure");
+ return RFAILED;
+ }
+ 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)
+ {
+ actionDb = (ActionInfo*)(actionNode->node);
+ if(actionDb->action == CONFIG_DEL)
+ {
+ macStatsDelete->statsGrpIdToBeDelList[actionIdx] = actionDb->actionId;
+ actionIdx++;
+ }
+ actionNode= actionNode->next;
+ }
+ macStatsDelete->numStatsGroupToBeDeleted=actionIdx;
+ }
+
+ 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;
}
- DU_LOG("\nINFO --> DU_APP : DuProcMacStatsInd: Received NULL Pointer");
+ return ROK;
+}
+
+
+/*******************************************************************
+ *
+ * @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;
+}
+
+ /*******************************************************************
+ *
+ * @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;
+
+ /* 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;
+ }
+
+ /* 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 Send Statistics Modification request to DU layers
+ *
+ * @details
+ *
+ * Function : BuildAndSendStatsModificationReq()
+ *
+ * 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 DuProcMacStatsModificationRsp(Pst *pst, MacStatsModificationRsp *statsModificationRsp)
+{
+ uint8_t ret = RFAILED;
+ DU_LOG("\nINFO --> DU_APP : DuProcMacStatsModificationRsp: Received Statistics Modification Response from MAC");
+
+ if(statsModificationRsp)
+ {
+#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 Group Id [%d]", statsModificationRsp->statsGrpAcceptedList[idx]);
+ }
+
+ 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));
+ }
+ else
+ {
+ DU_LOG("\nERROR --> DU_APP : DuProcMacStatsModificationRsp: Received NULL Pointer");
+ }
+ return ret;
+}
+
/**********************************************************************
End of file
**********************************************************************/
Code Review / o-du / l2.git / blobdiff