X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fdu_app%2Fdu_cell_mgr.c;h=a06b642a5684221fd2bad56db5a34749d0ac98e1;hb=b92944068f8a7b643b333515e424517db4192b61;hp=e1f166e936216e959f1e023ec151518dbd672ba0;hpb=3eceb3e5eb30b6df9f674f76b9e7b4e936e5be06;p=o-du%2Fl2.git

diff --git a/src/du_app/du_cell_mgr.c b/src/du_app/du_cell_mgr.c
index e1f166e93..a06b642a5 100644
--- a/src/du_app/du_cell_mgr.c
+++ b/src/du_app/du_cell_mgr.c
@@ -28,8 +28,15 @@
 #include "du_app_rlc_inf.h"
 #include "du_cfg.h"
 #include "du_mgr.h"
+#include "du_utils.h"
 #include "du_cell_mgr.h"
 
+#ifdef O1_ENABLE
+ 
+#include "AlarmInterface.h"
+  
+#endif
+
 /*******************************************************************
  *
  * @brief Processes cells to be activated
@@ -46,36 +53,40 @@
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t duProcCellsToBeActivated(uint16_t nci, uint16_t nRPci)
+uint8_t duProcCellsToBeActivated(uint8_t *plmnStr, uint16_t nci, uint16_t nRPci)
 {
    uint8_t ret = ROK;
    DuCellCb *cellCb = NULLP;
+   uint8_t cfgIdx, tmpPlmn[4];
 
-   cellCb = duCb.cfgCellLst[nci-1];
-
-   if(!cellCb)
+   for(cfgIdx=0; cfgIdx<duCb.numCfgCells; cfgIdx++)
    {
-      DU_LOG("\nDU APP : No Cell found for NCI %d", nci);
-      return RFAILED;
+      memset(tmpPlmn, 0, 4);
+      buildPlmnId(duCb.cfgCellLst[cfgIdx]->cellInfo.nrEcgi.plmn, tmpPlmn);
+      if(duCb.cfgCellLst[cfgIdx]->cellInfo.nrEcgi.cellId == nci &&
+	    (strcmp((const char*)tmpPlmn, (const char*)plmnStr) == 0))
+      {
+	 cellCb = duCb.cfgCellLst[cfgIdx];
+	 break;
+      }
+      else
+      {
+	 DU_LOG("\nERROR  -->  DU APP : No Cell found for NCI %d", nci);
+	 return RFAILED;
+      }
    }
 
    cellCb->cellStatus = ACTIVATION_IN_PROGRESS; 
    cellCb->cellInfo.nrPci = nRPci;
 
-   /* Now remove this cell from configured list and move to active list */
-   duCb.cfgCellLst[nci-1] = NULL;
-   duCb.actvCellLst[nci-1] = cellCb;
-   duCb.numActvCells++;
-   /* Build and send Mac Cell Cfg for the number of active cells */
-   ret = duBuildAndSendMacCellCfg();
-   if(ret != ROK)
+   duCb.actvCellLst[duCb.numActvCells++] = cellCb;
+
+   if(duBuildAndSendMacCellCfg(cellCb->cellId) != ROK)
    {
-      DU_LOG("\nDU APP : MacCellCfg build and send failed at procCellsToBeActivated()");
-      /* Move cellCb back to cfgCellList */
-      duCb.cfgCellLst[nci-1] = duCb.actvCellLst[nci-1];
-      duCb.actvCellLst[nci-1] = NULLP;
-      duCb.numActvCells--;
-      return RFAILED;
+      DU_LOG("\nERROR  -->  DU APP : macCellCfg build and send failed");
+      /* Delete cell from actvCellList */
+      duCb.actvCellLst[--(duCb.numActvCells)] = NULLP;
+      ret = RFAILED;
    }
    return ret;
 }
@@ -97,7 +108,7 @@ uint8_t duProcCellsToBeActivated(uint16_t nci, uint16_t nRPci)
  ******************************************************************/
 void duProcF1SetupRsp()
 {
-   DU_LOG("\nDU_APP : F1 Setup Response received");
+   DU_LOG("\nINFO   -->  DU_APP : F1 Setup Response received");
    duCb.f1Status = TRUE; //Set F1 status as true
 }
 
@@ -118,7 +129,86 @@ void duProcF1SetupRsp()
  ******************************************************************/
 void duProcGnbDuCfgUpdAckMsg()
 {
-   DU_LOG("\nDU APP: GNB-DU config update Ack received ");
+   DU_LOG("\nINFO   -->  DU APP: GNB-DU config update Ack received ");
+}
+/*******************************************************************
+*
+* @brief Returns cellCb based on cell ID
+*
+* @details
+*
+*    Function : duGetCellCb
+*
+*    Functionality: Returns DU APP CellCb based on cell ID
+*
+* @params[in] F1AP_PDU_t ASN decoded F1AP message
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+uint8_t duGetCellCb(uint16_t cellId, DuCellCb **cellCb)
+{
+   uint8_t cellIdx = 0;
+   for(cellIdx=0; cellIdx<duCb.numActvCells; cellIdx++)
+   {
+      if(duCb.actvCellLst[cellIdx]->cellId == cellId)
+         *cellCb = duCb.actvCellLst[cellIdx];
+	 break;
+   }
+
+   if(!*cellCb)
+   {
+      DU_LOG("\nERROR  -->  DU APP : Cell Id %d not found in DU APP", cellId);
+      return RFAILED;
+   }
+
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Handles cell up indication from MAC
+ *
+ * @details
+ *
+ *    Function : duHandleCellUpInd
+ *
+ *    Functionality:
+ *      Handles cell up indication from MAC
+ *
+ * @params[in] Post structure pointer
+ *             cell Up info
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t duHandleCellUpInd(Pst *pst, OduCellId *cellId)
+{
+   DuCellCb *cellCb = NULLP;
+
+   if(cellId->cellId <=0 || cellId->cellId > MAX_NUM_CELL)
+   {
+      DU_LOG("\nERROR  -->  DU APP : Invalid Cell Id %d in duHandleCellUpInd()", cellId->cellId);
+      return RFAILED;
+   }
+
+   if(duGetCellCb(cellId->cellId, &cellCb) != ROK)
+      return RFAILED;
+
+   if((cellCb != NULL) && (cellCb->cellStatus == ACTIVATION_IN_PROGRESS))
+   {
+      DU_LOG("\nINFO   -->  DU APP : 5G-NR Cell %d is UP", cellId->cellId);
+      cellCb->cellStatus = ACTIVATED;
+
+#ifdef O1_ENABLE
+      DU_LOG("\nINFO   -->  DU APP : Raise cell UP alarm for cell id=%d", cellId->cellId);
+      raiseCellAlrm(CELL_UP_ALARM_ID, cellId->cellId);
+#endif
+   }
+
+   if((pst->selector == ODU_SELECTOR_LWLC) || (pst->selector == ODU_SELECTOR_TC))
+      DU_FREE_SHRABL_BUF(pst->region, pst->pool, cellId, sizeof(OduCellId));
+   return ROK;
 }
 
 /**********************************************************************