[Epic-ID: ODUHIGH-516][Task-ID: 527] Implementation of E2 Node Configuration Update...
[o-du/l2.git] / src / du_app / du_e2ap_msg_hdl.c
index f13282f..8838d71 100644 (file)
 #include "E2SM-KPM-ActionDefinition.h"
 #include "E2SM-KPM-ActionDefinition-Format1.h"
 #include "MeasurementInfoItem.h"
+#include "RANfunctionsIDcause-List.h"
+
+/******************************************************************
+ *
+ * @brief Deallocation of memory allocated by aper decoder for e2 
+ * Config Update Failure
+ *
+ * @details
+ *
+ *    Function : freeAperDecodingOfE2Node Config UpdateFailure
+ *
+ *    Functionality: Deallocation of memory allocated by  aper decoder 
+ *    for e2 Config Update Failure
+ *
+ * @params[in] E2nodeConfigurationUpdateFailure_t to be deallocated 
+ * @return void
+ *
+ * ****************************************************************/
+
+void freeAperDecodingOfE2NodeConfigUpdateFailure(E2nodeConfigurationUpdateFailure_t *e2NodeCfgUpdFail)
+{
+   uint8_t arrIdx =0;
+
+   if(e2NodeCfgUpdFail)
+   {
+      if(e2NodeCfgUpdFail->protocolIEs.list.array)
+      {
+         for(arrIdx=0; arrIdx<e2NodeCfgUpdFail->protocolIEs.list.count; arrIdx++)
+         {
+            if(e2NodeCfgUpdFail->protocolIEs.list.array[arrIdx])
+            {
+               free(e2NodeCfgUpdFail->protocolIEs.list.array[arrIdx]);
+            }
+         }
+         free(e2NodeCfgUpdFail->protocolIEs.list.array);
+      }
+   }
+}
+
+/******************************************************************
+ *
+ * @brief Processes E2 Node Config Update Failure sent by RIC
+ *
+ * @details
+ *
+ *    Function : procE2NodeConfigUpdateFailure
+ *
+ *    Functionality: Processes E2 Node Config Update failure sent by RIC
+ *
+ * @params[in] E2AP_PDU_t ASN decoded E2AP message
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+void procE2NodeConfigUpdateFailure(E2AP_PDU_t *e2apMsg)
+{
+   uint8_t arrIdx =0, transId =0, timerValue=0;
+   E2nodeConfigurationUpdateFailure_t *e2NodeCfgUpdFail=NULL;
+
+   DU_LOG("\nINFO   -->  E2AP : E2 Node Config Update failure received");
+   e2NodeCfgUpdFail = &e2apMsg->choice.unsuccessfulOutcome->value.choice.E2nodeConfigurationUpdateFailure;
+
+   for(arrIdx=0; arrIdx<e2NodeCfgUpdFail->protocolIEs.list.count; arrIdx++)
+   {
+      switch(e2NodeCfgUpdFail->protocolIEs.list.array[arrIdx]->id)
+      {
+         case ProtocolIE_IDE2_id_TransactionID:
+            {
+               transId = e2NodeCfgUpdFail->protocolIEs.list.array[arrIdx]->value.choice.TransactionID;
+               if((duCb.e2apDb.e2TransInfo.e2InitTransaction[transId].transactionId == transId) &&\
+                     (duCb.e2apDb.e2TransInfo.e2InitTransaction[transId].procedureCode == e2apMsg->choice.unsuccessfulOutcome->procedureCode))
+               {
+                  memset(&duCb.e2apDb.e2TransInfo.e2InitTransaction[transId], 0, sizeof(E2TransInfo));
+               }
+               else
+               {
+                  DU_LOG("\nERROR  -->  E2AP : Invalid transaction id [%d]", transId);
+               }
+               break;
+         }
+         case ProtocolIE_IDE2_id_TimeToWaitE2:
+            {
+               timerValue = convertE2WaitTimerEnumToValue(e2NodeCfgUpdFail->protocolIEs.list.array[arrIdx]->value.choice.TimeToWaitE2);
+               if((duChkTmr((PTR)&(duCb.e2apDb), EVENT_E2_NODE_CONFIG_UPDATE_TMR)) == FALSE)
+               {
+                  duStartTmr((PTR)&(duCb.e2apDb), EVENT_E2_NODE_CONFIG_UPDATE_TMR, timerValue);
+               }
+               else
+               {
+                  DU_LOG("\nERROR   -->  E2AP : EVENT_E2_NODE_CONFIG_UPDATE_TMR timer is already running");
+               }
+               break;
+            }
+      }
+   }
+
+   freeAperDecodingOfE2NodeConfigUpdateFailure(e2NodeCfgUpdFail);
+}
+
+/*******************************************************************
+ *
+ * @brief Fill E2 Failure Cause
+ *
+ * @details
+ *
+ *    Function : fillE2Cause
+ *
+ *    Functionality: Fill E2 Failure Cause
+ *
+ * @params[in] E2 Cause pointer to be filled in
+ *             E2 Cause to be filled from 
+ * @return void
+ *
+ ******************************************************************/
+void fillE2Cause(CauseE2_t *e2Cause, E2FailureCause failureCause)
+{
+   e2Cause->present = failureCause.causeType;
+   switch(e2Cause->present)
+   {
+      case CauseE2_PR_ricRequest:
+         {
+            e2Cause->choice.ricRequest = failureCause.cause;
+            break;
+         }
+      case CauseE2_PR_ricService:
+         {
+            e2Cause->choice.ricService = failureCause.cause;
+            break;
+         }
+      case CauseE2_PR_e2Node:
+         {
+            e2Cause->choice.e2Node = failureCause.cause;
+            break;
+         }
+      case CauseE2_PR_transport:
+         {
+            e2Cause->choice.transport = failureCause.cause;
+            break;
+         }
+      case CauseE2_PR_protocol:
+         {
+            e2Cause->choice.protocol = failureCause.cause;
+            break;
+         }
+      case CauseE2_PR_misc:
+         {
+            e2Cause->choice.misc = failureCause.cause;
+            break;
+         }
+      case CauseE2_PR_NOTHING:
+      default:
+         break;
+   }
+}
 
 /*******************************************************************
  *
@@ -129,39 +284,143 @@ uint8_t BuildGlobalgNBId(GlobalE2node_gNB_ID_t *gNbId)
    return ret;
 }
 
-/******************************************************************
+/*******************************************************************
  *
- * @brief Search E2 node component with the help of action type
+ * @brief fill the E2 node config information
  *
  * @details
  *
- *    Function : searchE2NodeComponentInfo 
+ *    Function : fillE2NodeConfig
  *
- *    Functionality: Search E2 node component with the help of action type 
+ *    Functionality: fill E2 node config information
  *
- * @params[in] uint8_t componentActionType
- * @return CmLList
+ * @params[in]  
+ *       Pointer to e2NodeCfg to be filled
+ *       E2 Node Component information
+ *       Type of configuration 
+ * @return ROK     - success
+ *         RFAILED - failure
  *
- * ****************************************************************/
+ ******************************************************************/
 
-CmLList *searchE2NodeComponentInfo(InterfaceType interfaceType, uint8_t componentActionType)
+uint8_t fillE2NodeConfig(PTR e2NodeCfg, E2NodeComponent *e2NodeComponentInfo, ConfigType configType)
 {
-   E2NodeComponent *e2NodeComponentInfo;
-   CmLList         *node;
+   E2nodeComponentInterfaceType_t *interfaceType=NULLP;
+   E2nodeComponentID_t *componentID =NULLP;
+   E2nodeComponentConfiguration_t *configuration=NULLP;
+   E2nodeComponentConfigAddition_Item_t *e2NodeAddItem=NULL;
+   E2nodeComponentConfigUpdate_Item_t *e2NodeUpdateItem =NULL;
+   E2nodeComponentConfigRemoval_Item_t *e2NodeRemovalItem=NULL;
+   
+   switch(configType)
+   {
+      case CONFIG_ADD:
+      {
+         e2NodeAddItem = (E2nodeComponentConfigAddition_Item_t*)e2NodeCfg;
+         interfaceType = &e2NodeAddItem->e2nodeComponentInterfaceType;
+         componentID   = &e2NodeAddItem->e2nodeComponentID;
+         configuration = &e2NodeAddItem->e2nodeComponentConfiguration; 
+         break;
+      }
+      case CONFIG_MOD:
+      {
+         e2NodeUpdateItem = (E2nodeComponentConfigUpdate_Item_t *) e2NodeCfg;
+         interfaceType = &e2NodeUpdateItem->e2nodeComponentInterfaceType;
+         componentID   = &e2NodeUpdateItem->e2nodeComponentID;
+         configuration = &e2NodeUpdateItem->e2nodeComponentConfiguration; 
+         break;
+      }
+      case CONFIG_DEL:
+      {
+         e2NodeRemovalItem = (E2nodeComponentConfigRemoval_Item_t*) e2NodeCfg;
+         interfaceType = &e2NodeRemovalItem->e2nodeComponentInterfaceType;
+         componentID  = &e2NodeRemovalItem->e2nodeComponentID;
+         break;
+      }
+      default:
+      {
+         DU_LOG("\nERROR  --> E2AP : Configuration type %d does not supported ", configType);
+         return RFAILED;
+      }
+   }
+   /* E2nodeComponentInterfaceType */
+   *interfaceType = convertInterfaceToE2ComponentInterfaceType(e2NodeComponentInfo->interfaceType);
+   
+   /*  We now only support the F1 interface out of these interfaces
+    * (NG,XN,E1,F1,W1,S1,X2), therefore only the F1 component identifier was filled in. */
+   
+   if(*interfaceType == F1)
+   {
+      /* E2 Node Component ID */
+      componentID->present = E2nodeComponentID_PR_e2nodeComponentInterfaceTypeF1;
+      DU_ALLOC(componentID->choice.e2nodeComponentInterfaceTypeF1,sizeof(E2nodeComponentInterfaceF1_t));
+      if(componentID->choice.e2nodeComponentInterfaceTypeF1 == NULLP)
+      {
+         DU_LOG("\nERROR  --> E2AP: Memory allocation failed in function %s at line %d",__func__,__LINE__);
+         return RFAILED;
+      }
+      componentID->choice.e2nodeComponentInterfaceTypeF1->gNB_DU_ID.size = sizeof(uint8_t);
+      DU_ALLOC(componentID->choice.e2nodeComponentInterfaceTypeF1->gNB_DU_ID.buf,\
+            componentID->choice.e2nodeComponentInterfaceTypeF1->gNB_DU_ID.size);
 
-   if(duCb.e2apDb.e2NodeComponentList.count)
+      if(componentID->choice.e2nodeComponentInterfaceTypeF1->gNB_DU_ID.buf == NULLP)
+      {
+         DU_LOG("\nERROR  --> E2AP: Memory allocation failed in function %s at line %d",__func__,__LINE__);
+         return RFAILED;
+      }
+      memcpy(componentID->choice.e2nodeComponentInterfaceTypeF1->gNB_DU_ID.buf, &e2NodeComponentInfo->componentId,\
+            componentID->choice.e2nodeComponentInterfaceTypeF1->gNB_DU_ID.size);
+   }
+  
+   if(configType == CONFIG_DEL)
    {
-      CM_LLIST_FIRST_NODE(&duCb.e2apDb.e2NodeComponentList, node);
-      while(node)
+      /* We don't need to fill out the E2 Node Component Request and Response
+       * information in the case of CONFIG_DEL, therefore returning ROK from here. */
+      return ROK;
+   }
+
+   /* E2 Node Component Request Part */
+   if(e2NodeComponentInfo->componentRequestPart)
+   {
+      configuration->e2nodeComponentRequestPart.size = e2NodeComponentInfo->reqBufSize ;
+      DU_ALLOC(configuration->e2nodeComponentRequestPart.buf,\
+            configuration->e2nodeComponentRequestPart.size);
+      if(configuration->e2nodeComponentRequestPart.buf == NULLP)
       {
-         e2NodeComponentInfo = (E2NodeComponent*)node->node;
-         if((e2NodeComponentInfo->interfaceType == interfaceType) && (e2NodeComponentInfo->componentActionType == componentActionType))
-            break;
-         else
-            node = node->next;
+         DU_LOG("\nERROR  --> E2AP: Memory allocation failed in function %s at line %d",__func__,__LINE__);
+         return RFAILED;
       }
+
+      memcpy(configuration->e2nodeComponentRequestPart.buf,\
+            e2NodeComponentInfo->componentRequestPart, configuration->\
+            e2nodeComponentRequestPart.size);
    }
-   return node; 
+   else
+   {
+      DU_LOG("\nERROR  --> E2AP: componentRequestPart is null ");
+      return RFAILED;
+   }
+
+   /* E2 Node Component Response Part */
+   if(e2NodeComponentInfo->componentResponsePart)
+   {
+      configuration->e2nodeComponentResponsePart.size = e2NodeComponentInfo->rspBufSize; 
+      DU_ALLOC(configuration->e2nodeComponentResponsePart.buf, configuration->e2nodeComponentResponsePart.size);
+      if(configuration->e2nodeComponentResponsePart.buf == NULLP)
+      {
+         DU_LOG("\nERROR  --> E2AP: Memory allocation failed in function %s at line %d",__func__,__LINE__);
+         return RFAILED;
+      }
+      memcpy(configuration->e2nodeComponentResponsePart.buf,  e2NodeComponentInfo->componentResponsePart, configuration->\
+            e2nodeComponentResponsePart.size);
+   }
+   else
+   {
+      DU_LOG("\nERROR  --> E2AP: componentResponsePart is null");
+      return RFAILED;
+   }
+   
+   return ROK;
 }
 
 /*******************************************************************
@@ -174,21 +433,36 @@ CmLList *searchE2NodeComponentInfo(InterfaceType interfaceType, uint8_t componen
  *
  *    Functionality: Building E2 node config addition list
  *
- * @params[in] E2nodeComponentConfigAddition_List_t *e2NodeAddList 
+ * @params[in] 
+ *    E2nodeComponentConfigAddition_List_t to be filled
+ *    Procedure Code
+ *    Count of E2 node to be added in the list    
+ *    Received list of E2 node configuration
+ *
  * @return ROK     - success
  *         RFAILED - failure
  *
  ******************************************************************/
 
