X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_msg_hdl.c;h=c7d532852d9919a7e0067208f447e3eb2dffad8f;hb=refs%2Fchanges%2F36%2F11836%2F4;hp=644494300bd104e862f2f2908386fbff1fda4894;hpb=b3d5c17f74361fcdcb9b9febff450292197e3a57;p=o-du%2Fl2.git

diff --git a/src/du_app/du_msg_hdl.c b/src/du_app/du_msg_hdl.c
index 644494300..c7d532852 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,72 +2094,34 @@ uint8_t DuProcRlcSliceMetrics(Pst *pst, SlicePmList *sliceStats)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildAndSendStatsReqToMac(MacStatsReq duMacStatsReq)
+uint8_t BuildAndSendStatsReqToMac(uint16_t ranFuncId, 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, ranFuncId, 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;  
-}
 
-/*******************************************************************
- *
- * @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;
+   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;
 }
 
 /*******************************************************************
@@ -2173,29 +2136,16 @@ Statistics FetchStatsFromActionDefFormat1(ActionDefFormat1 format1)
  *       reporting configuration. If so, send the update to 
  *       respective layer.
  *
- * @params[in]
+ * @params[in] Subscription Info
  *             
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildAndSendStatsReq(ActionDefinition subscribedAction)
+uint8_t BuildAndSendStatsReq(uint16_t ranFuncId, RicSubscription *ricSubscriptionInfo)
 {
-   Statistics stats;
-
-   switch(subscribedAction.styleType)
-   {
-      case 1:
-         stats = FetchStatsFromActionDefFormat1(subscribedAction.choice.format1);
-      case 2:
-      case 3:
-      case 4:
-      case 5:
-      default:
-         break;
-   }
-
-   if(BuildAndSendStatsReqToMac(stats.macStatsReq) != ROK)
+   /* Build and sent subscription information to MAC in Statistics Request */
+   if(BuildAndSendStatsReqToMac(ranFuncId, ricSubscriptionInfo) != ROK)
    {
       DU_LOG("\nERROR  -->  DU_APP : Failed at BuildAndSendStatsReqToMac()");
       return RFAILED;   
@@ -2204,18 +2154,13 @@ uint8_t BuildAndSendStatsReq(ActionDefinition subscribedAction)
 /* 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)
+   if(BuildAndSendStatsReqToRlc() != ROK)
    {
-       DU_LOG("\nERROR  -->  DU_APP : Failed at BuildAndSendStatsReqToRlc()");
-       return RFAILED;
+      DU_LOG("\nERROR  -->  DU_APP : Failed at BuildAndSendStatsReqToRlc()");
+      return RFAILED;
    }
 #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*/
-    
-
    return ROK;
 }
 
@@ -2240,13 +2185,12 @@ uint8_t BuildAndSendStatsReq(ActionDefinition subscribedAction)
  * ****************************************************************/
 uint8_t DuProcMacStatsRsp(Pst *pst, MacStatsRsp *statsRsp)
 {
-   uint8_t idx = 0;
-
    DU_LOG("\nINFO  -->  DU_APP : DuProcMacStatsRsp: Received Statistics Response from MAC");
 
    if(statsRsp)
    {
 #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);
@@ -2258,10 +2202,14 @@ uint8_t DuProcMacStatsRsp(Pst *pst, MacStatsRsp *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      
 
+      /* Check the list of accepted and rejected statistics group and send
+       * Ric subscription response/failure accordingly */
+      e2ProcStatsRsp(statsRsp);
+
       DU_FREE_SHRABL_BUF(pst->region, pst->pool, statsRsp, sizeof(MacStatsRsp));
       return ROK;
    }
@@ -2301,13 +2249,10 @@ uint8_t DuProcMacStatsInd(Pst *pst, MacStatsInd *statsInd)
       }
 #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 */
+      e2ProcStatsInd(statsInd);
 
+      /* Free statistics indication */
       DU_FREE_SHRABL_BUF(pst->region, pst->pool, statsInd, sizeof(MacStatsInd));
       return ROK;
    }