X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_msg_hdl.c;h=5a179322acb59d8d2aaae8ab88d647b2f1308228;hb=5256719522354a90ea688e9c95a1212d0104b34e;hp=1089a5ec15d5a76529d331211e022ac9f1a65245;hpb=ebe7300f91cb53117193fbec021b423013d1d6ef;p=o-du%2Fl2.git

diff --git a/src/du_app/du_msg_hdl.c b/src/du_app/du_msg_hdl.c
index 1089a5ec1..5a179322a 100644
--- a/src/du_app/du_msg_hdl.c
+++ b/src/du_app/du_msg_hdl.c
@@ -41,6 +41,7 @@
 #include "legtp.h"
 #include "du_utils.h"
 #include "du_cell_mgr.h" 
+#include "du_msg_hdl.h"
 
 #ifdef O1_ENABLE
 
@@ -57,17 +58,6 @@ uint8_t numRlcMacSaps = 0;
 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);
-uint8_t BuildAndSendStatsDeleteReq(RicSubscription *ricSubscriptionInfo);
-
 packMacCellCfgReq packMacCellCfgOpts[] =
 {
    packMacCellCfg, /* packing for loosely coupled */
@@ -152,7 +142,7 @@ uint8_t duBuildRlcCfg(Inst inst)
    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) ?
@@ -405,9 +395,9 @@ uint8_t duProcCfgComplete()
             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++;
       }
@@ -2326,7 +2316,10 @@ uint8_t DuProcMacStatsDeleteRsp(Pst *pst, MacStatsDeleteRsp *statsDeleteRsp)
       }
       else
       {
-         /* TODO calling ric sub modification action to be deleted functions */
+         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));
    }
@@ -2398,6 +2391,7 @@ uint8_t BuildAndSendStatsDeleteReqToMac(RicSubscription *ricSubscriptionInfo, bo
             macStatsDelete->statsGrpIdToBeDelList[actionIdx] = actionDb->actionId;
             actionIdx++;
          }
+         actionNode= actionNode->next;
       }
       macStatsDelete->numStatsGroupToBeDeleted=actionIdx;
    }
@@ -2426,16 +2420,18 @@ uint8_t BuildAndSendStatsDeleteReqToMac(RicSubscription *ricSubscriptionInfo, bo
  *
  *    Functionality:  Statistics delete to DU layers
  *
- * @params[in] Subscription Info
+ * @params[in] 
+ *     Subscription Info
+ *     delete All Stats
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildAndSendStatsDeleteReq(RicSubscription *ricSubscriptionInfo)
+uint8_t BuildAndSendStatsDeleteReq(RicSubscription *ricSubscriptionInfo, bool deleteAllStats)
 {
    /* Build and sent subscription information to MAC in Statistics delete */
-   if(BuildAndSendStatsDeleteReqToMac(ricSubscriptionInfo, true) != ROK)
+   if(BuildAndSendStatsDeleteReqToMac(ricSubscriptionInfo, deleteAllStats) != ROK)
    {
       DU_LOG("\nERROR  -->  DU_APP : Failed at BuildAndSendStatsDeleteReqToMac()");
       return RFAILED;
@@ -2563,15 +2559,10 @@ uint8_t DuProcMacStatsModificationRsp(Pst *pst, MacStatsModificationRsp *statsMo
          DU_LOG("\n    Group Id [%d]", statsModificationRsp->statsGrpRejectedList[idx].groupId);
       }
 #endif
-#if 0
-      /*TODO*/
-      /* Check the list of accepted and rejected statistics group and send
-       * Ric subscription modification response/failure accordingly */
       if((ret = e2ProcStatsModificationRsp(statsModificationRsp)) != ROK)
       {
          DU_LOG("\nERROR  -->  DU_APP : DuProcMacStatsModificationRsp: Failed in %s at line %d", __func__, __LINE__);
       }
-#endif
       DU_FREE_SHRABL_BUF(pst->region, pst->pool, statsModificationRsp, sizeof(MacStatsModificationRsp));
    }
    else