-uint8_t BuildE2NodeConfigAddList(E2nodeComponentConfigAddition_List_t *e2NodeAddList)
+uint8_t BuildE2NodeConfigAddList(E2nodeComponentConfigAddition_List_t *e2NodeAddList, uint8_t procedureCode, uint16_t count, E2NodeConfigItem *e2NodeList)
 {
    uint8_t arrIdx = 0;
-   CmLList         *node;
-   E2NodeComponent *e2NodeComponentInfo;
-   E2nodeComponentConfigAddition_ItemIEs_t *e2NodeAddItemIe;
-   E2nodeComponentConfigAddition_Item_t *e2NodeAddItem;
+   CmLList         *node =NULL;
+   E2NodeComponent *e2NodeComponentInfo=NULL;
+   E2nodeComponentConfigAddition_ItemIEs_t *e2NodeAddItemIe=NULL;
+   E2nodeComponentConfigAddition_Item_t *e2NodeAddItem=NULL;
+   
+
+   /* For ProcedureCodeE2_id_E2setup, the number of E2 node configuration list items is
+    * equal to the number of E2 node configuration entries stored in the database.
+    * For any other procedure, the E2 node configuration list count is equal
+    * to the count of E2 node configuration obtained from the function's caller */
+
+   if(procedureCode == ProcedureCodeE2_id_E2setup)
+      e2NodeAddList->list.count = duCb.e2apDb.e2NodeComponentList.count;
+   else
+      e2NodeAddList->list.count = count;
 
-   e2NodeAddList->list.count = 1;
    e2NodeAddList->list.size = e2NodeAddList->list.count * sizeof(E2nodeComponentConfigAddition_ItemIEs_t *);
    DU_ALLOC(e2NodeAddList->list.array, e2NodeAddList->list.size);
    if(e2NodeAddList->list.array == NULLP)
@@ -205,93 +479,190 @@ uint8_t BuildE2NodeConfigAddList(E2nodeComponentConfigAddition_List_t *e2NodeAdd
          DU_LOG("\nERROR  --> E2AP: Memory allocation failed for BuildE2NodeConfigAddList %d",__LINE__);
          return RFAILED;
       }
+      
+      if(procedureCode == ProcedureCodeE2_id_E2setup)
+      {
+         /* Getting all of the E2 node configuration's information from DuCb one by one*/
+         if(arrIdx == 0)
+         {
+            CM_LLIST_FIRST_NODE(&duCb.e2apDb.e2NodeComponentList, node); 
+         }
+         else
+         {
+            node = node->next;
+         }
+         if(!node)
+         {
+            DU_LOG("\nERROR  --> E2AP : E2 node component list node is null");
+            return RFAILED;
+         }
+         e2NodeComponentInfo = (E2NodeComponent*)node->node;
+      }
+      else
+      {
+         /* Getting only those E2 node configuration from DuCb whose interface
+          * and action type is present in the received array */
+         e2NodeComponentInfo = fetchE2NodeComponentInfo(e2NodeList[arrIdx].interface, e2NodeList[arrIdx].actionType, &node);
+      }
+      
+      if(!e2NodeComponentInfo)
+      {
+         DU_LOG("\nERROR  --> E2AP : Received null e2NodeComponentInfo at line number %d",__LINE__);
+         return RFAILED;
+      }
+
+      e2NodeAddItemIe = (E2nodeComponentConfigAddition_ItemIEs_t *) e2NodeAddList->list.array[arrIdx];
+      e2NodeAddItemIe->id = ProtocolIE_IDE2_id_E2nodeComponentConfigAddition_Item;
+      e2NodeAddItemIe->criticality = CriticalityE2_reject;
+      e2NodeAddItemIe->value.present = E2nodeComponentConfigAddition_ItemIEs__value_PR_E2nodeComponentConfigAddition_Item;
+      e2NodeAddItem = &e2NodeAddItemIe->value.choice.E2nodeComponentConfigAddition_Item;
+      if(fillE2NodeConfig((PTR)e2NodeAddItem, e2NodeComponentInfo, CONFIG_ADD) != ROK)
+      {
+         DU_LOG("\nERROR  --> E2AP : Failed to fill the E2 node configuration");
+         return RFAILED;
+      }
    }
-   
-   node = searchE2NodeComponentInfo(F1, E2_NODE_COMPONENT_ADD);
-   if(!node)
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds E2 node config update list 
+ *
+ * @details
+ *
+ *    Function : BuildE2NodeConfigUpdateList
+ *
+ *    Functionality: Building E2 node config update list
+ *
+ * @params[in] 
+ *    E2nodeComponentConfigUpdate_List_t to be filled
+ *    Count of E2 node to be update in the list    
+ *    Received list of E2 node configuration
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ ******************************************************************/
+
+uint8_t BuildE2NodeConfigUpdateList(E2nodeComponentConfigUpdate_List_t *e2NodeUpdateList, uint16_t count,  E2NodeConfigItem *updateE2Node)
+{
+   uint8_t arrIdx = 0;
+   CmLList         *node =NULL;
+   E2NodeComponent *e2NodeComponentInfo =NULL;
+   E2nodeComponentConfigUpdate_ItemIEs_t *e2NodeUpdateItemIe =NULL;
+   E2nodeComponentConfigUpdate_Item_t *e2NodeUpdateItem =NULL;
+
+   e2NodeUpdateList->list.count = count;
+   e2NodeUpdateList->list.size = e2NodeUpdateList->list.count * sizeof(E2nodeComponentConfigUpdate_ItemIEs_t *);
+   DU_ALLOC(e2NodeUpdateList->list.array, e2NodeUpdateList->list.size);
+   if(e2NodeUpdateList->list.array == NULLP)
    {
-      DU_LOG("\nERROR  --> E2AP : Received e2NodeComponentInfo is null");
+      DU_LOG("\nERROR  --> E2AP: Memory allocation failed for BuildE2NodeConfigUpdateList %d",__LINE__);
       return RFAILED;
    }
-   e2NodeComponentInfo = (E2NodeComponent*)node->node;
-   
-   arrIdx = 0;
-   e2NodeAddItemIe = (E2nodeComponentConfigAddition_ItemIEs_t *) e2NodeAddList->list.array[arrIdx];
-   e2NodeAddItemIe->id = ProtocolIE_IDE2_id_E2nodeComponentConfigAddition_Item;
-   e2NodeAddItemIe->criticality = CriticalityE2_reject;
-   e2NodeAddItemIe->value.present = E2nodeComponentConfigAddition_ItemIEs__value_PR_E2nodeComponentConfigAddition_Item;
-   e2NodeAddItem = &e2NodeAddItemIe->value.choice.E2nodeComponentConfigAddition_Item;
-   
-   /* E2nodeComponentInterfaceType */
-   e2NodeAddItem->e2nodeComponentInterfaceType = E2nodeComponentInterfaceType_f1;
 
-   /* E2 Node Component Request Part */
-   if(e2NodeComponentInfo->componentRequestPart)
+   for(arrIdx = 0; arrIdx< e2NodeUpdateList->list.count; arrIdx++)
    {
-      e2NodeAddItem->e2nodeComponentConfiguration.e2nodeComponentRequestPart.size = e2NodeComponentInfo->reqBufSize ;
-      DU_ALLOC(e2NodeAddItem->e2nodeComponentConfiguration.e2nodeComponentRequestPart.buf,\
-            e2NodeAddItem->e2nodeComponentConfiguration.e2nodeComponentRequestPart.size);
-      if(e2NodeAddItem->e2nodeComponentConfiguration.e2nodeComponentRequestPart.buf == NULLP)
+      DU_ALLOC(e2NodeUpdateList->list.array[arrIdx], sizeof(E2nodeComponentConfigUpdate_ItemIEs_t));
+      if(e2NodeUpdateList->list.array[arrIdx] == NULLP)
       {
-         DU_LOG("\nERROR  --> E2AP: Memory allocation failed for BuildE2NodeConfigAddList %d",__LINE__);
+         DU_LOG("\nERROR  --> E2AP: Memory allocation failed for BuildE2NodeConfigUpdateList %d",__LINE__);
          return RFAILED;
       }
 
-      memcpy(e2NodeAddItem->e2nodeComponentConfiguration.e2nodeComponentRequestPart.buf,\
-            e2NodeComponentInfo->componentRequestPart, e2NodeAddItem->e2nodeComponentConfiguration.\
-            e2nodeComponentRequestPart.size);
-   }
-   else
-   {
-      DU_LOG("\nERROR  --> E2AP: componentRequestPart is null ");
-      return RFAILED;
-   }
+      e2NodeComponentInfo= fetchE2NodeComponentInfo(updateE2Node[arrIdx].interface, updateE2Node[arrIdx].actionType, &node);
+      if(!e2NodeComponentInfo)
+      {
+         DU_LOG("\nERROR  --> E2AP : Received null e2NodeComponentInfo at line number %d",__LINE__);
+         return RFAILED;
+      }
 
+      e2NodeUpdateItemIe = (E2nodeComponentConfigUpdate_ItemIEs_t *) e2NodeUpdateList->list.array[arrIdx];
+      e2NodeUpdateItemIe->id = ProtocolIE_IDE2_id_E2nodeComponentConfigUpdate_Item;
+      e2NodeUpdateItemIe->criticality = CriticalityE2_reject;
+      e2NodeUpdateItemIe->value.present = E2nodeComponentConfigUpdate_ItemIEs__value_PR_E2nodeComponentConfigUpdate_Item;
+      e2NodeUpdateItem = &e2NodeUpdateItemIe->value.choice.E2nodeComponentConfigUpdate_Item;
 
-   /* E2 Node Component Response Part */
-   if(e2NodeComponentInfo->componentResponsePart)
-   {
-      e2NodeAddItem->e2nodeComponentConfiguration.e2nodeComponentResponsePart.size = e2NodeComponentInfo->rspBufSize; 
-      DU_ALLOC(e2NodeAddItem->e2nodeComponentConfiguration.e2nodeComponentResponsePart.buf, \
-            e2NodeAddItem->e2nodeComponentConfiguration.e2nodeComponentResponsePart.size);
-      if(e2NodeAddItem->e2nodeComponentConfiguration.e2nodeComponentResponsePart.buf == NULLP)
+      if(fillE2NodeConfig((PTR)e2NodeUpdateItem, e2NodeComponentInfo, CONFIG_MOD) != ROK)
       {
-         DU_LOG("\nERROR  --> E2AP: Memory allocation failed for BuildE2NodeConfigAddList %d",__LINE__);
+         DU_LOG("\nERROR  --> E2AP : Failed to fill the E2 node configuration");
          return RFAILED;
       }
-      memcpy(e2NodeAddItem->e2nodeComponentConfiguration.e2nodeComponentResponsePart.buf, \
-            e2NodeComponentInfo->componentResponsePart, e2NodeAddItem->e2nodeComponentConfiguration.\
-            e2nodeComponentResponsePart.size);
+
    }
-   else
+   return ROK;
+
+}
+
+
+/*******************************************************************
+ *
+ * @brief Builds E2 node config remove list 
+ *
+ * @details
+ *
+ *    Function :BuildE2NodeConfigRemoveList 
+ *
+ *    Functionality: Building E2 node config remove list
+ *
+ * @params[in] 
+ *    E2nodeComponentConfigRemoval_List_t to be filled
+ *    Count of E2 node to be remove in the list    
+ *    Received list of E2 node configuration
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ ******************************************************************/
+
+uint8_t BuildE2NodeConfigRemoveList(E2nodeComponentConfigRemoval_List_t *e2NodeRemoveList, uint16_t count,  E2NodeConfigItem *updateE2Node)
+{
+   uint8_t arrIdx = 0;
+   CmLList         *node=NULL;
+   E2NodeComponent *e2NodeComponentInfo=NULL;
+   E2nodeComponentConfigRemoval_ItemIEs_t *e2NodeRemovalItemIe=NULL;
+   E2nodeComponentConfigRemoval_Item_t *e2NodeRemovalItem=NULL;
+
+   e2NodeRemoveList->list.count = count;
+   e2NodeRemoveList->list.size = e2NodeRemoveList->list.count * sizeof(E2nodeComponentConfigRemoval_ItemIEs_t *);
+   DU_ALLOC(e2NodeRemoveList->list.array, e2NodeRemoveList->list.size);
+   if(e2NodeRemoveList->list.array == NULLP)
    {
-      DU_LOG("\nERROR  --> E2AP: componentResponsePart is null");
+      DU_LOG("\nERROR  --> E2AP: Memory allocation failed for BuildE2NodeConfigRemoveList %d",__LINE__);
       return RFAILED;
    }
-   
-   /* E2 Node Component ID */
-   e2NodeAddItem->e2nodeComponentID.present = E2nodeComponentID_PR_e2nodeComponentInterfaceTypeF1;
-   DU_ALLOC(e2NodeAddItem->e2nodeComponentID.choice.e2nodeComponentInterfaceTypeF1,\
-   sizeof(E2nodeComponentInterfaceF1_t));
-   if(e2NodeAddItem->e2nodeComponentID.choice.e2nodeComponentInterfaceTypeF1 == NULLP)
-   {
-       DU_LOG("\nERROR  --> E2AP: Memory allocation failed for BuildE2NodeConfigAddList %d",__LINE__);
-       return RFAILED;
-   }
-   e2NodeAddItem->e2nodeComponentID.choice.e2nodeComponentInterfaceTypeF1->gNB_DU_ID.size = sizeof(uint8_t);
-   DU_ALLOC(e2NodeAddItem->e2nodeComponentID.choice.e2nodeComponentInterfaceTypeF1->gNB_DU_ID.buf,\
-   e2NodeAddItem->e2nodeComponentID.choice.e2nodeComponentInterfaceTypeF1->gNB_DU_ID.size);
 
-   if(e2NodeAddItem->e2nodeComponentID.choice.e2nodeComponentInterfaceTypeF1->gNB_DU_ID.buf == NULLP)
+   for(arrIdx = 0; arrIdx< e2NodeRemoveList->list.count; arrIdx++)
    {
-      DU_LOG("\nERROR  -->list.  E2AP: Memory allocation failed for BuildE2NodeConfigAddList %d",__LINE__);
-      return RFAILED;
+      DU_ALLOC(e2NodeRemoveList->list.array[arrIdx], sizeof(E2nodeComponentConfigRemoval_ItemIEs_t));
+      if(e2NodeRemoveList->list.array[arrIdx] == NULLP)
+      {
+         DU_LOG("\nERROR  --> E2AP: Memory allocation failed for BuildE2NodeConfigRemoveList %d",__LINE__);
+         return RFAILED;
+      }
+
+      e2NodeComponentInfo= fetchE2NodeComponentInfo(updateE2Node[arrIdx].interface, updateE2Node[arrIdx].actionType, &node);
+      if(!e2NodeComponentInfo)
+      {
+         DU_LOG("\nERROR  --> E2AP : Received null e2NodeComponentInfo at line number %d",__LINE__);
+         return RFAILED;
+      }
+
+      e2NodeRemovalItemIe = (E2nodeComponentConfigRemoval_ItemIEs_t *) e2NodeRemoveList->list.array[arrIdx];
+      e2NodeRemovalItemIe->id = ProtocolIE_IDE2_id_E2nodeComponentConfigRemoval_Item;
+      e2NodeRemovalItemIe->criticality = CriticalityE2_reject;
+      e2NodeRemovalItemIe->value.present = E2nodeComponentConfigRemoval_ItemIEs__value_PR_E2nodeComponentConfigRemoval_Item;
+      e2NodeRemovalItem = &e2NodeRemovalItemIe->value.choice.E2nodeComponentConfigRemoval_Item;
+
+      if(fillE2NodeConfig((PTR)e2NodeRemovalItem, e2NodeComponentInfo, CONFIG_DEL) != ROK)
+      {
+         DU_LOG("\nERROR  --> E2AP : Failed to fill the E2 node configuration");
+         return RFAILED;
+      }
+
    }
-   e2NodeAddItem->e2nodeComponentID.choice.e2nodeComponentInterfaceTypeF1->gNB_DU_ID.buf[arrIdx]  = e2NodeComponentInfo->componentId;
    return ROK;
-
 }
