X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_msg_hdl.c;h=a99b7dbc8d64f3d7281d2d929fd481ab4229dac0;hb=refs%2Fchanges%2F33%2F11833%2F5;hp=e29aa3b0dec6bdd419fc5c67e4b96ea78c8ca238;hpb=f73456bd55152c329601f8286ae67fe9875025bc;p=o-du%2Fl2.git diff --git a/src/du_app/du_msg_hdl.c b/src/du_app/du_msg_hdl.c index e29aa3b0d..a99b7dbc8 100644 --- a/src/du_app/du_msg_hdl.c +++ b/src/du_app/du_msg_hdl.c @@ -29,6 +29,7 @@ #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" @@ -2093,128 +2094,182 @@ uint8_t DuProcRlcSliceMetrics(Pst *pst, SlicePmList *sliceStats) * RFAILED - failure * * ****************************************************************/ -uint8_t BuildAndSendStatsReqToMac(MacStatsReq duMacStatsReq) +uint8_t BuildAndSendStatsReqToMac(RicSubscription *ricSubscriptionInfo) { Pst pst; MacStatsReq *macStatsReq = NULLP; - - DU_LOG("\nINFO --> DU_APP : Builds Statistics Request to send to MAC"); + /* Fill MAC statistics request */ DU_ALLOC_SHRABL_BUF(macStatsReq, sizeof(MacStatsReq)); if(macStatsReq == NULLP) { DU_LOG("\nERROR --> DU_APP : Memory allocation failed for macStatsReq in BuildAndSendStatsReqToMac"); return RFAILED; } - else - { - memcpy(macStatsReq, &duMacStatsReq, sizeof(MacStatsReq)); + /* 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); - DU_LOG("\nDEBUG --> DU_APP: Sending Statistics Request to MAC "); - if( (*packMacStatsReqOpts[pst.selector])(&pst, macStatsReq) == RFAILED) - { - DU_LOG("\nERROR --> DU_APP: Failed to send Statistics Request to MAC"); - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, macStatsReq, sizeof(MacStatsReq)); - return RFAILED; - } + if( (*packMacStatsReqOpts[pst.selector])(&pst, macStatsReq) == ROK) + return ROK; + + DU_LOG("\nERROR --> DU_APP: Failed to send Statistics Request to MAC"); } - return ROK; + + DU_LOG("\nERROR --> DU_APP: No Statistics group found valid. Hence statistics request is not sent to MAC"); + DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, macStatsReq, sizeof(MacStatsReq)); + return RFAILED; } /******************************************************************* * - * @brief Fetch statistics details from Action Definition Format 1 + * @brief Send Statistics request to DU layers * * @details * - * Function : FetchStatsFromActionDefFormat1() - * - * Functionality: Fetch statistics details from Action - * Definition Format 1 received in an E2 message from - * RIC. + * Function : BuildAndSendStatsReq() * - * @params[in] ActionDefFormat1 + * Functionality: Check if there is an update in statistics + * reporting configuration. If so, send the update to + * respective layer. * - * @return Statistics + * @params[in] Subscription Info + * + * @return ROK - success + * RFAILED - failure * * ****************************************************************/ -Statistics FetchStatsFromActionDefFormat1(ActionDefFormat1 format1) +uint8_t BuildAndSendStatsReq(RicSubscription *ricSubscriptionInfo) { - 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 */ + /* Build and sent subscription information to MAC in Statistics Request */ + if(BuildAndSendStatsReqToMac(ricSubscriptionInfo) != ROK) + { + DU_LOG("\nERROR --> DU_APP : Failed at BuildAndSendStatsReqToMac()"); + return RFAILED; + } - /* Hardcoding values for now for testing purpose - * Will be removed in next gerrit */ - stats.macStatsReq.numStats = 2; - stats.macStatsReq.statsList[0].type = MAC_DL_TOTAL_PRB_USAGE; - stats.macStatsReq.statsList[0].periodicity = 100; - stats.macStatsReq.statsList[1].type = MAC_UL_TOTAL_PRB_USAGE; - stats.macStatsReq.statsList[1].periodicity = 100; +/* TODO : When KPI collection from RLC will be supported, this function will be + * called to configure KPIs to be colled */ +#if 0 + if(BuildAndSendStatsReqToRlc() != ROK) + { + DU_LOG("\nERROR --> DU_APP : Failed at BuildAndSendStatsReqToRlc()"); + return RFAILED; + } +#endif - return stats; + return ROK; } /******************************************************************* * - * @brief Send Statistics request to DU layers + * @brief Process statistics response from MAC * * @details * - * Function : BuildAndSendStatsReq() + * Function : DuProcMacStatsRsp * - * Functionality: Check if there is an update in statistics - * reporting configuration. If so, send the update to - * respective layer. + * Functionality: Processes statistics configuration response + * from MAC. If configuration is succsessful, DUAPP starts + * reporting period timer for this subscription request + * from RIC * * @params[in] - * + * * @return ROK - success * RFAILED - failure * * ****************************************************************/ -uint8_t BuildAndSendStatsReq(ActionDefinition subscribedAction) +uint8_t DuProcMacStatsRsp(Pst *pst, MacStatsRsp *statsRsp) { - Statistics stats; + uint8_t ret = RFAILED; + DU_LOG("\nINFO --> DU_APP : DuProcMacStatsRsp: Received Statistics Response from MAC"); - switch(subscribedAction.styleType) + if(statsRsp) { - case 1: - stats = FetchStatsFromActionDefFormat1(subscribedAction.choice.format1); - case 2: - case 3: - case 4: - case 5: - default: - 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; idxnumGrpAccepted; idx++) + { + DU_LOG("\n Group Id [%d]", statsRsp->statsGrpAcceptedList[idx]); + } - if(BuildAndSendStatsReqToMac(stats.macStatsReq) != ROK) + DU_LOG("\n Number of Rejected Groups [%d]", statsRsp->numGrpRejected); + for(idx=0; idxnumGrpRejected; 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 : Failed at BuildAndSendStatsReqToMac()"); - return RFAILED; + DU_LOG("\nERROR --> DU_APP : DuProcMacStatsRsp: Received NULL Pointer"); } + return ret; +} -/* TODO : When KPI collection from RLC will be supported, this function will be - * called to configure KPIs to be colled */ -#if 0 - if(BuildAndSendStatsReqToRlc(macStatsReq->rlcStatsReq) != ROK) +/******************************************************************* + * + * @brief Process statistics indication from MAC + * + * @details + * + * Function : DuProcMacStatsInd + * + * Functionality: Processes statistics indication from MAC. + * + * @params[in] + * + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t DuProcMacStatsInd(Pst *pst, MacStatsInd *statsInd) +{ + uint8_t ret = RFAILED; + + if(statsInd) { - DU_LOG("\nERROR --> DU_APP : Failed at BuildAndSendStatsReqToRlc()"); - return RFAILED; - } -#endif +#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 - /* TODO : In the caller of this function, change ActionDefinition->action - * from CONFIG_ADD to CONFIG_UNKNOWN once configuration is sent - * To be done 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__); + } - return ROK; + /* 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; } /**********************************************************************