-
 /*******************************************************************
  *
  * @brief deallocation of E2SM_KPM_RANfunction_Description_t
@@ -1052,7 +1423,7 @@ uint8_t BuildAndSendE2SetupReq()
       e2SetupReq->protocolIEs.list.array[arrIdx]->id = ProtocolIE_IDE2_id_E2nodeComponentConfigAddition;
       e2SetupReq->protocolIEs.list.array[arrIdx]->criticality = CriticalityE2_reject;
       e2SetupReq->protocolIEs.list.array[arrIdx]->value.present = E2setupRequestIEs__value_PR_E2nodeComponentConfigAddition_List;
-      if(BuildE2NodeConfigAddList(&(e2SetupReq->protocolIEs.list.array[arrIdx]->value.choice.E2nodeComponentConfigAddition_List))!=ROK)
+      if(BuildE2NodeConfigAddList(&(e2SetupReq->protocolIEs.list.array[arrIdx]->value.choice.E2nodeComponentConfigAddition_List), ProcedureCodeE2_id_E2setup, 0, NULL)!=ROK)
       {
          DU_LOG("\nERROR  -->  E2AP : Failed to create E2 Node config list");
          break;
@@ -1099,121 +1470,111 @@ uint8_t BuildAndSendE2SetupReq()
 
 /*******************************************************************
  *
- * @brief Builds Ric Request Id
+ * @brief Builds RIC Action Admitted List
  *
  * @details
  *
- *    Function : BuildRicRequestId
+ *    Function : BuildRicActionAdmitList
  *
- *    Functionality: Building the Ric Request Id
+ *    Functionality: Builds RIC Action Admitted List
  *
- * @params[in] RICrequestID_t *ricReqId
+ * @params[in] Pointer to RIC Action Admitted List to be filled
+ *             Subscription Response information
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-
-uint8_t BuildRicRequestId(RICrequestID_t *ricReqId)
+uint8_t BuildRicActionAdmitList(RICaction_Admitted_List_t *admitList, PendingSubsRspInfo *subsRspInfo)
 {
-   if(ricReqId == NULLP)
-   {
-      return RFAILED;
-   }
-
-   ricReqId->ricRequestorID = 1;
-   ricReqId->ricInstanceID  = 1;
-   return ROK;
-}
+   uint8_t idx = 0;
+   uint8_t elementCnt = 0;  
+   RICaction_Admitted_ItemIEs_t *admitItem = NULLP;
 
-/*******************************************************************
- *
- * @brief Fills the mandatory RicAdmitted List Items
- *
- * @details
- *
- *    Function : fillRicAdmitList
- *
- *    Functionality: Fills the mandatory Ric Admitted List Items
- *
- * @params[in] RICaction_Admitted_ItemIEs_t *ricAdmitItems
- * @return ROK     - success
- *         RFAILED - failure
- *
- * ****************************************************************/
+   elementCnt = subsRspInfo->numOfAcceptedActions;
 
-uint8_t fillRicAdmitList(RICaction_Admitted_ItemIEs_t *ricAdmitItems)
-{
+   admitList->list.count = elementCnt;
+   admitList->list.size  = elementCnt * sizeof(RICaction_Admitted_ItemIEs_t *);
 
-   if(ricAdmitItems != NULLP)
+   DU_ALLOC(admitList->list.array, admitList->list.size);
+   if(admitList->list.array == NULLP)
    {
-      ricAdmitItems->id = ProtocolIE_IDE2_id_RICaction_Admitted_Item;
-      ricAdmitItems->criticality = CriticalityE2_reject;
-      ricAdmitItems->value.present = RICaction_Admitted_ItemIEs__value_PR_RICaction_Admitted_Item;
-      ricAdmitItems->value.choice.RICaction_Admitted_Item.ricActionID = 1; 
+      DU_LOG("\nERROR  -->  E2AP : Memory allocation failed at [%s] : line [%d]", __func__, __LINE__);
+      return RFAILED;
    }
-   else
+
+   for(idx=0; idx<elementCnt; idx++)
    {
-      return RFAILED;
+      DU_ALLOC(admitList->list.array[idx], sizeof(RICaction_Admitted_ItemIEs_t));
+      if(admitList->list.array[idx] == NULLP)
+      {
+         DU_LOG("\nERROR  -->  E2AP : Memory allocation failed at [%s] : line [%d]", __func__, __LINE__);
+         return RFAILED;
+      }
+
+      admitItem = (RICaction_Admitted_ItemIEs_t *)admitList->list.array[idx];
+      admitItem->id = ProtocolIE_IDE2_id_RICaction_Admitted_Item;
+      admitItem->criticality = CriticalityE2_reject;
+      admitItem->value.present = RICaction_Admitted_ItemIEs__value_PR_RICaction_Admitted_Item;
+      admitItem->value.choice.RICaction_Admitted_Item.ricActionID = subsRspInfo->acceptedActionList[idx]; 
    }
    return ROK;
 }
+
 /*******************************************************************
  *
- * @brief Builds the mandatory RicAdmitted List Params
+ * @brief Builds RIC Action Not Admitted List
  *
  * @details
  *
- *    Function : BuildRicAdmitList
+ *    Function : BuildRicActionNotAdmitList
  *
- *    Functionality: Builds the mandatory Ric Admitted List Params
+ *    Functionality: Builds RIC Action Not Admitted List
  *
- * @params[in] RICaction_Admitted_List_t *admitListPtr
+ * @params[in] Pointer to RIC Action Not Admitted List to be filled
+ *             Subscription Response information
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-
-uint8_t BuildRicAdmitList(RICaction_Admitted_List_t *admitListPtr)
+uint8_t BuildRicActionNotAdmitList(RICaction_NotAdmitted_List_t *notAdmitList, PendingSubsRspInfo *subsRspInfo)
 {
-   uint8_t idx ;
-   uint8_t elementCnt;  
-   uint8_t ret= ROK;
-   elementCnt = 1;
+   uint8_t idx = 0;
+   uint8_t elementCnt = 0;  
+   RICaction_NotAdmitted_ItemIEs_t *notAdmitItem = NULLP;
+
+   elementCnt = subsRspInfo->numOfRejectedActions;
+
+   notAdmitList->list.count = elementCnt;
+   notAdmitList->list.size  = elementCnt * sizeof(RICaction_NotAdmitted_ItemIEs_t *);
 
-   if(admitListPtr == NULLP)
+   DU_ALLOC(notAdmitList->list.array, notAdmitList->list.size);
+   if(notAdmitList->list.array == NULLP)
    {
-      DU_LOG("\nERROR  -->  E2AP : Memory allocation for RIC Admit List failed");
-      ret = RFAILED;
+      DU_LOG("\nERROR  -->  E2AP : Memory allocation failed at [%s] : line [%d]", __func__, __LINE__);
+      return RFAILED;
    }
-   else
+
+   for(idx=0; idx<elementCnt; idx++)
    {
-      admitListPtr->list.count = elementCnt;
-      admitListPtr->list.size  = elementCnt * sizeof(RICaction_Admitted_ItemIEs_t);
-      DU_ALLOC(admitListPtr->list.array, admitListPtr->list.size);
-      if(admitListPtr->list.array == NULLP)
-      {
-        DU_LOG("\nERROR  -->  E2AP : Memory allocation for RIC Admit List failed");
-        ret = RFAILED;
-      }
-      else
+      DU_ALLOC(notAdmitList->list.array[idx], sizeof(RICaction_NotAdmitted_ItemIEs_t));
+      if(notAdmitList->list.array[idx] == NULLP)
       {
-        for(idx=0 ; idx<elementCnt ; idx++ )
-        {
-           DU_ALLOC(admitListPtr->list.array[idx], sizeof(RICaction_Admitted_ItemIEs_t));
-           if(admitListPtr->list.array[idx] == NULLP)
-           {
-              ret = RFAILED;
-           }
-        }
-        if(ret != RFAILED)
-        {
-           idx=0;
-           fillRicAdmitList((RICaction_Admitted_ItemIEs_t *)admitListPtr->list.array[idx]);
-        }
+         DU_LOG("\nERROR  -->  E2AP : Memory allocation failed at [%s] : line [%d]", __func__, __LINE__);
+         return RFAILED;
       }
-   }   
-   return ret;
+
+      notAdmitItem = (RICaction_NotAdmitted_ItemIEs_t *)notAdmitList->list.array[idx];
+      notAdmitItem->id = ProtocolIE_IDE2_id_RICaction_NotAdmitted_Item;
+      notAdmitItem->criticality = CriticalityE2_reject;
+      notAdmitItem->value.present = RICaction_NotAdmitted_ItemIEs__value_PR_RICaction_NotAdmitted_Item;
+      notAdmitItem->value.choice.RICaction_NotAdmitted_Item.ricActionID = \
+         subsRspInfo->rejectedActionList[idx].id; 
+      fillE2Cause(&notAdmitItem->value.choice.RICaction_NotAdmitted_Item.cause, \
+         subsRspInfo->rejectedActionList[idx].failureCause);
+   }
+   return ROK;
 }
+
 /*******************************************************************
  *
  * @breif Deallocation of BuildAndSendRicSubscriptionRsp memory
@@ -1228,152 +1589,166 @@ uint8_t BuildRicAdmitList(RICaction_Admitted_List_t *admitListPtr)
  *
  * @return void
  *      
- *
  ******************************************************************/
 void FreeRicSubscriptionRsp(E2AP_PDU_t  *e2apRicMsg)
 {
    RICsubscriptionResponse_t  *ricSubscriptionRsp= NULLP;
    uint8_t idx=0;
-   uint8_t idx1=0;
-   RICaction_Admitted_List_t *admitListPtr;
+   uint8_t listIdx=0;
+   RICaction_Admitted_List_t *admitList = NULLP;
+   RICaction_NotAdmitted_List_t *notAdmitList = NULLP;
 
    if(e2apRicMsg != NULLP)
    {
       if(e2apRicMsg->choice.successfulOutcome != NULLP)
       {
-        ricSubscriptionRsp = &e2apRicMsg->choice.successfulOutcome->value.choice.RICsubscriptionResponse;
-        if(ricSubscriptionRsp)
-        {
-           if(ricSubscriptionRsp->protocolIEs.list.array != NULLP)
-           {
-              for(idx=0; idx<ricSubscriptionRsp->protocolIEs.list.count; idx++)
-              {
-                 if(ricSubscriptionRsp->protocolIEs.list.array[idx] != NULLP)
-                 {
-                    switch(ricSubscriptionRsp->protocolIEs.list.array[idx]->id)
-                    {
-                       case ProtocolIE_IDE2_id_RICrequestID:
-                          break;
-
-                       case ProtocolIE_IDE2_id_RANfunctionID:
-                          break;
-
-                       case ProtocolIE_IDE2_id_RICactions_Admitted:
-                          {
-                             admitListPtr = &ricSubscriptionRsp->protocolIEs.list.\
-                                            array[idx]->value.choice.RICaction_Admitted_List;
-                             if(admitListPtr->list.array != NULLP)
-                             {
-                                for(idx1=0 ; idx1<admitListPtr->list.count; idx1++ )
-                                {
-                                   if(admitListPtr->list.array[idx1] != NULLP)
-                                   {
-                                      DU_FREE(admitListPtr->list.array[idx1],
-                                            sizeof(RICaction_Admitted_ItemIEs_t));
-                                   }
-                                }
-                                DU_FREE(admitListPtr->list.array, admitListPtr->list.size);     
-                             }
-                             break;
-                          }
-                       default:
-                          break;
-                    }
-                    DU_FREE(ricSubscriptionRsp->protocolIEs.list.array[idx], \
-                          sizeof(RICsubscriptionResponse_IEs_t));
-                 }
-              }
-              DU_FREE(ricSubscriptionRsp->protocolIEs.list.array, \
-                    ricSubscriptionRsp->protocolIEs.list.size);
-           }
-        }   
-        DU_FREE(e2apRicMsg->choice.successfulOutcome, sizeof(SuccessfulOutcomeE2_t));
+         ricSubscriptionRsp = &e2apRicMsg->choice.successfulOutcome->value.choice.RICsubscriptionResponse;
+         if(ricSubscriptionRsp)
+         {
+            if(ricSubscriptionRsp->protocolIEs.list.array != NULLP)
+            {
+               for(idx=0; idx<ricSubscriptionRsp->protocolIEs.list.count; idx++)
+               {
+                  if(ricSubscriptionRsp->protocolIEs.list.array[idx] != NULLP)
+                  {
+                     switch(ricSubscriptionRsp->protocolIEs.list.array[idx]->id)
+                     {
+                        case ProtocolIE_IDE2_id_RICactions_Admitted:
+                           {
+                              admitList = &ricSubscriptionRsp->protocolIEs.list.\
+                                             array[idx]->value.choice.RICaction_Admitted_List;
+                              if(admitList->list.array != NULLP)
+                              {
+                                 for(listIdx=0 ; listIdx < admitList->list.count; listIdx++)
+                                 {
+                                    DU_FREE(admitList->list.array[listIdx], sizeof(RICaction_Admitted_ItemIEs_t));
+                                 }
+                                 DU_FREE(admitList->list.array, admitList->list.size);  
+                              }
+                              break;
+                           }
+                        case ProtocolIE_IDE2_id_RICactions_NotAdmitted:
+                           {
+                              notAdmitList = &ricSubscriptionRsp->protocolIEs.list.\
+                                             array[idx]->value.choice.RICaction_NotAdmitted_List;
+                              if(notAdmitList->list.array != NULLP)
+                              {
+                                 for(listIdx=0 ; listIdx < notAdmitList->list.count; listIdx++)
+                                 {
+                                    DU_FREE(notAdmitList->list.array[listIdx], sizeof(RICaction_NotAdmitted_ItemIEs_t));
+                                 }
+                                 DU_FREE(notAdmitList->list.array, notAdmitList->list.size);    
+                              }
+                              break;
+                           }
+                        default:
+                           break;
+                     }
+                     DU_FREE(ricSubscriptionRsp->protocolIEs.list.array[idx], sizeof(RICsubscriptionResponse_IEs_t));
+                  }
+               }
+               DU_FREE(ricSubscriptionRsp->protocolIEs.list.array, ricSubscriptionRsp->protocolIEs.list.size);
+            }
+         }   
+         DU_FREE(e2apRicMsg->choice.successfulOutcome, sizeof(SuccessfulOutcomeE2_t));
       }                
       DU_FREE(e2apRicMsg, sizeof(E2AP_PDU_t));       
    }
 }
+
 /*******************************************************************
  *
- * @brief Builds and Send the RicSubscriptionRsp
+ * @brief Fill RIC Subscription Response IEs
  *
  * @details
  *
- *    Function : BuildAndSendRicSubscriptionRsp
+ *    Function : fillRicSubscriptionRsp
  *
- * functionality:Fills the RicSubscriptionRsp
+ * functionality: Fill RIC Subscription Response IEs
  *
+ * @param  Pointer to RIC subscription response
+ *         Subscription response information
  * @return ROK     - success
  *         RFAILED - failure
  *
  ******************************************************************/
-uint8_t  FillRicSubscriptionRsp(RICsubscriptionResponse_t  *ricSubscriptionRsp )
+uint8_t fillRicSubscriptionRsp(RICsubscriptionResponse_t *ricSubscriptionRsp, PendingSubsRspInfo *subsRspInfo)
 {
-   uint8_t idx=0;
-   uint8_t ret = ROK;
+   uint8_t ieIdx = 0;
    uint8_t elementCnt = 0;
-   uint8_t BuildRicRequestIdret=ROK;
-   uint8_t BuildRicAdmitListret=ROK;
+   RICsubscriptionResponse_IEs_t *subsRspIe = NULLP;
+
+   elementCnt = 3;
+   if(subsRspInfo->numOfRejectedActions)
+      elementCnt++;
 
-   elementCnt=3;
    ricSubscriptionRsp->protocolIEs.list.count = elementCnt;
    ricSubscriptionRsp->protocolIEs.list.size  = elementCnt * sizeof(RICsubscriptionResponse_IEs_t);
-   DU_ALLOC(ricSubscriptionRsp->protocolIEs.list.array, \
-        ricSubscriptionRsp->protocolIEs.list.size);
+   DU_ALLOC(ricSubscriptionRsp->protocolIEs.list.array, ricSubscriptionRsp->protocolIEs.list.size);
    if(ricSubscriptionRsp->protocolIEs.list.array == NULLP)
    {
-      DU_LOG("\nERROR  -->  E2AP : Memory allocation for FillRicSubscriptionRsp  failed");
-      ret = RFAILED;
+      DU_LOG("\nERROR  -->  E2AP : Memory allocation failed at %s : line %d", __func__, __LINE__);
+      return RFAILED;
    }
-   else
+
+   for(ieIdx=0; ieIdx<ricSubscriptionRsp->protocolIEs.list.count; ieIdx++)
    {
-      for(idx=0; idx<ricSubscriptionRsp->protocolIEs.list.count; idx++)
+      DU_ALLOC(ricSubscriptionRsp->protocolIEs.list.array[ieIdx], sizeof(RICsubscriptionResponse_IEs_t));
+      if(ricSubscriptionRsp->protocolIEs.list.array[ieIdx] == NULLP)
       {
-        DU_ALLOC(ricSubscriptionRsp->protocolIEs.list.array[idx], \
-              sizeof(RICsubscriptionResponse_IEs_t));
-        if(ricSubscriptionRsp->protocolIEs.list.array[idx] == NULLP)
-        {
-           ret = RFAILED;
-        }
+         DU_LOG("\nERROR  -->  E2AP : Memory allocation failed at [%s] : line [%d] : ieIdx [%d]", __func__, __LINE__,ieIdx);
+         return RFAILED;
       }
-      if(ret != RFAILED)
-      {
+   }
 
-        idx=0;
-        ricSubscriptionRsp->protocolIEs.list.array[idx]->id = ProtocolIE_IDE2_id_RICrequestID;
-        ricSubscriptionRsp->protocolIEs.list.array[idx]->criticality = CriticalityE2_reject;
-        ricSubscriptionRsp->protocolIEs.list.array[idx]->value.present =\
-                                                                        RICsubscriptionRequest_IEs__value_PR_RICrequestID;
-        BuildRicRequestIdret =
-           BuildRicRequestId(&ricSubscriptionRsp->protocolIEs.list.array[idx]->value.choice.RICrequestID);
-        if(BuildRicRequestIdret != ROK)
-        {
-           ret = RFAILED;
-        }
-        else
-        {
-           idx++;
-           ricSubscriptionRsp->protocolIEs.list.array[idx]->id = ProtocolIE_IDE2_id_RANfunctionID;
-           ricSubscriptionRsp->protocolIEs.list.array[idx]->criticality = CriticalityE2_reject;
-           ricSubscriptionRsp->protocolIEs.list.array[idx]->value.present =\
-                                                                           RICsubscriptionRequest_IEs__value_PR_RANfunctionID;
-           ricSubscriptionRsp->protocolIEs.list.array[idx]->value.choice.RANfunctionID = 1;
+   /* RIC Request ID */
+   ieIdx=0;
+   subsRspIe = ricSubscriptionRsp->protocolIEs.list.array[ieIdx];
+   subsRspIe->id = ProtocolIE_IDE2_id_RICrequestID;
+   subsRspIe->criticality = CriticalityE2_reject;
+   subsRspIe->value.present = RICsubscriptionRequest_IEs__value_PR_RICrequestID;
+   subsRspIe->value.choice.RICrequestID.ricRequestorID = subsRspInfo->requestId.requestorId;
+   subsRspIe->value.choice.RICrequestID.ricInstanceID = subsRspInfo->requestId.instanceId;
+
+   /* RAN Function ID */
+   ieIdx++;
+   subsRspIe = ricSubscriptionRsp->protocolIEs.list.array[ieIdx];
+   subsRspIe->id = ProtocolIE_IDE2_id_RANfunctionID;
+   subsRspIe->criticality = CriticalityE2_reject;
+   subsRspIe->value.present = RICsubscriptionRequest_IEs__value_PR_RANfunctionID;
+   subsRspIe->value.choice.RANfunctionID = subsRspInfo->ranFuncId;
+
+   /* RIC Action Admitted List */
+   ieIdx++;
+   subsRspIe = ricSubscriptionRsp->protocolIEs.list.array[ieIdx];
+   subsRspIe->id = ProtocolIE_IDE2_id_RICactions_Admitted;
+   subsRspIe->criticality = CriticalityE2_reject;
+   subsRspIe->value.present = RICsubscriptionResponse_IEs__value_PR_RICaction_Admitted_List;
+   if(BuildRicActionAdmitList(&subsRspIe->value.choice.RICaction_Admitted_List, subsRspInfo) != ROK)
+   {
+      DU_LOG("\nERROR  -->  E2AP : Failed to fill RIC Action Admitted List in RIC Subscription Response");
+      return RFAILED;
+   }
 
-           idx++;
-           ricSubscriptionRsp->protocolIEs.list.array[idx]->id = ProtocolIE_IDE2_id_RICactions_Admitted;
-           ricSubscriptionRsp->protocolIEs.list.array[idx]->criticality = CriticalityE2_reject;
-           ricSubscriptionRsp->protocolIEs.list.array[idx]->value.present =\
-                                                                           RICsubscriptionResponse_IEs__value_PR_RICaction_Admitted_List;
-           BuildRicAdmitListret =
-              BuildRicAdmitList(&ricSubscriptionRsp->protocolIEs.list.array[idx]->value.choice.RICaction_Admitted_List);
-           if(BuildRicAdmitListret != ROK)
-           {
-              ret = RFAILED;
-           }
-        }
+   /* RIC Action Not Admitted List */
+   if(subsRspInfo->numOfRejectedActions)
+   {
+      ieIdx++;
+      subsRspIe = ricSubscriptionRsp->protocolIEs.list.array[ieIdx];
+      subsRspIe->id = ProtocolIE_IDE2_id_RICactions_NotAdmitted;
+      subsRspIe->criticality = CriticalityE2_reject;
+      subsRspIe->criticality = CriticalityE2_reject;
+      subsRspIe->value.present = RICsubscriptionResponse_IEs__value_PR_RICaction_NotAdmitted_List;
+      if(BuildRicActionNotAdmitList(&subsRspIe->value.choice.RICaction_NotAdmitted_List, subsRspInfo) != ROK)
+      {
+         DU_LOG("\nERROR  -->  E2AP : Failed to fill RIC Action Not Admitted List in RIC Subscription Response");
+         return RFAILED;
       }
-   }   
-   return ret;
+   }
+
+   return ROK;
 }
+
 /*******************************************************************
  *
  * @brief Builds and Send the RicSubscriptionRsp
@@ -1389,14 +1764,12 @@ uint8_t  FillRicSubscriptionRsp(RICsubscriptionResponse_t  *ricSubscriptionRsp )
  *
  ******************************************************************/
 
-uint8_t BuildAndSendRicSubscriptionRsp()
+uint8_t BuildAndSendRicSubscriptionRsp(PendingSubsRspInfo *subsRspInfo)
 {
-
-   E2AP_PDU_t         *e2apRicMsg = NULLP;
+   uint8_t      ret = RFAILED;
+   E2AP_PDU_t   *e2apRicMsg = NULLP;
    RICsubscriptionResponse_t  *ricSubscriptionRsp=NULLP;
-   asn_enc_rval_t     encRetVal; 
-   uint8_t ret = RFAILED;
-   uint8_t FillRicricSubscriptionRspret;
+   asn_enc_rval_t encRetVal; 
 
    while(true)
    {
@@ -1405,28 +1778,28 @@ uint8_t BuildAndSendRicSubscriptionRsp()
       DU_ALLOC(e2apRicMsg, sizeof(E2AP_PDU_t)); 
       if(e2apRicMsg == NULLP)
       {
-        DU_LOG("\nERROR  -->  E2AP : Memory allocation for E2AP-PDU failed");
-        break;
+         DU_LOG("\nERROR  -->  E2AP : Memory allocation for E2AP-PDU failed");
+         break;
       }
+
       e2apRicMsg->present =  E2AP_PDU_PR_successfulOutcome;
       DU_ALLOC(e2apRicMsg->choice.successfulOutcome, sizeof(SuccessfulOutcomeE2_t));
       if(e2apRicMsg->choice.successfulOutcome == NULLP)
       {
-        DU_LOG("\nERROR  -->  E2AP : Memory allocation for RIC subscription Response failed");
-        break;
+         DU_LOG("\nERROR  -->  E2AP : Memory allocation for RIC subscription Response failed");
+         break;
       }
 
       e2apRicMsg->choice.successfulOutcome->procedureCode = ProcedureCodeE2_id_RICsubscription;
       e2apRicMsg->choice.successfulOutcome->criticality = CriticalityE2_reject;
-      e2apRicMsg->choice.successfulOutcome->value.present = \
-                                                           SuccessfulOutcomeE2__value_PR_RICsubscriptionResponse;
+      e2apRicMsg->choice.successfulOutcome->value.present = SuccessfulOutcomeE2__value_PR_RICsubscriptionResponse;
+
       ricSubscriptionRsp = &e2apRicMsg->choice.successfulOutcome->value.choice.RICsubscriptionResponse;
 
-      FillRicricSubscriptionRspret = FillRicSubscriptionRsp(ricSubscriptionRsp);
-      if(FillRicricSubscriptionRspret != ROK)
+      if(fillRicSubscriptionRsp(ricSubscriptionRsp, subsRspInfo) != ROK)
       {
-        DU_LOG("\nERROR  -->  E2AP : Memory allocation for RICsubscriptionResponseIE failed");
-        break;
+         DU_LOG("\nERROR  -->  E2AP : Memory allocation for RICsubscriptionResponseIE failed");
+         break;
       }
 
       /* Prints the Msg formed */
@@ -1434,49 +1807,48 @@ uint8_t BuildAndSendRicSubscriptionRsp()
 
       memset(encBuf, 0, ENC_BUF_MAX_LEN);
       encBufSize = 0;
-      encRetVal = aper_encode(&asn_DEF_E2AP_PDU, 0, e2apRicMsg, PrepFinalEncBuf,\
-           encBuf);
+      encRetVal = aper_encode(&asn_DEF_E2AP_PDU, 0, e2apRicMsg, PrepFinalEncBuf, encBuf);
       if(encRetVal.encoded == ENCODE_FAIL)
       {
-        DU_LOG("\nERROR  -->  E2AP : Could not encode RIC Subscription Response structure (at %s)\n",\
-              encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
-        break;
+         DU_LOG("\nERROR  -->  E2AP : Could not encode RIC Subscription Response structure (at %s)\n",\
+               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+         break;
       }
       else
       {
-        DU_LOG("\nDEBUG   -->  E2AP : Created APER encoded buffer for RIC subscription response \n");
+         DU_LOG("\nDEBUG   -->  E2AP : Created APER encoded buffer for RIC subscription response \n");
 #ifdef DEBUG_ASN_PRINT
-        for(int i=0; i< encBufSize; i++)
-        {
-           printf("%x",encBuf[i]);
-        } 
+         for(int i=0; i< encBufSize; i++)
+         {
+            printf("%x",encBuf[i]);
+         
 #endif
       } 
 
       if(SendE2APMsg(DU_APP_MEM_REGION, DU_POOL, encBuf, encBufSize) != ROK)
       {
-        DU_LOG("\nERROR  -->  E2AP : Sending RIC Subscription Response failed");      
-        break;
+         DU_LOG("\nERROR  -->  E2AP : Sending RIC Subscription Response failed");      
+         break;
       }
 
       ret = ROK;
       break;
 
    }
-   FreeRicSubscriptionRsp(e2apRicMsg);
 
+   FreeRicSubscriptionRsp(e2apRicMsg);
    return ret;
 }
 
 /******************************************************************
  *
- * @brief Deallocation of memory allocated bu aper decoder for e2 setup response
+ * @brief Deallocation of memory allocated by aper decoder for e2 setup response
  *
  * @details
  *
  *    Function : freeAperDecodingOfE2SetupRsp
  *
- *    Functionality: Deallocation of memory allocated bu aper decoder for e2
+ *    Functionality: Deallocation of memory allocated by aper decoder for e2
  *    setup response
  *
  * @params[in] E2setupResponse_t *e2SetRspMsg;
@@ -1553,13 +1925,16 @@ void freeAperDecodingOfE2SetupRsp(E2setupResponse_t *e2SetRspMsg)
  *         RFAILED - failure
  *
  * ****************************************************************/
+
 uint8_t procE2SetupRsp(E2AP_PDU_t *e2apMsg)
 {
-   uint8_t arrIdx =0, transId=0; 
+   uint8_t arrIdx =0, transId=0, idx=0
    uint32_t recvBufLen;             
-   E2setupResponse_t *e2SetRspMsg;
-   CmLList         *node;
-   E2NodeComponent *e2NodeComponentInfo;
+   E2setupResponse_t *e2SetRspMsg=NULL;
+   CmLList         *node=NULL;
+   E2NodeComponent *e2NodeComponentInfo=NULL;
+   E2nodeComponentConfigAdditionAck_List_t *e2NodeCfgAckList=NULL;
+   E2nodeComponentConfigAdditionAck_ItemIEs_t *e2NodeAddAckItem=NULL;
 
    DU_LOG("\nINFO   -->  E2AP : E2 Setup Response received"); 
    duCb.e2Status = TRUE; //Set E2 status as true
@@ -1598,7 +1973,37 @@ uint8_t procE2SetupRsp(E2AP_PDU_t *e2apMsg)
             }
 
          case ProtocolIE_IDE2_id_E2nodeComponentConfigAdditionAck:
+         {
+            e2NodeCfgAckList = &e2SetRspMsg->protocolIEs.list.array[arrIdx]->value.choice.E2nodeComponentConfigAdditionAck_List;
+            for(idx =0; idx <e2NodeCfgAckList->list.count; idx++)
+            {
+               e2NodeAddAckItem = (E2nodeComponentConfigAdditionAck_ItemIEs_t*) e2NodeCfgAckList->list.array[idx];
+               switch(e2NodeAddAckItem->value.choice.E2nodeComponentConfigAdditionAck_Item.e2nodeComponentID.present)
+               {
+                  case E2nodeComponentID_PR_e2nodeComponentInterfaceTypeF1:
+                     {
+                        e2NodeComponentInfo = fetchE2NodeComponentInfo(F1, E2_NODE_COMPONENT_ADD, &node);
+                        if(!e2NodeComponentInfo)
+                        {
+                           DU_LOG("\nERROR  --> E2AP : Received null e2NodeComponentInfo at line number %d",__LINE__);
+                           return RFAILED;
+                        }
+                        else
+                        {
+                           cmLListDelFrm(&duCb.e2apDb.e2NodeComponentList, node);
+                           DU_FREE(e2NodeComponentInfo->componentRequestPart, e2NodeComponentInfo->reqBufSize);
+                           DU_FREE(e2NodeComponentInfo->componentResponsePart, e2NodeComponentInfo->rspBufSize);
+                           DU_FREE(e2NodeComponentInfo, sizeof(E2NodeComponent));
+                           DU_FREE(node, sizeof(CmLList));
+                        }
+                        break;
+                     }
+                  default:
+                     break;
+               }
+            }
             break;
+         }
 
          default:
             DU_LOG("\nERROR  -->  E2AP : Invalid IE received in E2SetupRsp:%ld",
@@ -1607,24 +2012,12 @@ uint8_t procE2SetupRsp(E2AP_PDU_t *e2apMsg)
       }
    }
    freeAperDecodingOfE2SetupRsp(e2SetRspMsg);
-   
-   node = searchE2NodeComponentInfo(F1, E2_NODE_COMPONENT_ADD);
-   if(!node)
+
+   if(duSendE2NodeConfigurationUpdate() != ROK)
    {
-      DU_LOG("\nERROR  --> E2AP : Received e2NodeComponentInfo is null");
+      DU_LOG("\nERROR  -->  E2AP : Failed to send E2 node config update");
       return RFAILED;
    }
-   else
-   {
-      e2NodeComponentInfo = (E2NodeComponent*)node->node;
-      cmLListDelFrm(&duCb.e2apDb.e2NodeComponentList, node);
-      DU_FREE(e2NodeComponentInfo->componentRequestPart, e2NodeComponentInfo->reqBufSize);
-      DU_FREE(e2NodeComponentInfo->componentResponsePart, e2NodeComponentInfo->rspBufSize);
-      DU_FREE(e2NodeComponentInfo, sizeof(E2NodeComponent));
-      DU_FREE(node, sizeof(CmLList));
-   }
-
-   BuildAndSendE2NodeConfigUpdate();
    return ROK;
 }
 
@@ -1665,8 +2058,7 @@ void freeAperDecodingOfRicSubsReq(RICsubscriptionRequest_t *ricSubscriptionReq)
                      {
                         if(subsDetails->ricAction_ToBeSetup_List.list.array[elementIdx])
                         {
-                           actionItem = (RICaction_ToBeSetup_ItemIEs_t *)subsDetails->ricAction_ToBeSetup_List.\
-                              list.array[elementIdx];
+                           actionItem = (RICaction_ToBeSetup_ItemIEs_t *)subsDetails->ricAction_ToBeSetup_List.list.array[elementIdx];
                            if(actionItem->value.choice.RICaction_ToBeSetup_Item.ricActionDefinition)
                            {
                               free(actionItem->value.choice.RICaction_ToBeSetup_Item.ricActionDefinition->buf);
@@ -1736,7 +2128,8 @@ void  freeAperDecodingOfEventTriggerDef(E2SM_KPM_EventTriggerDefinition_t *event
  *         RFAILED - failure
  *
  ******************************************************************/
-uint8_t extractEventTriggerDef(RanFunction *ranFuncDb, RicSubscription *ricSubscriptionInfo, RICeventTriggerDefinition_t *ricEventTriggerDef)
+uint8_t extractEventTriggerDef(RanFunction *ranFuncDb, RicSubscription *ricSubscriptionInfo, \
+   RICeventTriggerDefinition_t *ricEventTriggerDef, E2FailureCause *failureCause)
 {
    uint8_t ret = RFAILED;
    uint8_t eventIdx = 0;
@@ -1752,6 +2145,8 @@ uint8_t extractEventTriggerDef(RanFunction *ranFuncDb, RicSubscription *ricSubsc
    if(rval.code == RC_FAIL || rval.code == RC_WMORE)
    {
       DU_LOG("\nERROR  -->  E2AP : ASN decode failed for E2SM-KPM Event Trigger Definition");
+      failureCause->causeType = E2_PROTOCOL; 
+      failureCause->cause = E2_ABSTRACT_SYNTAX_ERROR_FALSELY_CONSTRUCTED_MESSAGE;
       return RFAILED;
    }
    printf("\n");
@@ -1773,6 +2168,11 @@ uint8_t extractEventTriggerDef(RanFunction *ranFuncDb, RicSubscription *ricSubsc
       }
    }
 
+   if(ret == RFAILED)
+   {
+      failureCause->causeType = E2_RIC_REQUEST;
+      failureCause->cause = E2_EVENT_TRIGGER_NOT_SUPPORTED;
+   }
    /* Free E2SM_KPM_EventTriggerDefinition_t */
    freeAperDecodingOfEventTriggerDef(eventTiggerDefPtr);
    return ret;
@@ -1996,7 +2396,8 @@ uint8_t extractMeasInfoList(CmLListCp *measInfoSupportedList, MeasurementInfoLis
  *         RFAILED - failure
  *
  ******************************************************************/
-uint8_t extractRicActionDef(RanFunction *ranFuncDb, ActionDefinition *actionDefDb, RICactionDefinition_t *ricActionDef)
+uint8_t extractRicActionDef(RanFunction *ranFuncDb, ActionDefinition *actionDefDb, RICactionDefinition_t *ricActionDef,\
+   E2FailureCause *failureCause)
 {
    bool memFailure = false;
    uint8_t styleIdx = 0;
@@ -2016,6 +2417,8 @@ uint8_t extractRicActionDef(RanFunction *ranFuncDb, ActionDefinition *actionDefD
    if(rval.code == RC_FAIL || rval.code == RC_WMORE)
    {
       DU_LOG("\nERROR  -->  E2AP : ASN decode failed for E2SM-KPM Action Definition");
+      failureCause->causeType = E2_PROTOCOL;
+      failureCause->cause = E2_ABSTRACT_SYNTAX_ERROR_FALSELY_CONSTRUCTED_MESSAGE;
       return RFAILED;
    }
    printf("\n");
@@ -2068,12 +2471,22 @@ uint8_t extractRicActionDef(RanFunction *ranFuncDb, ActionDefinition *actionDefD
       }
 
       if(memFailure)
+      {
+         failureCause->causeType = E2_MISCELLANEOUS;
+         failureCause->cause = E2_MISCELLANEOUS_CAUSE_UNSPECIFIED; 
          break;
+      }
    } /* End of for loop, traversing Report-styles-supported list in E2 node */
 
    /* Memset action Db and Free E2SM_KPM_ActionDefinition_t */
    memset(actionDefDb, 0, sizeof(ActionDefinition));
    freeAperDecodingOfRicActionDefinition(actionDefPtr);
+
+   if(failureCause->causeType == E2_NOTHING)
+   {
+      failureCause->causeType = E2_RIC_REQUEST;
+      failureCause->cause = E2_ACTION_NOT_SUPPORTED;
+   }
    return RFAILED;
 }
 
@@ -2096,7 +2509,8 @@ uint8_t extractRicActionDef(RanFunction *ranFuncDb, ActionDefinition *actionDefD
  *         RFAILED - failure
  *
  ******************************************************************/
-uint8_t extractRicActionToBeSetup(RanFunction *ranFuncDb, RicSubscription *ricSubscriptionInfo, RICactions_ToBeSetup_List_t *actionList)
+uint8_t extractRicActionToBeSetup(RanFunction *ranFuncDb, RicSubscription *ricSubscriptionInfo, \
+   RICactions_ToBeSetup_List_t *actionList, E2FailureCause *failureCause, PendingSubsRspInfo *subsRsp)
 {
    uint8_t actionIdx = 0;
    uint8_t ricActionId = 0;
@@ -2115,25 +2529,34 @@ uint8_t extractRicActionToBeSetup(RanFunction *ranFuncDb, RicSubscription *ricSu
                    * If RIC action definition's extraction and validation passes, 
                    * Then : 
                    * This action is added to action sequence list of subscription info */
+                  ricActionId = actionItem->value.choice.RICaction_ToBeSetup_Item.ricActionID;
+
                   if(actionItem->value.choice.RICaction_ToBeSetup_Item.ricActionType == RICactionType_report)
                   {
-                     ricActionId = actionItem->value.choice.RICaction_ToBeSetup_Item.ricActionID;
                      ricSubscriptionInfo->actionSequence[ricActionId-1].id = ricActionId;
                      ricSubscriptionInfo->actionSequence[ricActionId-1].type = REPORT;
 
                      if(extractRicActionDef(ranFuncDb, &ricSubscriptionInfo->actionSequence[ricActionId-1].definition, \
-                        actionItem->value.choice.RICaction_ToBeSetup_Item.ricActionDefinition) == ROK)
+                        actionItem->value.choice.RICaction_ToBeSetup_Item.ricActionDefinition, failureCause) == ROK)
                      {
                         ricSubscriptionInfo->actionSequence[ricActionId-1].action = CONFIG_ADD;
                         ricSubscriptionInfo->numOfActions++;
+                        break;
                      }
-                     else
-                     {
-                        memset(&ricSubscriptionInfo->actionSequence[ricActionId-1], 0, sizeof(ActionInfo));
-                        /* TODO : Since this action addition failed, add to
-                         * reject-action-list in subscription response */
-                     }
                   }
+
+                  /* In case of any failure, action is rejected
+                   * Added to rejected-action-list in subscription response */
+                  memset(&ricSubscriptionInfo->actionSequence[ricActionId-1], 0, sizeof(ActionInfo));
+                  subsRsp->rejectedActionList[subsRsp->numOfRejectedActions].id = ricActionId;
+                  if(failureCause->causeType == E2_NOTHING)
+                  {
+                     failureCause->causeType = E2_RIC_REQUEST;
+                     failureCause->cause = E2_ACTION_NOT_SUPPORTED;
+                  }
+                  memcpy(&subsRsp->rejectedActionList[subsRsp->numOfRejectedActions].failureCause, \
+                        failureCause, sizeof(E2FailureCause));
+                  subsRsp->numOfRejectedActions++;
                   break;
                }
             default:
@@ -2147,6 +2570,11 @@ uint8_t extractRicActionToBeSetup(RanFunction *ranFuncDb, RicSubscription *ricSu
    if(ricSubscriptionInfo->numOfActions)
       return ROK;
 
+   if(failureCause->causeType == E2_NOTHING)
+   {
+      failureCause->causeType = E2_RIC_REQUEST;
+      failureCause->cause = E2_ACTION_NOT_SUPPORTED;
+   }
    return RFAILED;
 }
 
@@ -2156,30 +2584,34 @@ uint8_t extractRicActionToBeSetup(RanFunction *ranFuncDb, RicSubscription *ricSu
  *
  * @details
  *
- *    Function : procRicSubsReq
+ *    Function : procRicSubscriptionRequest
  *
- *    Functionality: Processes E2 Setup Response sent by CU
+ *    Functionality: Processes RIC Subscription Request from RIC
  *
  * @params[in] E2AP_PDU_t ASN decoded E2AP message
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-
-uint8_t procRicSubsReq(E2AP_PDU_t *e2apMsg)
+uint8_t procRicSubscriptionRequest(E2AP_PDU_t *e2apMsg)
 {
    uint8_t idx = 0; 
    uint8_t ret = ROK;
    uint16_t ranFuncId = 0;
+   RicRequestId ricReqId;
    CmLList  *ricSubscriptionNode = NULLP;
    RanFunction *ranFuncDb = NULLP;
    RICsubscriptionRequest_t *ricSubsReq = NULLP;
    RICsubscriptionDetails_t *subsDetails = NULLP;
    RicSubscription *ricSubscriptionInfo = NULLP;
+   E2FailureCause failureCause;
 
    DU_LOG("\nINFO   -->  E2AP : RIC Subscription request received"); 
-   ricSubsReq = &e2apMsg->choice.initiatingMessage->value.choice.RICsubscriptionRequest;
 
+   memset(&failureCause, 0, sizeof(E2FailureCause));
+   memset(&ricReqId, 0, sizeof(RicRequestId));
+
+   ricSubsReq = &e2apMsg->choice.initiatingMessage->value.choice.RICsubscriptionRequest;
    for(idx=0; idx<ricSubsReq->protocolIEs.list.count; idx++)
    {
       if(ricSubsReq->protocolIEs.list.array[idx])
@@ -2188,15 +2620,8 @@ uint8_t procRicSubsReq(E2AP_PDU_t *e2apMsg)
          {
             case ProtocolIE_IDE2_id_RICrequestID:
                {
-                  DU_ALLOC(ricSubscriptionInfo, sizeof(RicSubscription));
-                  if(!ricSubscriptionInfo)
-                  {
-                     DU_LOG("\nERROR  -->  E2AP : Memory allocation failed for ricSubscriptionInfo");
-                     ret = RFAILED;
-                     break;
-                  }
-                  ricSubscriptionInfo->requestId.requestorId = ricSubsReq->protocolIEs.list.array[idx]->value.choice.RICrequestID.ricRequestorID;
-                  ricSubscriptionInfo->requestId.instanceId = ricSubsReq->protocolIEs.list.array[idx]->value.choice.RICrequestID.ricInstanceID;
+                  ricReqId.requestorId = ricSubsReq->protocolIEs.list.array[idx]->value.choice.RICrequestID.ricRequestorID;
+                  ricReqId.instanceId  = ricSubsReq->protocolIEs.list.array[idx]->value.choice.RICrequestID.ricInstanceID;
 
                   break;
                }
@@ -2206,15 +2631,40 @@ uint8_t procRicSubsReq(E2AP_PDU_t *e2apMsg)
                   ranFuncId = ricSubsReq->protocolIEs.list.array[idx]->value.choice.RANfunctionID; 
 
                   /* Validating RAN Function id */
-                  if(duCb.e2apDb.ranFunction[ranFuncId-1].id == ranFuncId)
+                  ranFuncDb = fetchRanFuncFromRanFuncId(ranFuncId);
+
+                  if(!ranFuncDb)
+                  {
+                     failureCause.causeType = E2_RIC_REQUEST;
+                     failureCause.cause = E2_RAN_FUNCTION_ID_INVALID;
+                     ret = RFAILED;
+                     break;
+                  }
+
+                  if(ranFuncDb->numPendingSubsRsp >= MAX_PENDING_SUBSCRIPTION_RSP)
                   {
-                     ranFuncDb = &duCb.e2apDb.ranFunction[ranFuncId-1];
+                     failureCause.causeType = E2_RIC_REQUEST;
+                     failureCause.cause = E2_FUNCTION_RESOURCE_LIMIT; 
+                     ret = RFAILED;
+                     break;
                   }
-                  else
+
+                  DU_ALLOC(ricSubscriptionInfo, sizeof(RicSubscription));
+                  if(!ricSubscriptionInfo)
                   {
-                     /* TODO : Send RAN Subcription Failure */
+                     DU_LOG("\nERROR  -->  E2AP : Memory allocation failed for ricSubscriptionInfo");
+                     failureCause.causeType = E2_MISCELLANEOUS;
+                     failureCause.cause = E2_MISCELLANEOUS_CAUSE_UNSPECIFIED;
                      ret = RFAILED;
+                     break;
                   }
+                  ricSubscriptionInfo->requestId.requestorId = ricReqId.requestorId;
+                  ricSubscriptionInfo->requestId.instanceId = ricReqId.instanceId;
+
+                  memset(&ranFuncDb->pendingSubsRspInfo[ranFuncDb->numPendingSubsRsp], 0, sizeof(PendingSubsRspInfo));
+                  memcpy(&ranFuncDb->pendingSubsRspInfo[ranFuncDb->numPendingSubsRsp].requestId, 
+                        &ricReqId, sizeof(RicRequestId));
+                  ranFuncDb->pendingSubsRspInfo[ranFuncDb->numPendingSubsRsp].ranFuncId = ranFuncId;
                   break;
                }
 
@@ -2223,17 +2673,17 @@ uint8_t procRicSubsReq(E2AP_PDU_t *e2apMsg)
                   subsDetails = &ricSubsReq->protocolIEs.list.array[idx]->value.choice.RICsubscriptionDetails;
 
                   /* Decode, Validate and record Event Trigger Definition */
-                  if(extractEventTriggerDef(ranFuncDb, ricSubscriptionInfo, &subsDetails->ricEventTriggerDefinition) != ROK)
+                  if(extractEventTriggerDef(ranFuncDb, ricSubscriptionInfo, &subsDetails->ricEventTriggerDefinition, \
+                     &failureCause) != ROK)
                   {
-                     /* TODO : Send RAN Subcription Failure */
                      ret = RFAILED;
                      break;
                   }
 
                   /* Decode, Validate and record RIC actions */
-                  if(extractRicActionToBeSetup(ranFuncDb, ricSubscriptionInfo, &subsDetails->ricAction_ToBeSetup_List) != ROK)
+                  if(extractRicActionToBeSetup(ranFuncDb, ricSubscriptionInfo, &subsDetails->ricAction_ToBeSetup_List, \
+                     &failureCause, &ranFuncDb->pendingSubsRspInfo[ranFuncDb->numPendingSubsRsp]) != ROK)
                   {
-                     /* TODO : Send RAN Subcription Failure */
                      ret = RFAILED;
                      break;
                   }
@@ -2263,20 +2713,200 @@ uint8_t procRicSubsReq(E2AP_PDU_t *e2apMsg)
          cmLListAdd2Tail(&ranFuncDb->subscriptionList, ricSubscriptionNode);
       }
 
+      ranFuncDb->numPendingSubsRsp++;
+
 #ifdef KPI_CALCULATION
       /* Send statistics request to other DU entities */
       BuildAndSendStatsReq(ranFuncId, ricSubscriptionInfo);
 #endif      
 
-      /* TODO : Trigger RIC subscription response once statistics response is
+      /* TODO : Trigger RIC Indication once statistics indication is
        * received from MAC . 
-       * TBD in next gerrit */
-      ret = BuildAndSendRicSubscriptionRsp();
+       * TBD in future gerrit */
+       //BuildAndSendRicIndication(ricSubscriptionInfo);
+   }
+   else
+   {
+      DU_FREE(ricSubscriptionInfo, sizeof(RicSubscription));
+
+      if(ranFuncDb)
+      {
+         memset(&ranFuncDb->pendingSubsRspInfo[ranFuncDb->numPendingSubsRsp], 0, sizeof(PendingSubsRspInfo));
+      }
+
+      /* Send RIC Subcription Failure */
+      BuildAndSendRicSubscriptionFailure(ricReqId, ranFuncId, failureCause);
+   }
+
+   return ret;
+}
+
+/******************************************************************
+ *
+ * @brief Free RIC Subscription Failure
+ *
+ * @details
+ *
+ *    Function : FreeRicSubscriptionFailure
+ *
+ *    Functionality: Free RIC Subscription Failure
+ *
+ * @params[in] E2AP PDU
+ * @return void
+ *
+ * ****************************************************************/
+void FreeRicSubscriptionFailure(E2AP_PDU_t *e2apMsg)
+{
+   uint8_t elemIdx = 0;
+   RICsubscriptionFailure_t *ricSubscriptionFailure = NULLP;
+
+   if(e2apMsg)
+   {
+      if(e2apMsg->choice.unsuccessfulOutcome)
       {
-         BuildAndSendRicIndication(ricSubscriptionInfo);
+         ricSubscriptionFailure = &e2apMsg->choice.unsuccessfulOutcome->value.choice.RICsubscriptionFailure;
+         if(ricSubscriptionFailure->protocolIEs.list.array)
+         {
+            for(elemIdx = 0; elemIdx < ricSubscriptionFailure->protocolIEs.list.count; elemIdx++)
+            {
+               DU_ALLOC(ricSubscriptionFailure->protocolIEs.list.array[elemIdx], sizeof(RICsubscriptionFailure_IEs_t));
+            }
+            DU_ALLOC(ricSubscriptionFailure->protocolIEs.list.array, ricSubscriptionFailure->protocolIEs.list.size);
+         }
+         DU_ALLOC(e2apMsg->choice.unsuccessfulOutcome, sizeof(UnsuccessfulOutcomeE2_t));
       }
+      DU_ALLOC(e2apMsg, sizeof(E2AP_PDU_t));
    }
+}
+
+/******************************************************************
+ *
+ * @brief Fill and Send RIC Subscription Failure to RIC
+ *
+ * @details
+ *
+ *    Function : BuildAndSendRicSubscriptionFailure
+ *
+ *    Functionality: Fill and Send RIC Subscription Failure to RIC
+ *
+ * @params[in] RIC Request ID
+ *             RAN Function ID
+ *             Cause of Failure
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildAndSendRicSubscriptionFailure(RicRequestId ricReqId, uint16_t ranFuncId, E2FailureCause failureCause)
+{
+   uint8_t          ret = RFAILED;
+   uint8_t          elementCnt = 0, elemIdx = 0;
+   E2AP_PDU_t       *e2apMsg = NULLP;
+   asn_enc_rval_t   encRetVal;        /* Encoder return value */
+   RICsubscriptionFailure_t *ricSubscriptionFailure = NULLP;
+   RICsubscriptionFailure_IEs_t *ricSubsFailIe = NULLP;
+
+   while(true)
+   {
+      DU_LOG("\nINFO   -->  E2AP : Building RIC Subscription Failure\n");
 
+      DU_ALLOC(e2apMsg, sizeof(E2AP_PDU_t));
+      if(e2apMsg == NULLP)
+      {
+         DU_LOG("\nERROR  -->  E2AP : Memory allocation at [%s] : Line [%d]", __func__, __LINE__); 
+         break;
+      }
+
+      e2apMsg->present = E2AP_PDU_PR_unsuccessfulOutcome;
+      DU_ALLOC(e2apMsg->choice.unsuccessfulOutcome, sizeof(UnsuccessfulOutcomeE2_t));
+      if(e2apMsg->choice.unsuccessfulOutcome == NULLP)
+      {
+         DU_LOG("\nERROR  -->  E2AP : Memory allocation at [%s] : Line [%d]", __func__, __LINE__); 
+         break;
+      }
+      e2apMsg->choice.unsuccessfulOutcome->procedureCode = ProcedureCodeE2_id_RICsubscription;
+      e2apMsg->choice.unsuccessfulOutcome->criticality = CriticalityE2_reject;
+      e2apMsg->choice.unsuccessfulOutcome->value.present = UnsuccessfulOutcomeE2__value_PR_RICsubscriptionFailure;
+
+      ricSubscriptionFailure = &e2apMsg->choice.unsuccessfulOutcome->value.choice.RICsubscriptionFailure;
+
+      elementCnt = 3;
+      ricSubscriptionFailure->protocolIEs.list.count = elementCnt;
+      ricSubscriptionFailure->protocolIEs.list.size = elementCnt * sizeof(RICsubscriptionFailure_IEs_t *);
+      DU_ALLOC(ricSubscriptionFailure->protocolIEs.list.array, ricSubscriptionFailure->protocolIEs.list.size);
+      if(!ricSubscriptionFailure->protocolIEs.list.array)
+      {
+         DU_LOG("\nERROR  -->  E2AP : Memory allocation at [%s] : Line [%d]", __func__, __LINE__); 
+         break;
+      }
+
+      for(elemIdx = 0; elemIdx < elementCnt; elemIdx++)
+      {
+         DU_ALLOC(ricSubscriptionFailure->protocolIEs.list.array[elemIdx], sizeof(RICsubscriptionFailure_IEs_t));
+         if(!ricSubscriptionFailure->protocolIEs.list.array[elemIdx])
+         {
+            DU_LOG("\nERROR  -->  E2AP : Memory allocation at [%s] : Line [%d] for IE at index [%d]", \
+               __func__, __LINE__, elemIdx);
+            break;
+         }
+      }
+      if(elemIdx < elementCnt)
+         break;
+
+      elemIdx = 0;
+
+      /* RIC Request ID */
+      ricSubsFailIe = ricSubscriptionFailure->protocolIEs.list.array[elemIdx++];
+      ricSubsFailIe->id = ProtocolIE_IDE2_id_RICrequestID;
+      ricSubsFailIe->criticality = CriticalityE2_reject;
+      ricSubsFailIe->value.present = RICsubscriptionFailure_IEs__value_PR_RICrequestID;
+      ricSubsFailIe->value.choice.RICrequestID.ricRequestorID = ricReqId.requestorId;
+      ricSubsFailIe->value.choice.RICrequestID.ricInstanceID = ricReqId.instanceId;
+
+      /* RAN Function ID */
+      ricSubsFailIe = ricSubscriptionFailure->protocolIEs.list.array[elemIdx++];
+      ricSubsFailIe->id = ProtocolIE_IDE2_id_RANfunctionID;
+      ricSubsFailIe->criticality = CriticalityE2_reject;
+      ricSubsFailIe->value.present = RICsubscriptionFailure_IEs__value_PR_RANfunctionID;
+      ricSubsFailIe->value.choice.RANfunctionID = ranFuncId;
+
+      /* Cause */
+      ricSubsFailIe = ricSubscriptionFailure->protocolIEs.list.array[elemIdx++];
+      ricSubsFailIe->id = ProtocolIE_IDE2_id_CauseE2;
+      ricSubsFailIe->criticality = CriticalityE2_reject;
+      ricSubsFailIe->value.present = RICsubscriptionFailure_IEs__value_PR_CauseE2;
+      fillE2Cause(&ricSubsFailIe->value.choice.CauseE2, failureCause);
+
+      /* Prints the Msg formed */
+      xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2apMsg);
+      memset(encBuf, 0, ENC_BUF_MAX_LEN);
+      encBufSize = 0;
+      encRetVal = aper_encode(&asn_DEF_E2AP_PDU, 0, e2apMsg, PrepFinalEncBuf, encBuf);
+      if(encRetVal.encoded == ENCODE_FAIL)
+      {
+         DU_LOG("\nERROR  -->  E2AP : Could not encode RIC Subscription Failure Message (at %s)\n",\
+               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+         break;
+      }
+      else
+      {
+         DU_LOG("\nDEBUG  -->  E2AP : Created APER encoded buffer for RIC Subscription Failure Message \n");
+#ifdef DEBUG_ASN_PRINT
+         for(int i=0; i< encBufSize; i++)
+         {
+            printf("%x",encBuf[i]);
+         }
+#endif
+      }
+
+      if(SendE2APMsg(DU_APP_MEM_REGION, DU_POOL, encBuf, encBufSize) != ROK)
+      {
+         DU_LOG("\nINFO   -->  E2AP : Sending RIC Subscription Failure");
+
+      }
+      ret = ROK;
+      break;
+   }
+   FreeRicSubscriptionFailure(e2apMsg);
    return ret;
 }
 
@@ -2560,6 +3190,60 @@ uint8_t BuildAndSendRicIndication(RicSubscription *ricSubscriptionInfo)
    return ret;
 }
 
+/*******************************************************************
+ *
+ * @brief free e2 node component configuration req and rsp
+ *
+ * @details
+ *
+ *    Function : freeE2NodeComponentConfiguration 
+ *
+ *    Functionality:
+ *       - free e2 node component configuration req and rsp
+ *
+ * @params[in] E2nodeComponentConfiguration_t *e2nodeComponentConfiguration
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+void freeE2NodeComponentConfiguration(E2nodeComponentConfiguration_t *e2nodeComponentConfiguration)
+{
+   /* Free E2 Node Component Request Part */
+   DU_FREE(e2nodeComponentConfiguration->e2nodeComponentRequestPart.buf, e2nodeComponentConfiguration->e2nodeComponentRequestPart.size);
+
+   /* Free E2 Node Component Response Part */
+   DU_FREE(e2nodeComponentConfiguration->e2nodeComponentResponsePart.buf, e2nodeComponentConfiguration->e2nodeComponentResponsePart.size);
+                                 
+}
+
+/*******************************************************************
+ *
+ * @brief free e2 node component component identifier
+ *
+ * @details
+ *
+ *    Function : freeE2NodeComponentIdentifier
+ *
+ *    Functionality:
+ *       - free e2 node component component identifier
+ *
+ * @params[in] E2nodeComponentID_t  *componentID 
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+void freeE2NodeComponentIdentifier(E2nodeComponentID_t *componentID)
+{
+   if(componentID->choice.e2nodeComponentInterfaceTypeF1)
+   {
+      DU_FREE(componentID->choice.e2nodeComponentInterfaceTypeF1->gNB_DU_ID.buf, componentID->choice.e2nodeComponentInterfaceTypeF1->gNB_DU_ID.size);
+      DU_FREE(componentID->choice.e2nodeComponentInterfaceTypeF1, sizeof(E2nodeComponentInterfaceF1_t));
+   }
+                                 
+}
+
 /*******************************************************************
  *
  * @brief Deallocate the memory allocated for E2nodeConfigurationUpdate msg 
@@ -2576,10 +3260,17 @@ uint8_t BuildAndSendRicIndication(RicSubscription *ricSubscriptionInfo)
  *         RFAILED - failure
  *
  * ****************************************************************/
+
 void FreeE2NodeConfigUpdate(E2AP_PDU_t *e2apMsg)
 {
-   uint8_t arrIdx =0;
-   E2nodeConfigurationUpdate_t *e2NodeConfigUpdate;
+   uint8_t arrIdx =0, e2NodeUpdateListIdx=0, e2NodeRemovalListIdx=0, e2NodeAddListIdx=0;
+   E2nodeConfigurationUpdate_t *e2NodeConfigUpdate =NULL;
+   E2nodeComponentConfigUpdate_List_t *e2NodeUpdateList  =NULL;
+   E2nodeComponentConfigUpdate_ItemIEs_t *e2NodeUpdateItem =NULL;
+   E2nodeComponentConfigRemoval_List_t *e2NodeRemovalList =NULL;
+   E2nodeComponentConfigRemoval_ItemIEs_t *e2NodeRemovalItem =NULL;
+   E2nodeComponentConfigAddition_List_t *e2NodeAddList =NULL;
+   E2nodeComponentConfigAddition_ItemIEs_t *e2NodeAddItem =NULL;
 
    if(e2apMsg != NULLP)
    {
@@ -2590,7 +3281,70 @@ void FreeE2NodeConfigUpdate(E2AP_PDU_t *e2apMsg)
          {
             for(arrIdx = 0; arrIdx < e2NodeConfigUpdate->protocolIEs.list.count; arrIdx++)
             {
-               DU_FREE(e2NodeConfigUpdate->protocolIEs.list.array[arrIdx], sizeof(E2nodeConfigurationUpdate_IEs_t));
+               if(e2NodeConfigUpdate->protocolIEs.list.array[arrIdx])
+               {
+
+                  switch(e2NodeConfigUpdate->protocolIEs.list.array[arrIdx]->id)
+                  {
+                     case ProtocolIE_IDE2_id_TransactionID:
+                        break;
+
+                     case ProtocolIE_IDE2_id_E2nodeComponentConfigAddition:
+                     {
+                         e2NodeAddList = &e2NodeConfigUpdate->protocolIEs.list.array[arrIdx]->value.choice.E2nodeComponentConfigAddition_List;
+                         if(e2NodeAddList->list.array)
+                         {
+                             for(e2NodeAddListIdx = 0; e2NodeAddListIdx< e2NodeAddList->list.count; e2NodeAddListIdx++)
+                             {
+                                e2NodeAddItem = (E2nodeComponentConfigAddition_ItemIEs_t *) e2NodeAddList->list.array[e2NodeAddListIdx];
+                                 
+                                freeE2NodeComponentConfiguration(&e2NodeAddItem->value.choice.E2nodeComponentConfigAddition_Item.e2nodeComponentConfiguration);
+                                freeE2NodeComponentIdentifier(&e2NodeAddItem->value.choice.E2nodeComponentConfigAddition_Item.e2nodeComponentID);
+                                DU_FREE(e2NodeAddItem, sizeof(E2nodeComponentConfigAddition_ItemIEs_t));
+                             }
+                             DU_FREE(e2NodeAddList->list.array, e2NodeAddList->list.size);
+                         }
+                         break;
+                     }
+                     case ProtocolIE_IDE2_id_E2nodeComponentConfigUpdate:
+                        {
+                           e2NodeUpdateList = &e2NodeConfigUpdate->protocolIEs.list.array[arrIdx]->value.choice.E2nodeComponentConfigUpdate_List;
+                           if(e2NodeUpdateList->list.array)
+                           {
+                              for(e2NodeUpdateListIdx = 0; e2NodeUpdateListIdx< e2NodeUpdateList->list.count; e2NodeUpdateListIdx++)
+                              {
+                                 e2NodeUpdateItem = (E2nodeComponentConfigUpdate_ItemIEs_t *) e2NodeUpdateList->list.array[e2NodeUpdateListIdx];
+                                 
+                                 freeE2NodeComponentConfiguration(&e2NodeUpdateItem->value.choice.E2nodeComponentConfigUpdate_Item.e2nodeComponentConfiguration);
+                                 freeE2NodeComponentIdentifier(&e2NodeUpdateItem->value.choice.E2nodeComponentConfigUpdate_Item.e2nodeComponentID);
+                                 DU_FREE(e2NodeUpdateItem, sizeof(E2nodeComponentConfigUpdate_ItemIEs_t));
+                              }
+                              DU_FREE(e2NodeUpdateList->list.array, e2NodeUpdateList->list.size);
+                           }
+                           break;
+                        }
+                     case ProtocolIE_IDE2_id_E2nodeComponentConfigRemoval:
+                        {
+                           e2NodeRemovalList = &e2NodeConfigUpdate->protocolIEs.list.array[arrIdx]->value.choice.E2nodeComponentConfigRemoval_List;
+                           if(e2NodeRemovalList->list.array)
+                           {
+                              for(e2NodeRemovalListIdx = 0; e2NodeRemovalListIdx< e2NodeRemovalList->list.count; e2NodeRemovalListIdx++)
+                              {
+                                 e2NodeRemovalItem = (E2nodeComponentConfigRemoval_ItemIEs_t *) e2NodeRemovalList->list.array[e2NodeRemovalListIdx];
+
+                                 freeE2NodeComponentIdentifier(&e2NodeRemovalItem->value.choice.E2nodeComponentConfigRemoval_Item.e2nodeComponentID);
+                                 DU_FREE(e2NodeRemovalItem, sizeof(E2nodeComponentConfigRemoval_ItemIEs_t));
+                              }
+                              DU_FREE(e2NodeRemovalList->list.array, e2NodeRemovalList->list.size);
+                           }
+                           break;
+                        }
+                           
+                     default:
+                        break;
+                  }
+                  DU_FREE(e2NodeConfigUpdate->protocolIEs.list.array[arrIdx], sizeof(E2nodeConfigurationUpdate_IEs_t));
+               }
             }
             DU_FREE(e2NodeConfigUpdate->protocolIEs.list.array, e2NodeConfigUpdate->protocolIEs.list.size);
          }
@@ -2617,13 +3371,13 @@ void FreeE2NodeConfigUpdate(E2AP_PDU_t *e2apMsg)
  *
  * ****************************************************************/
 
-uint8_t BuildAndSendE2NodeConfigUpdate()
+uint8_t BuildAndSendE2NodeConfigUpdate(E2NodeConfigList *e2NodeList)
 {
-   uint8_t arrIdx = 0,elementCnt = 1;
-   uint8_t ret = ROK;
-   E2AP_PDU_t        *e2apMsg = NULLP;
-   E2nodeConfigurationUpdate_t *e2NodeConfigUpdate = NULLP;
+   uint8_t ret = RFAILED;
+   uint8_t arrIdx = 0,elementCnt = 0, transId=0;
+   E2AP_PDU_t  *e2apMsg = NULLP;
    asn_enc_rval_t     encRetVal;       /* Encoder return value */
+   E2nodeConfigurationUpdate_t *e2NodeConfigUpdate = NULLP;
 
    DU_LOG("\nINFO   -->  E2AP : Building E2 Node config update\n");
    do
@@ -2634,25 +3388,31 @@ uint8_t BuildAndSendE2NodeConfigUpdate()
          DU_LOG("\nERROR  -->  E2AP : Memory allocation for E2AP-PDU failed");
          break;
       }
+
       e2apMsg->present = E2AP_PDU_PR_initiatingMessage;
       DU_ALLOC(e2apMsg->choice.initiatingMessage, sizeof(InitiatingMessageE2_t));
       if(e2apMsg->choice.initiatingMessage == NULLP)
       {
          DU_LOG("\nERROR  -->  E2AP : Memory allocation for E2AP-PDU failed");
-         DU_FREE(e2apMsg, sizeof(E2AP_PDU_t));
-         return RFAILED;
+         break;
       }
       e2apMsg->choice.initiatingMessage->criticality = CriticalityE2_reject;
       e2apMsg->choice.initiatingMessage->procedureCode = ProcedureCodeE2_id_E2nodeConfigurationUpdate;
       e2apMsg->choice.initiatingMessage->value.present = \
       InitiatingMessageE2__value_PR_E2nodeConfigurationUpdate;
       e2NodeConfigUpdate = &e2apMsg->choice.initiatingMessage->value.choice.E2nodeConfigurationUpdate;
+      
+      elementCnt =1;
+      if(e2NodeList->addE2NodeCount)
+         elementCnt++;
+      if(e2NodeList->updateE2NodeCount)
+         elementCnt++;
+      if(e2NodeList->removeE2NodeCount)
+         elementCnt++;
 
       e2NodeConfigUpdate->protocolIEs.list.count = elementCnt;
       e2NodeConfigUpdate->protocolIEs.list.size  = elementCnt * sizeof(E2nodeConfigurationUpdate_IEs_t*);
-      /* Initialize the Ric Indication members */
-      DU_ALLOC(e2NodeConfigUpdate->protocolIEs.list.array, \
-            e2NodeConfigUpdate->protocolIEs.list.size);
+      DU_ALLOC(e2NodeConfigUpdate->protocolIEs.list.array, e2NodeConfigUpdate->protocolIEs.list.size);
       if(e2NodeConfigUpdate->protocolIEs.list.array == NULLP)
       {
          DU_LOG("\nERROR  -->  E2AP : Memory allocation for e2NodeConfigUpdate failed");
@@ -2669,22 +3429,67 @@ uint8_t BuildAndSendE2NodeConfigUpdate()
             break;
          }
       }
+      
+      if(arrIdx<elementCnt)
+         break;
 
       arrIdx = 0;
-      /* TransactionID */
       e2NodeConfigUpdate->protocolIEs.list.array[arrIdx]->id = ProtocolIE_IDE2_id_TransactionID;
       e2NodeConfigUpdate->protocolIEs.list.array[arrIdx]->criticality = CriticalityE2_reject;
       e2NodeConfigUpdate->protocolIEs.list.array[arrIdx]->value.present = E2nodeConfigurationUpdate_IEs__value_PR_TransactionID;
-      e2NodeConfigUpdate->protocolIEs.list.array[arrIdx]->value.choice.TransactionID = TRANS_ID;
+      transId = assignTransactionId();
+      e2NodeConfigUpdate->protocolIEs.list.array[arrIdx]->value.choice.TransactionID = transId;
+
+      if(e2NodeList->addE2NodeCount)
+      {
+         arrIdx++;
+         e2NodeConfigUpdate->protocolIEs.list.array[arrIdx]->id = ProtocolIE_IDE2_id_E2nodeComponentConfigAddition;
+         e2NodeConfigUpdate->protocolIEs.list.array[arrIdx]->criticality = CriticalityE2_reject;
+         e2NodeConfigUpdate->protocolIEs.list.array[arrIdx]->value.present = E2nodeConfigurationUpdate_IEs__value_PR_E2nodeComponentConfigAddition_List;
+         if(BuildE2NodeConfigAddList(&(e2NodeConfigUpdate->protocolIEs.list.array[arrIdx]->value.choice.E2nodeComponentConfigAddition_List),\
+         ProcedureCodeE2_id_E2nodeConfigurationUpdate, e2NodeList->addE2NodeCount, e2NodeList->addE2Node)!=ROK)
+         {
+            DU_LOG("\nERROR  -->  E2AP : Failed to create E2 Node config list");
+            break;
+         }
+      }
+      
+      if(e2NodeList->updateE2NodeCount)
+      {
+         arrIdx++;
+         e2NodeConfigUpdate->protocolIEs.list.array[arrIdx]->id = ProtocolIE_IDE2_id_E2nodeComponentConfigUpdate;
+         e2NodeConfigUpdate->protocolIEs.list.array[arrIdx]->criticality = CriticalityE2_reject;
+         e2NodeConfigUpdate->protocolIEs.list.array[arrIdx]->value.present = E2nodeConfigurationUpdate_IEs__value_PR_E2nodeComponentConfigUpdate_List;
+         if(BuildE2NodeConfigUpdateList(&e2NodeConfigUpdate->protocolIEs.list.array[arrIdx]->value.choice.E2nodeComponentConfigUpdate_List,\
+         e2NodeList->updateE2NodeCount, e2NodeList->updateE2Node) != ROK)
+         {
+
+            DU_LOG("\nERROR  -->  E2AP : Failed to update the E2 node configuration");
+            break;
+         }
+      }
+      
+      if(e2NodeList->removeE2NodeCount)
+      {
+         arrIdx++;
+         e2NodeConfigUpdate->protocolIEs.list.array[arrIdx]->id = ProtocolIE_IDE2_id_E2nodeComponentConfigRemoval;
+         e2NodeConfigUpdate->protocolIEs.list.array[arrIdx]->criticality = CriticalityE2_reject;
+         e2NodeConfigUpdate->protocolIEs.list.array[arrIdx]->value.present = E2nodeConfigurationUpdate_IEs__value_PR_E2nodeComponentConfigRemoval_List;
+         if(BuildE2NodeConfigRemoveList(&e2NodeConfigUpdate->protocolIEs.list.array[arrIdx]->value.choice.E2nodeComponentConfigRemoval_List,\
+         e2NodeList->removeE2NodeCount, e2NodeList->removeE2Node) != ROK)
+         {
 
+            DU_LOG("\nERROR  -->  E2AP : Failed to remove the E2 node configuration");
+            break;
+         }
+      }
 
       /* Prints the Msg formed */
       xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2apMsg);
 
       memset(encBuf, 0, ENC_BUF_MAX_LEN);
       encBufSize = 0;
-      encRetVal = aper_encode(&asn_DEF_E2AP_PDU, 0, e2apMsg, PrepFinalEncBuf,\
-            encBuf);
+      encRetVal = aper_encode(&asn_DEF_E2AP_PDU, 0, e2apMsg, PrepFinalEncBuf, encBuf);
       if(encRetVal.encoded == ENCODE_FAIL)
       {
          DU_LOG("\nERROR  -->  E2AP : Could not encode E2nodeConfigurationUpdate structure (at %s)\n",\
@@ -2704,9 +3509,13 @@ uint8_t BuildAndSendE2NodeConfigUpdate()
       if(SendE2APMsg(DU_APP_MEM_REGION, DU_POOL, encBuf, encBufSize))
       {
          DU_LOG("\nERROR  -->  E2AP : Sending E2 node config update failed");
-         return RFAILED;
+         break;
       }
 
+      duCb.e2apDb.e2TransInfo.e2InitTransaction[transId].transactionId = transId;
+      duCb.e2apDb.e2TransInfo.e2InitTransaction[transId].procedureCode = e2apMsg->choice.initiatingMessage->procedureCode;
+      memcpy(&duCb.e2apDb.e2TimersInfo.e2Timers.e2NodeConfigUpdate.configList, e2NodeList, sizeof(E2NodeConfigList));
+      ret = ROK;
       break;
    }while(true);
    
@@ -2770,7 +3579,7 @@ void FreeE2ResetRequest(E2AP_PDU_t *e2apMsg)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildAndSendE2ResetRequest(E2CauseType failureType, E2Cause failureCause)
+uint8_t BuildAndSendE2ResetRequest(E2FailureCause resetCause)
 {
    uint8_t ieIdx = 0, elementCnt = 0, transId = 0;
    uint8_t ret = RFAILED;
@@ -2840,30 +3649,7 @@ uint8_t BuildAndSendE2ResetRequest(E2CauseType failureType, E2Cause failureCause
       resetReq->protocolIEs.list.array[ieIdx]->id = ProtocolIE_IDE2_id_CauseE2;
       resetReq->protocolIEs.list.array[ieIdx]->criticality = CriticalityE2_ignore;
       resetReq->protocolIEs.list.array[ieIdx]->value.present = ResetRequestIEs__value_PR_CauseE2;
-      resetReq->protocolIEs.list.array[ieIdx]->value.choice.CauseE2.present = failureType;
-      switch(resetReq->protocolIEs.list.array[ieIdx]->value.choice.CauseE2.present)
-      {
-         case CauseE2_PR_NOTHING:
-            break;
-         case CauseE2_PR_ricRequest:
-            resetReq->protocolIEs.list.array[ieIdx]->value.choice.CauseE2.choice.ricRequest = failureCause;
-            break;
-         case CauseE2_PR_ricService:
-            resetReq->protocolIEs.list.array[ieIdx]->value.choice.CauseE2.choice.ricService = failureCause;
-            break;
-         case CauseE2_PR_e2Node:
-            resetReq->protocolIEs.list.array[ieIdx]->value.choice.CauseE2.choice.e2Node = failureCause;
-            break;
-         case CauseE2_PR_transport:
-            resetReq->protocolIEs.list.array[ieIdx]->value.choice.CauseE2.choice.transport = failureCause;
-            break;
-         case CauseE2_PR_protocol:
-            resetReq->protocolIEs.list.array[ieIdx]->value.choice.CauseE2.choice.protocol = failureCause;
-            break;
-         case CauseE2_PR_misc:
-            resetReq->protocolIEs.list.array[ieIdx]->value.choice.CauseE2.choice.misc = failureCause;
-            break;
-      }
+      fillE2Cause(&resetReq->protocolIEs.list.array[ieIdx]->value.choice.CauseE2, resetCause);
 
       /* Prints the Msg formed */
       xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2apMsg);
@@ -3013,13 +3799,13 @@ uint8_t procResetResponse(E2AP_PDU_t *e2apMsg)
 
 /******************************************************************
  *
- * @brief Deallocation of memory allocated bu aper decoder for e2 setup Failure
+ * @brief Deallocation of memory allocated by aper decoder for e2 setup Failure
  *
  * @details
  *
  *    Function : freeAperDecodingOfE2SetupFailure
  *
- *    Functionality: Deallocation of memory allocated bu aper decoder for e2
+ *    Functionality: Deallocation of memory allocated by aper decoder for e2
  *    setup Failure
  *
  * @params[in] E2setupFailure_t *e2SetupFailure;
@@ -3089,7 +3875,7 @@ void procE2SetupFailure(E2AP_PDU_t *e2apMsg)
          }
          case ProtocolIE_IDE2_id_TimeToWaitE2:
             {
-               timerValue = covertE2WaitTimerEnumToValue(e2SetupFailure->protocolIEs.list.array[arrIdx]->value.choice.TimeToWaitE2);
+               timerValue = convertE2WaitTimerEnumToValue(e2SetupFailure->protocolIEs.list.array[arrIdx]->value.choice.TimeToWaitE2);
                if((duChkTmr((PTR)&(duCb.e2apDb.e2TimersInfo.e2Timers.e2SetupTimer), EVENT_E2_SETUP_TMR)) == FALSE)
                {
                   duStartTmr((PTR)&(duCb.e2apDb.e2TimersInfo.e2Timers.e2SetupTimer), EVENT_E2_SETUP_TMR, timerValue);
@@ -3108,13 +3894,13 @@ void procE2SetupFailure(E2AP_PDU_t *e2apMsg)
 }
 /******************************************************************
  *
- * @brief Deallocation of memory allocated bu aper decoder for RIC service Query
+ * @brief Deallocation of memory allocated by aper decoder for RIC service Query
  *
  * @details
  *
  *    Function : freeAperDecodingOfRicServiceQuery
  *
- *    Functionality: Deallocation of memory allocated bu aper decoder for RIC
+ *    Functionality: Deallocation of memory allocated by aper decoder for RIC
  *    service Query
  *
  * @params[in] RICserviceQuery_t *ricServiceQuery;
@@ -3482,6 +4268,7 @@ uint8_t BuildAndSendRicServiceUpdate(RicServiceUpdate serviceUpdate)
       }
       duCb.e2apDb.e2TimersInfo.e2Timers.ricServiceUpdateTimer.ricService.dir = serviceUpdate.dir;
       duCb.e2apDb.e2TimersInfo.e2Timers.ricServiceUpdateTimer.ricService.transId =transId;
+      memcpy(&duCb.e2apDb.e2TimersInfo.e2Timers.ricServiceUpdateTimer.ricService.recvRanFuncList, &serviceUpdate.recvRanFuncList, sizeof(E2TmpRanFunList));
    }
    FreeRicServiceUpdate(e2apMsg);
    return ret;
@@ -3597,7 +4384,306 @@ void procRicServiceQuery(E2AP_PDU_t *e2apMsg)
    freeAperDecodingOfRicServiceQuery(ricServiceQuery);
 }
 
+/******************************************************************
+ *
+ * @brief Deallocation of memory allocated by aper decoder for 
+ *    RIC service update ack
+ *
+ * @details
+ *
+ *    Function : freeAperDecodingOfRicServiceUpdateAck
+ *
+ *    Functionality: Deallocation of memory allocated by aper decoder 
+ *    for RIC service update ack
+ *
+ * @params[in] RICserviceUpdateAck_t *ricServiceAck;
+ * @return void
+ *
+ * ****************************************************************/
+
+void freeAperDecodingOfRicServiceUpdateAck(RICserviceUpdateAcknowledge_t *ricServiceAck)
+{
+   uint8_t arrIdx=0,ranFuncIdx=0;
+   RANfunctionsID_List_t *ranFuncAddedList=NULL;
+
+   if(ricServiceAck)
+   {
+      if(ricServiceAck->protocolIEs.list.array)
+      {
+         for(arrIdx=0; arrIdx<ricServiceAck->protocolIEs.list.count; arrIdx++)
+         {
+            if(ricServiceAck->protocolIEs.list.array[arrIdx])
+            {
+               switch(ricServiceAck->protocolIEs.list.array[arrIdx]->id)
+               {
+                  case ProtocolIE_IDE2_id_RANfunctionsAccepted:
+                  {
+                     ranFuncAddedList= &ricServiceAck->protocolIEs.list.array[arrIdx]->value.choice.RANfunctionsID_List;
+                     if(ranFuncAddedList->list.array)
+                     {
+                        for(ranFuncIdx=0;ranFuncIdx<ranFuncAddedList->list.count; ranFuncIdx++)
+                        {
+                           free(ranFuncAddedList->list.array[ranFuncIdx]);
+                        }
+                        free(ranFuncAddedList->list.array);
+                     }
+                     break;
+                  }
+                  default:
+                     break;
+               }
+               free(ricServiceAck->protocolIEs.list.array[arrIdx]);  
+            }
+         }
+         free(ricServiceAck->protocolIEs.list.array);
+      }
+   }
+}
+
+/******************************************************************
+ *
+ * @brief Processes RIC service update ack sent by RIC
+ *
+ * @details
+ *
+ *    Function : procRicServiceUpdateAck
+ *
+ *    Functionality: Processes RIC service update ack sent by RIC
+ *
+ * @params[in] E2AP_PDU_t ASN decoded E2AP message
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+void procRicServiceUpdateAck(E2AP_PDU_t *e2apMsg)
+{
+   uint8_t arrIdx =0, transId =0; 
+   uint16_t id =0, tmpIdx=0, ranFuncIdx=0;
+   RicServiceUpdate serviceUpdate;
+   RANfunctionsIDcause_List_t *rejectedList=NULL;
+   RICserviceUpdateAcknowledge_t *ricServiceAck=NULL;
+   RANfunctionIDcause_ItemIEs_t *ranFuncRejectedItemIe=NULL;
+   
+   DU_LOG("\nINFO   -->  E2AP : RIC service update ack received"); 
+   memset(&serviceUpdate, 0, sizeof(RicServiceUpdate));
+   ricServiceAck = &e2apMsg->choice.successfulOutcome->value.choice.RICserviceUpdateAcknowledge;
+   
+   for(arrIdx=0; arrIdx<ricServiceAck->protocolIEs.list.count; arrIdx++)
+   {
+      switch(ricServiceAck->protocolIEs.list.array[arrIdx]->id)
+      {
+         case ProtocolIE_IDE2_id_TransactionID:
+         {
+            transId = ricServiceAck->protocolIEs.list.array[arrIdx]->value.choice.TransactionID;
+            if((duCb.e2apDb.e2TransInfo.e2InitTransaction[transId].transactionId == transId) &&\
+            (duCb.e2apDb.e2TransInfo.e2InitTransaction[transId].procedureCode == e2apMsg->choice.unsuccessfulOutcome->procedureCode))
+            {
+              memset(&duCb.e2apDb.e2TransInfo.e2InitTransaction[transId], 0, sizeof(E2TransInfo));
+            }
+            else if((duCb.e2apDb.e2TransInfo.ricInitTransaction[transId].transactionId == transId) &&\
+            (duCb.e2apDb.e2TransInfo.ricInitTransaction[transId].procedureCode == e2apMsg->choice.unsuccessfulOutcome->procedureCode))
+            {
+              memset(&duCb.e2apDb.e2TransInfo.ricInitTransaction[transId], 0, sizeof(E2TransInfo));
+            }
+            else
+            {
+               DU_LOG("\nERROR  -->  E2AP : Invalid transaction id [%d]", transId);
+               return ;
+            }
+            break;
+         }
+         
+         case ProtocolIE_IDE2_id_RANfunctionsAccepted:
+            break;
+
+         case ProtocolIE_IDE2_id_RANfunctionsRejected:
+         {
+            rejectedList= &ricServiceAck->protocolIEs.list.array[arrIdx]->value.choice.RANfunctionsIDcause_List;
+            if(rejectedList->list.array)
+            {
+               for(ranFuncIdx=0;ranFuncIdx<rejectedList->list.count; ranFuncIdx++)
+               {
+                  ranFuncRejectedItemIe =  (RANfunctionIDcause_ItemIEs_t*)rejectedList->list.array[ranFuncIdx];
+                  id = ranFuncRejectedItemIe->value.choice.RANfunctionIDcause_Item.ranFunctionID;
+                  tmpIdx= serviceUpdate.recvRanFuncList.numOfRanFunToBeAdded;
+                  serviceUpdate.recvRanFuncList.ranFunToBeAdded[tmpIdx].id = duCb.e2apDb.ranFunction[id-1].id;
+                  serviceUpdate.recvRanFuncList.ranFunToBeAdded[tmpIdx].revisionCounter = duCb.e2apDb.ranFunction[id-1].revisionCounter;
+                  serviceUpdate.recvRanFuncList.numOfRanFunToBeAdded++;
+               }
+            }
+            break;
+         }
+
+      }
+   }
+
+   if(serviceUpdate.recvRanFuncList.numOfRanFunToBeAdded)
+   {
+      serviceUpdate.dir = E2_NODE_INITIATED;
+      BuildAndSendRicServiceUpdate(serviceUpdate);
+   }
+   freeAperDecodingOfRicServiceUpdateAck(ricServiceAck);
+}
+
+/******************************************************************
+ *
+ * @brief Deallocation of memory allocated by aper decoder for 
+ *       RIC service update failure
+ *
+ * @details
+ *
+ *    Function : freeAperDecodingOfRicServiceUpdateFailure
+ *
+ *    Functionality: Deallocation of memory allocated by aper decoder 
+ *    for RIC service update failure
+ *
+ * @params[in] RICserviceUpdateFailure_t *ricServiceFailure;
+ * @return void
+ *
+ * ****************************************************************/
+
+void freeAperDecodingOfRicServiceUpdateFailure(RICserviceUpdateFailure_t *ricServiceFailure)
+{
+   uint8_t arrIdx=0;
+
+   if(ricServiceFailure)
+   {
+      if(ricServiceFailure->protocolIEs.list.array)
+      {
+         for(arrIdx=0; arrIdx<ricServiceFailure->protocolIEs.list.count; arrIdx++)
+         {
+            if(ricServiceFailure->protocolIEs.list.array[arrIdx])
+            {
+               free(ricServiceFailure->protocolIEs.list.array[arrIdx]);  
+            }
+         }
+         free(ricServiceFailure->protocolIEs.list.array);
+      }
+   }
+}
+
+/******************************************************************
+ *
+ * @brief Processes RIC service update failure sent by RIC
+ *
+ * @details
+ *
+ *    Function : procRicServiceUpdateFailure
+ *
+ *    Functionality: Processes RIC service update failure sent by RIC
+ *
+ * @params[in] E2AP_PDU_t ASN decoded E2AP message
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+void procRicServiceUpdateFailure(E2AP_PDU_t *e2apMsg)
+{
+   uint8_t arrIdx =0, timerValue=0; 
+   RICserviceUpdateFailure_t *ricServiceFailure=NULL;
+
+   DU_LOG("\nINFO   -->  E2AP : RIC service update failure received"); 
+   ricServiceFailure = &e2apMsg->choice.unsuccessfulOutcome->value.choice.RICserviceUpdateFailure;
+
+   for(arrIdx=0; arrIdx<ricServiceFailure->protocolIEs.list.count; arrIdx++)
+   {
+      switch(ricServiceFailure->protocolIEs.list.array[arrIdx]->id)
+      {
+         case ProtocolIE_IDE2_id_TransactionID:
+            {
+               break;
+            }
+         case ProtocolIE_IDE2_id_TimeToWaitE2:
+            {
+               timerValue = convertE2WaitTimerEnumToValue(ricServiceFailure->protocolIEs.list.array[arrIdx]->value.choice.TimeToWaitE2);
+               if((duChkTmr((PTR)&(duCb.e2apDb.e2TimersInfo.e2Timers.ricServiceUpdateTimer), EVENT_RIC_SERVICE_UPDATE_TMR)) == FALSE)
+               {
+                  duStartTmr((PTR)&(duCb.e2apDb.e2TimersInfo.e2Timers.ricServiceUpdateTimer), EVENT_RIC_SERVICE_UPDATE_TMR, timerValue);
+               }
+               else
+               {
+                  DU_LOG("\nERROR   -->  E2AP : EVENT_RIC_SERVICE_UPDATE_TMR  timer is already running");
+                  return;
+               }
+               break; 
+            }
+         case ProtocolIE_IDE2_id_CauseE2:
+            {
+               break;
+            }
+      }
+   }
+
+   freeAperDecodingOfRicServiceUpdateFailure(ricServiceFailure);
+}
+
+/******************************************************************
+ *
+ * @brief DU Send E2 Node Configuration Update
+ *
+ * @details
+ *
+ *    Function : duSendE2NodeConfigurationUpdate 
+ *
+ *    Functionality: DU Send E2 Node Configuration Update
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t duSendE2NodeConfigurationUpdate()
+{
+   E2NodeConfigList e2NodeList;
+   CmLList *node =NULL;
+   E2NodeComponent *e2NodeComponentInfo=NULL;
+
+   memset(&e2NodeList, 0, sizeof(E2NodeConfigList));
+   CM_LLIST_FIRST_NODE(&duCb.e2apDb.e2NodeComponentList, node);
+   while(node)
+   {
+      e2NodeComponentInfo = (E2NodeComponent*)node->node;
+
+      if(e2NodeComponentInfo->componentRequestPart && e2NodeComponentInfo->componentResponsePart)
+      {
+         switch(e2NodeComponentInfo->componentActionType)
+         {
+            case E2_NODE_COMPONENT_ADD:
+               {
+                  e2NodeList.addE2Node[e2NodeList.addE2NodeCount].interface = e2NodeComponentInfo->interfaceType;
+                  e2NodeList.addE2Node[e2NodeList.addE2NodeCount].actionType = e2NodeComponentInfo->componentActionType;
+                  e2NodeList.removeE2NodeCount++;
+                  break;
+               }
+            case E2_NODE_COMPONENT_UPDATE:
+               {
+                  e2NodeList.updateE2Node[e2NodeList.updateE2NodeCount].interface = e2NodeComponentInfo->interfaceType;
+                  e2NodeList.updateE2Node[e2NodeList.updateE2NodeCount].actionType = e2NodeComponentInfo->componentActionType;
+                  e2NodeList.updateE2NodeCount++;
+                  break;
+
+               }
+            case E2_NODE_COMPONENT_DEL:
+               {
+                  e2NodeList.removeE2Node[e2NodeList.removeE2NodeCount].interface = e2NodeComponentInfo->interfaceType;
+                  e2NodeList.removeE2Node[e2NodeList.removeE2NodeCount].actionType = e2NodeComponentInfo->componentActionType;
+                  e2NodeList.removeE2NodeCount++;
+                  break;
+               }
+         }
+      }
+      node = node->next;
+   }
 
+   if(BuildAndSendE2NodeConfigUpdate(&e2NodeList) !=ROK)
+   {
+      DU_LOG("\nERROR  -->  E2AP : Failed to build and send e2 node config update message to RIC_stub");
+      return RFAILED;
+   }
+   return ROK;
+}
 /*******************************************************************
  *
  * @brief Handles received E2AP message and sends back response  
@@ -3677,6 +4763,16 @@ void E2APMsgHdlr(Buffer *mBuf)
                      procE2SetupFailure(e2apMsg);
                      break;
                   }
+               case UnsuccessfulOutcomeE2__value_PR_E2nodeConfigurationUpdateFailure:
+                  {
+                     procE2NodeConfigUpdateFailure(e2apMsg);
+                     break;
+                  }
+               case UnsuccessfulOutcomeE2__value_PR_RICserviceUpdateFailure:
+                  {
+                     procRicServiceUpdateFailure(e2apMsg);
+                     break;
+                  }
                default:
                   {
                      DU_LOG("\nERROR  -->  E2AP : Invalid type of E2AP_PDU_PR_unsuccessfulOutcome  [%d]",\
@@ -3708,6 +4804,13 @@ void E2APMsgHdlr(Buffer *mBuf)
                      procResetResponse(e2apMsg);
                      break;
                   }
+               case SuccessfulOutcomeE2__value_PR_RICserviceUpdateAcknowledge:
+                  {
+                     procRicServiceUpdateAck(e2apMsg);
+                     break;
+                  }
+
+
                default:
                   {
                      DU_LOG("\nERROR  -->  E2AP : Invalid type of E2AP_PDU_PR_successfulOutcome  [%d]",\
@@ -3725,7 +4828,7 @@ void E2APMsgHdlr(Buffer *mBuf)
             {
                case InitiatingMessageE2__value_PR_RICsubscriptionRequest: 
                   {
-                     procRicSubsReq(e2apMsg);
+                     procRicSubscriptionRequest(e2apMsg);
                      break;
                   }
                case InitiatingMessageE2__value_PR_RICserviceQuery: