Merge remote-tracking branch 'origin/update-e2-agent' into integration_2024_w03

CMakeLists.txt

@@ -300,8 +300,8 @@ set(E2AP_VERSION "E2AP_V2" CACHE STRING "E2AP version")
 set_property(CACHE E2AP_VERSION PROPERTY STRINGS "E2AP_V1" "E2AP_V2" "E2AP_V3")
 message(STATUS "Selected E2AP_VERSION: ${E2AP_VERSION}")
 
-set(KPM_VERSION "KPM_V2" CACHE STRING "The KPM SM version to use")
-set_property(CACHE KPM_VERSION PROPERTY STRINGS "KPM_V2" "KPM_V3")
+set(KPM_VERSION "KPM_V2_03" CACHE STRING "The KPM SM version to use")
+set_property(CACHE KPM_VERSION PROPERTY STRINGS "KPM_V2_03" "KPM_V3_00")
 message(STATUS "Selected KPM Version: ${KPM_VERSION}")
 
 
@@ -1433,7 +1433,7 @@ target_link_libraries(L2 PRIVATE x2ap s1ap lte_rrc m2ap)
 target_link_libraries(L2 PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
 if(E2_AGENT)
-  target_link_libraries(L2 PUBLIC e2_agent e2_ran_func)
+  target_link_libraries(L2 PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
   target_compile_definitions(L2 PRIVATE E2_AGENT)
   target_compile_definitions(L2 PRIVATE ${E2AP_VERSION} ${KPM_VERSION})
 endif()
@@ -1460,7 +1460,7 @@ target_link_libraries(e1_if PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs asn1_f1ap
 
 target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap nr_rlc)
 if(E2_AGENT)
-  target_link_libraries(L2_NR PUBLIC e2_agent e2_ran_func)
+  target_link_libraries(L2_NR PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
   target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION})
   target_compile_definitions(L2_NR PRIVATE E2_AGENT)
 endif()
@@ -2113,6 +2113,10 @@ target_link_libraries(nr-cuup PRIVATE
                       GTPV1U e1ap f1ap SIMU_ETH
                       z sctp dl pthread shlib_loader ${T_LIB})
 target_link_libraries(nr-cuup PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
+if(E2_AGENT)
+  target_link_libraries(nr-cuup PRIVATE e2_agent e2_agent_arg e2_ran_func_cuup)
+  target_compile_definitions(nr-cuup PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
+endif()
                      
 # nr-uesoftmodem is  UE implementation
 #######################################

executables/nr-cuup.c

@@ -39,6 +39,42 @@ int asn1_xer_print;
 int oai_exit = 0;
 instance_t CUuniqInstance = 0;
 
+#ifdef E2_AGENT
+#include "openair2/E2AP/flexric/src/agent/e2_agent_api.h"
+#include "openair2/E2AP/RAN_FUNCTION/init_ran_func.h"
+
+static void initialize_agent(ngran_node_t node_type, e2_agent_args_t oai_args)
+{
+  AssertFatal(oai_args.sm_dir != NULL , "Please, specify the directory where the SMs are located in the config file, i.e., add in config file the next line: e2_agent = {near_ric_ip_addr = \"127.0.0.1\"; sm_dir = \"/usr/local/lib/flexric/\");} ");
+  AssertFatal(oai_args.ip != NULL , "Please, specify the IP address of the nearRT-RIC in the config file, i.e., e2_agent = {near_ric_ip_addr = \"127.0.0.1\"; sm_dir = \"/usr/local/lib/flexric/\"");
+
+  printf("After RCconfig_NR_E2agent %s %s \n",oai_args.sm_dir, oai_args.ip  );
+
+  fr_args_t args = { .ip = oai_args.ip }; // init_fr_args(0, NULL);
+  memcpy(args.libs_dir, oai_args.sm_dir, 128);
+
+  sleep(1);
+
+  // Only 1 instances is supported in one executable
+  // Advice: run multiple executables to have multiple instances
+  const e1ap_upcp_inst_t *e1inst = getCxtE1(CUuniqInstance);
+
+  const int nb_id = e1inst->gnb_id;
+  const int cu_up_id = e1inst->cuup.setupReq.gNB_cu_up_id;
+  const int mcc = e1inst->cuup.setupReq.plmn[0].id.mcc;
+  const int mnc = e1inst->cuup.setupReq.plmn[0].id.mnc;
+  const int mnc_digit_len = e1inst->cuup.setupReq.plmn[0].id.mnc_digit_length;
+
+  printf("[E2 NODE]: mcc = %d mnc = %d mnc_digit = %d nb_id = %d \n", mcc, mnc, mnc_digit_len, nb_id);
+
+  printf("[E2 NODE]: Args %s %s \n", args.ip, args.libs_dir);
+
+  sm_io_ag_ran_t io = init_ran_func_ag();
+  init_agent_api(mcc, mnc, mnc_digit_len, nb_id, cu_up_id, node_type, io, &args);
+}
+#endif  // E2_AGENT
+
+
 void exit_function(const char *file, const char *function, const int line, const char *s, const int assert)
 {
   if (assert) {
@@ -135,6 +171,22 @@ int main(int argc, char **argv)
   AssertFatal(msg != NULL, "Send init to task for E1AP UP failed\n");
   itti_send_msg_to_task(TASK_CUUP_E1, 0, msg);
 
+  #ifdef E2_AGENT
+  //////////////////////////////////
+  //////////////////////////////////
+  //// Init the E2 Agent
+
+  // OAI Wrapper 
+  e2_agent_args_t oai_args = RCconfig_NR_E2agent();
+
+  if (oai_args.enabled) {
+    const ngran_node_t node_type = get_node_type();
+    assert(node_type == ngran_gNB_CUUP);
+    initialize_agent(node_type, oai_args);
+  }
+
+  #endif // E2_AGENT
+
   printf("TYPE <CTRL-C> TO TERMINATE\n");
   itti_wait_tasks_end(NULL);
 

executables/nr-softmodem.c

@@ -600,7 +600,7 @@ static void initialize_agent(ngran_node_t node_type, e2_agent_args_t oai_args)
     AssertFatal(mac != NULL, "MAC not initialized\n");
     cu_du_id = mac->f1_config.gnb_id;
     nb_id = mac->f1_config.setup_req->gNB_DU_id;
-  } else if (node_type == ngran_gNB_CU) {
+  } else if (node_type == ngran_gNB_CU || node_type == ngran_gNB_CUCP) {
     // agent buggy: the CU has no second ID, it is the CU-UP ID
     // however, that is not a problem her for us, so put the same ID twice
     nb_id = rrc->node_id;

openair2/E2AP/CMakeLists.txt

@@ -128,3 +128,4 @@ add_subdirectory(flexric/src/sm)
 add_subdirectory(flexric/src/util)
 add_subdirectory(RAN_FUNCTION)
 
+add_library(e2_agent_arg STATIC e2_agent_arg.c)

openair2/E2AP/RAN_FUNCTION/CMakeLists.txt

-add_subdirectory(CUSTOMIZED)
-add_subdirectory(O-RAN)
-
-add_library(e2_ran_func STATIC 
+add_library(e2_ran_func_cuup STATIC
             init_ran_func.c
             read_setup_ran.c
-          ../flexric/test/rnd/fill_rnd_data_e2_setup_req.c 
+            ../flexric/test/rnd/fill_rnd_data_e2_setup_req.c  # this is not rnd data; it is used to fill E2 Node Component Configuration Addition List in E2 Setup Request message
+            CUSTOMIZED/ran_func_gtp.c   # current implementation doesn't take split architecture into account, neither CU/DU nor CU-UP/CU-CP
+            CUSTOMIZED/ran_func_pdcp.c  # current implementation doesn't take split architecture into account, neither CU/DU nor CU-UP/CU-CP
+            CUSTOMIZED/ran_func_tc.c     # currently, not implemented; therefore, filling rnd data
+            ../flexric/test/rnd/fill_rnd_data_tc.c
+            O-RAN/ran_func_kpm.c    # this file should only contain PDCP-U/GTP; to be done in the future
+            ../flexric/test/rnd/fill_rnd_data_kpm.c  # this dependancy will be taken out once RAN Function Definition is implemented
+            O-RAN/ran_func_rc.c     # this file should only contain PDCP-U/GTP; to be done in the future
+            ../flexric/test/rnd/fill_rnd_data_rc.c   # this dependancy will be taken out once RAN Function Definition is implemented
             )
 
-target_link_libraries(e2_ran_func   
-                       PUBLIC  
-                       e2_ran_func_cust 
-                       e2_ran_func_oran 
+target_link_libraries(e2_ran_func_cuup PUBLIC asn1_nr_rrc nr_rrc asn1_nr_rrc_hdrs e2_time_obj kpm_ric_info_common_obj 3gpp_derived_ie_obj)
+target_compile_definitions(e2_ran_func_cuup PUBLIC ${E2AP_VERSION}  ${KPM_VERSION}  NGRAN_GNB_CUUP)
+
+
+add_library(e2_ran_func_du_cucp_cuup STATIC
+            init_ran_func.c
+            read_setup_ran.c
+            ../flexric/test/rnd/fill_rnd_data_e2_setup_req.c  # this is not rnd data; it is used to fill E2 Node Component Configuration Addition List in E2 Setup Request message
+            CUSTOMIZED/ran_func_gtp.c   # current implementation doesn't take split architecture into account, neither CU/DU nor CU-UP/CU-CP
+            CUSTOMIZED/ran_func_pdcp.c  # current implementation doesn't take split architecture into account, neither CU/DU nor CU-UP/CU-CP
+            O-RAN/ran_func_kpm.c    # this file should only contain RRC/PDCP-C; to be done in the future
+                                    # when nr-softmodem is divided in separate executables
+            ../flexric/test/rnd/fill_rnd_data_kpm.c  # this dependancy will be taken out once RAN Function Definition is implemented
+            O-RAN/ran_func_rc.c     # this file should only contain RRC/PDCP-C; to be done in the future
+                                    # when nr-softmodem is divided in separate executables
+            ../flexric/test/rnd/fill_rnd_data_rc.c   # this dependancy will be taken out once RAN Function Definition is implemented
+            CUSTOMIZED/ran_func_mac.c
+            CUSTOMIZED/ran_func_rlc.c
+            CUSTOMIZED/ran_func_slice.c
+            CUSTOMIZED/ran_func_tc.c
+            ../flexric/test/rnd/fill_rnd_data_tc.c
+            ../flexric/test/rnd/fill_rnd_data_slice.c
             )
 
-# This dependency sucks! Create pointers and forward declarations!
-target_compile_definitions(e2_ran_func PRIVATE ${E2AP_VERSION} ${KPM_VERSION})
+target_link_libraries(e2_ran_func_du_cucp_cuup PUBLIC asn1_nr_rrc nr_rrc asn1_nr_rrc_hdrs e2_time_obj kpm_ric_info_common_obj 3gpp_derived_ie_obj)
+target_compile_definitions(e2_ran_func_du_cucp_cuup PUBLIC ${E2AP_VERSION}  ${KPM_VERSION} NGRAN_GNB_DU NGRAN_GNB_CUCP NGRAN_GNB_CUUP)

openair2/E2AP/RAN_FUNCTION/CUSTOMIZED/CMakeLists.txt

-add_library(e2_ran_func_cust STATIC 
-          ran_func_gtp.c
-          ran_func_mac.c
-          ran_func_pdcp.c
-          ran_func_rlc.c
-          ran_func_slice.c
-          ran_func_tc.c
-          # For testing purposes 
-  ../../flexric/test/rnd/fill_rnd_data_gtp.c             
-  ../../flexric/test/rnd/fill_rnd_data_tc.c              
-  ../../flexric/test/rnd/fill_rnd_data_mac.c             
-  ../../flexric/test/rnd/fill_rnd_data_rlc.c             
-  ../../flexric/test/rnd/fill_rnd_data_pdcp.c  
-  ../../flexric/test/rnd/fill_rnd_data_slice.c           
-  ../../flexric/src/util/time_now_us.c
-          )
-
-target_link_libraries(e2_ran_func_cust PUBLIC asn1_nr_rrc nr_rrc asn1_nr_rrc_hdrs)
-# This dependency sucks! Create pointers and forward declarations!
-target_compile_definitions(e2_ran_func_cust PRIVATE ${E2AP_VERSION}  ${KPM_VERSION}  )

openair2/E2AP/RAN_FUNCTION/CUSTOMIZED/ran_func_gtp.c

@@ -23,17 +23,17 @@
 
 #include <assert.h>
 
-#include "openair2/E2AP/flexric/test/rnd/fill_rnd_data_gtp.h"
 #include "common/ran_context.h"
 #include "openair2/LAYER2/NR_MAC_gNB/mac_proto.h"
 #include "openair2/E2AP/flexric/src/util/time_now_us.h"
-#include "openair2/RRC/NR/rrc_gNB_UE_context.h"
+#include "openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.h"
 
 
-static
-const int mod_id = 0;
+#if defined (NGRAN_GNB_CUCP)
+#include "openair2/RRC/NR/rrc_gNB_UE_context.h"
+#endif
 
-void read_gtp_sm(void * data)
+bool read_gtp_sm(void * data)
 {
   assert(data != NULL);
 
@@ -42,26 +42,26 @@ void read_gtp_sm(void * data)
 
   gtp->msg.tstamp = time_now_us();
 
-  NR_UEs_t *UE_info = &RC.nrmac[mod_id]->UE_info;
-  size_t num_ues = 0;
-  UE_iterator(UE_info->list, ue) {
-    if (ue)
-      num_ues += 1;
-  }
+  uint64_t ue_id_list[MAX_MOBILES_PER_GNB];
+  size_t num_ues = nr_pdcp_get_num_ues(ue_id_list, MAX_MOBILES_PER_GNB);
   
   gtp->msg.len = num_ues;
   if(gtp->msg.len > 0){
     gtp->msg.ngut = calloc(gtp->msg.len, sizeof(gtp_ngu_t_stats_t) );
     assert(gtp->msg.ngut != NULL);
   }
+  else {
+    return false;
+  }
 
-  size_t i = 0;
-  UE_iterator(UE_info->list, UE)
-  {
-    uint16_t const rnti = UE->rnti;
-    struct rrc_gNB_ue_context_s *ue_context_p = rrc_gNB_get_ue_context_by_rnti_any_du(RC.nrrrc[mod_id], rnti);
-    if (ue_context_p != NULL) {
-      gtp->msg.ngut[i].rnti = ue_context_p->ue_context.rnti;
+  #if defined (NGRAN_GNB_CUCP) && defined (NGRAN_GNB_CUUP)
+  if (RC.nrrrc[0]->node_type == ngran_gNB_DU || RC.nrrrc[0]->node_type == ngran_gNB_CUCP) return false;
+  assert((RC.nrrrc[0]->node_type == ngran_gNB_CU || RC.nrrrc[0]->node_type == ngran_gNB) && "Expected node types: CU or gNB-mono");
+
+  for (size_t i = 0; i < num_ues; i++) {
+    rrc_gNB_ue_context_t *ue_context_p = rrc_gNB_get_ue_context(RC.nrrrc[0], ue_id_list[i]);
+
+    gtp->msg.ngut[i].rnti = ue_id_list[i];
     int nb_pdu_session = ue_context_p->ue_context.nb_of_pdusessions;
     if (nb_pdu_session > 0) {
       int nb_pdu_idx = nb_pdu_session - 1;
@@ -73,13 +73,15 @@ void read_gtp_sm(void * data)
         gtp->msg.ngut[i].qfi = ue_context_p->ue_context.pduSession[nb_pdu_idx].param.qos[nb_qos_flow - 1].qfi;
       }
     }
-    } else {
-      LOG_W(NR_RRC,"rrc_gNB_get_ue_context return NULL\n");
-      // if (gtp->msg.ngut != NULL) free(gtp->msg.ngut);
-    }
-    i++;
   }
 
+  return true;
+
+  #elif defined (NGRAN_GNB_CUUP)
+  // For the moment, CU-UP doesn't store PDU session information
+  printf("GTP SM not yet implemented in CU-UP\n");
+  return false;  
+  #endif
 }
 
 void read_gtp_setup_sm(void* data)

openair2/E2AP/RAN_FUNCTION/CUSTOMIZED/ran_func_gtp.h

@@ -24,7 +24,7 @@
 
 #include "openair2/E2AP/flexric/src/agent/../sm/sm_io.h"
 
-void read_gtp_sm(void*);
+bool read_gtp_sm(void*);
 
 void read_gtp_setup_sm(void*);
 

openair2/E2AP/RAN_FUNCTION/CUSTOMIZED/ran_func_mac.c

@@ -20,14 +20,13 @@
  */
 
 #include "ran_func_mac.h"
-#include "openair2/E2AP/flexric/test/rnd/fill_rnd_data_mac.h"
 #include <assert.h>
 
 static
 const int mod_id = 0;
 
 
-void read_mac_sm(void* data)
+bool read_mac_sm(void* data)
 {
   assert(data != NULL);
 
@@ -110,6 +109,8 @@ void read_mac_sm(void* data)
 
     ++i;
   }
+
+  return num_ues > 0;
 }
 
 void read_mac_setup_sm(void* data)

openair2/E2AP/RAN_FUNCTION/CUSTOMIZED/ran_func_mac.h

@@ -28,7 +28,7 @@
 #include "openair2/E2AP/flexric/src/util/time_now_us.h"
 
 
-void read_mac_sm(void*);
+bool read_mac_sm(void*);
 
 void read_mac_setup_sm(void*);
 

openair2/E2AP/RAN_FUNCTION/CUSTOMIZED/ran_func_pdcp.c

@@ -19,87 +19,41 @@
  *      contact@openairinterface.org
  */
 
-#include "ran_func_pdcp.h"
-
 #include <assert.h>
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "openair2/E2AP/flexric/test/rnd/fill_rnd_data_pdcp.h"
+#include "ran_func_pdcp.h"
 #include "common/ran_context.h"
-#include "openair2/RRC/NR/rrc_gNB_UE_context.h"
-#include "openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.h"
-#include "openair2/LAYER2/nr_rlc/nr_rlc_oai_api.h"
-#include "openair2/LAYER2/NR_MAC_gNB/mac_proto.h"
 #include "openair2/E2AP/flexric/src/util/time_now_us.h"
 
+#if defined (NGRAN_GNB_DU)
+#include "openair2/LAYER2/NR_MAC_gNB/mac_proto.h"
+#include "openair2/LAYER2/nr_rlc/nr_rlc_oai_api.h"
+#endif
 
-static
-const int mod_id = 0;
-
-static
-    uint32_t num_act_rb(NR_UEs_t* UE_info)
-{
-  assert(UE_info!= NULL);
+#if defined (NGRAN_GNB_CUCP)
+#include "openair2/RRC/NR/rrc_gNB_UE_context.h"
+#endif
 
-  uint32_t act_rb = 0;
-  UE_iterator(UE_info->list, UE) {
-    uint16_t const rnti = UE->rnti;
-    for(int rb_id = 1; rb_id < 6; ++rb_id ){
-      nr_rlc_statistics_t rlc = {0};
-      const int srb_flag = 0;
-      const bool rc = nr_rlc_get_statistics(rnti, srb_flag, rb_id, &rlc);
-      if(rc) ++act_rb;
-    }
-  }
-  return act_rb;
-}
+#if defined (NGRAN_GNB_CUUP)
+#include "openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.h"
+#endif
 
-void read_pdcp_sm(void* data)
+#if defined (NGRAN_GNB_CUUP)
+void fill_pdcp_stats_for_all_rbs(pdcp_radio_bearer_stats_t* rb, const size_t num_ues, const uint64_t* ue_id_list)
 {
-  assert(data != NULL);
-  //assert(data->type == PDCP_STATS_V0);
-
-  pdcp_ind_data_t* pdcp = (pdcp_ind_data_t*)data;
-  //fill_pdcp_ind_data(pdcp);
-  // TODO: Need to improve, not good
-  if (NODE_IS_CU(RC.nrrrc[mod_id]->node_type)) {
-
-    uint32_t act_rb = 0;
-    struct rrc_gNB_ue_context_s *ue_context_p1 = NULL;
-    RB_FOREACH(ue_context_p1, rrc_nr_ue_tree_s, &RC.nrrrc[mod_id]->rrc_ue_head) {
-      uint16_t const rnti = ue_context_p1->ue_context.rnti;
-      for(int rb_id = 1; rb_id < 6; ++rb_id ){
-        nr_pdcp_statistics_t rb_pdcp = {0};
-        const int srb_flag = 0;
-        const bool rc = nr_pdcp_get_statistics(rnti, srb_flag, rb_id, &rb_pdcp);
-        if(rc) ++act_rb;
-      }
-    }
-
-    pdcp->msg.tstamp = time_now_us();
-
-    pdcp->msg.len = act_rb;
-    if (pdcp->msg.len > 0) {
-      pdcp->msg.rb = calloc(pdcp->msg.len, sizeof(pdcp_radio_bearer_stats_t));
-      assert(pdcp->msg.rb != NULL && "Memory exhausted!");
-    }
-
-    size_t i = 0;
-    struct rrc_gNB_ue_context_s *ue_context_p2 = NULL;
-    RB_FOREACH(ue_context_p2, rrc_nr_ue_tree_s, &RC.nrrrc[mod_id]->rrc_ue_head) {
-      // TODO: Need to handel multiple UEs
-      uint16_t const rnti = ue_context_p2->ue_context.rnti;
-
-      for (size_t rb_id = 1; rb_id < 6; ++rb_id) {
+  size_t j = 0;
+  for (size_t i = 0; i < num_ues; i++) {
+    for (int rb_id = 1; rb_id < 6; ++rb_id) {
       nr_pdcp_statistics_t rb_pdcp = {0};
 
       const int srb_flag = 0;
-        const bool rc = nr_pdcp_get_statistics(rnti, srb_flag, rb_id, &rb_pdcp);
+      const bool rc = nr_pdcp_get_statistics(ue_id_list[i], srb_flag, rb_id, &rb_pdcp);
 
       if (!rc) continue;
 
-        pdcp_radio_bearer_stats_t *rd = &pdcp->msg.rb[i];
+      pdcp_radio_bearer_stats_t *rd = &rb[j++];
 
       rd->txpdu_pkts = rb_pdcp.txpdu_pkts;     /* aggregated number of tx packets */
       rd->txpdu_bytes = rb_pdcp.txpdu_bytes;    /* aggregated bytes of tx packets */
@@ -116,67 +70,74 @@ void read_pdcp_sm(void* data)
       rd->txsdu_bytes = rb_pdcp.txsdu_bytes;    /* number of bytes of SDUs delivered */
       rd->rxsdu_pkts = rb_pdcp.rxsdu_pkts;     /* number of SDUs received */
       rd->rxsdu_bytes = rb_pdcp.rxsdu_bytes;    /* number of bytes of SDUs received */
-        rd->rnti = rnti;
+      rd->rnti = ue_id_list[i];
       rd->mode = rb_pdcp.mode;               /* 0: PDCP AM, 1: PDCP UM, 2: PDCP TM */
       rd->rbid = rb_id;
-
-        ++i;
     }
   }
-  } else {
+}
+#endif
 
-    //assert(0!=0 && "Calling PDCP");
-    // for the moment and while we don't have a split base station, we use the
-    // MAC structures to obtain the RNTIs which we use to query the PDCP
-    NR_UEs_t *UE_info = &RC.nrmac[mod_id]->UE_info;
-    uint32_t const act_rb = num_act_rb(UE_info);
+bool read_pdcp_sm(void* data)
+{
+  assert(data != NULL);
+  //assert(data->type == PDCP_STATS_V0);
+
+  pdcp_ind_data_t* pdcp = (pdcp_ind_data_t*)data;
 
   pdcp->msg.tstamp = time_now_us();
 
-    pdcp->msg.len = act_rb;
-    if (pdcp->msg.len > 0) {
-      pdcp->msg.rb = calloc(pdcp->msg.len, sizeof(pdcp_radio_bearer_stats_t));
-      assert(pdcp->msg.rb != NULL && "Memory exhausted!");
-    }
+  size_t num_ues = 0;
+  uint64_t ue_id_list[MAX_MOBILES_PER_GNB];
+  size_t total_num_rb = 0;
 
-    size_t i = 0;
-    UE_iterator(UE_info->list, UE)
-    {
+  #if defined (NGRAN_GNB_CUCP) && defined (NGRAN_GNB_CUUP)
+  if (RC.nrrrc[0]->node_type == ngran_gNB_DU || RC.nrrrc[0]->node_type == ngran_gNB_CUCP) return false;
+  assert((RC.nrrrc[0]->node_type == ngran_gNB_CU || RC.nrrrc[0]->node_type == ngran_gNB) && "Expected node types: CU or gNB-mono");
 
-      const int rnti = UE->rnti;
-      for (size_t rb_id = 1; rb_id < 6; ++rb_id) {
-        nr_pdcp_statistics_t rb_pdcp = {0};
+  struct rrc_gNB_ue_context_s *ue_context_p = NULL;
+  RB_FOREACH(ue_context_p, rrc_nr_ue_tree_s, &RC.nrrrc[0]->rrc_ue_head) {
+    ue_id_list[num_ues] = ue_context_p->ue_context.rrc_ue_id;
 
+    for(int rb_id = 1; rb_id < 6; ++rb_id ){
+      nr_pdcp_statistics_t rb_pdcp = {0};
       const int srb_flag = 0;
-        const bool rc = nr_pdcp_get_statistics(rnti, srb_flag, rb_id, &rb_pdcp);
+      const bool rc = nr_pdcp_get_statistics(ue_id_list[num_ues], srb_flag, rb_id, &rb_pdcp);
+      if(rc) ++total_num_rb;
+    }
+    num_ues++;
 
-        if (!rc) continue;
+    AssertFatal(num_ues < MAX_MOBILES_PER_GNB, "cannot have more UEs than global UE number maximum\n");
+  }
 
-        pdcp_radio_bearer_stats_t *rd = &pdcp->msg.rb[i];
+  #elif defined (NGRAN_GNB_CUUP)
+  num_ues = nr_pdcp_get_num_ues(ue_id_list, MAX_MOBILES_PER_GNB);
+  for (size_t i = 0; i < num_ues; i++) {
+    for(int rb_id = 1; rb_id < 6; ++rb_id ){
+      nr_pdcp_statistics_t rb_pdcp = {0};
+      const int srb_flag = 0;
+      const bool rc = nr_pdcp_get_statistics(ue_id_list[i], srb_flag, rb_id, &rb_pdcp);
+      if(rc) ++total_num_rb;
+    }
+  }
 
-        rd->txpdu_pkts = rb_pdcp.txpdu_pkts;     /* aggregated number of tx packets */
-        rd->txpdu_bytes = rb_pdcp.txpdu_bytes;    /* aggregated bytes of tx packets */
-        rd->txpdu_sn = rb_pdcp.txpdu_sn;       /* current sequence number of last tx packet (or TX_NEXT) */
-        rd->rxpdu_pkts = rb_pdcp.rxpdu_pkts;     /* aggregated number of rx packets */
-        rd->rxpdu_bytes = rb_pdcp.rxpdu_bytes;    /* aggregated bytes of rx packets */
-        rd->rxpdu_sn = rb_pdcp.rxpdu_sn;       /* current sequence number of last rx packet (or  RX_NEXT) */
-        rd->rxpdu_oo_pkts = rb_pdcp.rxpdu_oo_pkts;       /* aggregated number of out-of-order rx pkts  (or RX_REORD) */
-        rd->rxpdu_oo_bytes = rb_pdcp.rxpdu_oo_bytes; /* aggregated amount of out-of-order rx bytes */
-        rd->rxpdu_dd_pkts = rb_pdcp.rxpdu_dd_pkts;  /* aggregated number of duplicated discarded packets (or dropped packets because of other reasons such as integrity failure) (or RX_DELIV) */
-        rd->rxpdu_dd_bytes = rb_pdcp.rxpdu_dd_bytes; /* aggregated amount of discarded packets' bytes */
-        rd->rxpdu_ro_count = rb_pdcp.rxpdu_ro_count; /* this state variable indicates the COUNT value following the COUNT value associated with the PDCP Data PDU which triggered t-Reordering. (RX_REORD) */
-        rd->txsdu_pkts = rb_pdcp.txsdu_pkts;     /* number of SDUs delivered */
-        rd->txsdu_bytes = rb_pdcp.txsdu_bytes;    /* number of bytes of SDUs delivered */
-        rd->rxsdu_pkts = rb_pdcp.rxsdu_pkts;     /* number of SDUs received */
-        rd->rxsdu_bytes = rb_pdcp.rxsdu_bytes;    /* number of bytes of SDUs received */
-        rd->rnti = rnti;
-        rd->mode = rb_pdcp.mode;               /* 0: PDCP AM, 1: PDCP UM, 2: PDCP TM */
-        rd->rbid = rb_id;
+  #endif
 
-        ++i;
-      }
+  pdcp->msg.len = total_num_rb;
+  if (pdcp->msg.len > 0) {
+    pdcp->msg.rb = calloc(pdcp->msg.len, sizeof(pdcp_radio_bearer_stats_t));
+    assert(pdcp->msg.rb != NULL && "Memory exhausted!");
+
+    // Filling Radio Bearer Statistics
+    #if defined (NGRAN_GNB_CUUP)
+    fill_pdcp_stats_for_all_rbs(pdcp->msg.rb, num_ues, ue_id_list);
+    #endif
+    return true;
   }
+  else {
+    return false;
   }
+
 }
 
 void read_pdcp_setup_sm(void* data)
@@ -195,5 +156,3 @@ sm_ag_if_ans_t write_ctrl_pdcp_sm(void const* data)
   sm_ag_if_ans_t ans = {0};
   return ans;
 }
-
-

openair2/E2AP/RAN_FUNCTION/CUSTOMIZED/ran_func_pdcp.h

@@ -24,7 +24,7 @@
 
 #include "openair2/E2AP/flexric/src/agent/../sm/sm_io.h"
 
-void read_pdcp_sm(void*);
+bool read_pdcp_sm(void*);
 
 void read_pdcp_setup_sm(void* data);
 

openair2/E2AP/RAN_FUNCTION/CUSTOMIZED/ran_func_rlc.c

@@ -28,7 +28,6 @@
 #include "openair2/LAYER2/NR_MAC_gNB/mac_proto.h"
 #include "openair2/LAYER2/nr_rlc/nr_rlc_oai_api.h"
 #include "openair2/E2AP/flexric/src/util/time_now_us.h"
-#include "openair2/E2AP/flexric/test/rnd/fill_rnd_data_rlc.h"
 
 static
 const int mod_id = 0;
@@ -67,7 +66,7 @@ void active_avg_to_tx(NR_UEs_t* const UE_info)
   }
 }
 
-void read_rlc_sm(void* data)
+bool read_rlc_sm(void* data)
 {
   assert(data != NULL);
 //  assert(data->type ==  RLC_STATS_V0);
@@ -161,6 +160,8 @@ void read_rlc_sm(void* data)
       ++i;
     }
   }
+
+  return act_rb > 0;
 }
 
 void read_rlc_setup_sm(void* data)

openair2/E2AP/RAN_FUNCTION/CUSTOMIZED/ran_func_rlc.h

@@ -24,7 +24,7 @@
 
 #include "openair2/E2AP/flexric/src/agent/../sm/sm_io.h"
 
-void read_rlc_sm(void*);
+bool read_rlc_sm(void*);
 
 void read_rlc_setup_sm(void* data);
 

openair2/E2AP/RAN_FUNCTION/CUSTOMIZED/ran_func_slice.c

@@ -24,13 +24,15 @@
 #include <assert.h>
 #include <stdio.h>
 
-void read_slice_sm(void* data)
+bool read_slice_sm(void* data)
 {
   assert(data != NULL);
 //  assert(data->type == SLICE_STATS_V0);
 
   slice_ind_data_t* slice = (slice_ind_data_t*)data;
   fill_slice_ind_data(slice);
+
+  return true;
 }
 
 void read_slice_setup_sm(void* data)

openair2/E2AP/RAN_FUNCTION/CUSTOMIZED/ran_func_slice.h

@@ -24,7 +24,7 @@
 
 #include "openair2/E2AP/flexric/src/agent/../sm/sm_io.h"
 
-void read_slice_sm(void*);
+bool read_slice_sm(void*);
 
 void read_slice_setup_sm(void* data);
 

openair2/E2AP/RAN_FUNCTION/CUSTOMIZED/ran_func_tc.c

@@ -23,13 +23,15 @@
 #include "../../flexric/test/rnd/fill_rnd_data_tc.h"
 #include <assert.h>
 
-void read_tc_sm(void* data)
+bool read_tc_sm(void* data)
 {
   assert(data != NULL);
   //assert(data->type == TC_STATS_V0);
 
   tc_ind_data_t* tc = (tc_ind_data_t*)data;
   fill_tc_ind_data(tc);
+
+  return true;
 }
 
 void read_tc_setup_sm(void* data)

openair2/E2AP/RAN_FUNCTION/CUSTOMIZED/ran_func_tc.h

@@ -24,7 +24,7 @@
 
 #include "openair2/E2AP/flexric/src/agent/../sm/sm_io.h"
 
-void read_tc_sm(void*);
+bool read_tc_sm(void*);
 
 void read_tc_setup_sm(void* data);
 

openair2/E2AP/RAN_FUNCTION/O-RAN/CMakeLists.txt

-add_library(e2_ran_func_oran STATIC 
-          ran_func_kpm.c
-          ran_func_rc.c
-          # For testing purposes 
-  ../../flexric/test/rnd/fill_rnd_data_kpm.c             
-  ../../flexric/test/rnd/fill_rnd_data_rc.c              
-          )
-
-target_link_libraries(e2_ran_func_oran PUBLIC asn1_nr_rrc nr_rrc asn1_nr_rrc_hdrs)
-target_compile_definitions(e2_ran_func_oran PRIVATE ${E2AP_VERSION} ${KPM_VERSION})

openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_kpm.h

@@ -24,7 +24,7 @@
 
 #include "openair2/E2AP/flexric/src/agent/../sm/sm_io.h"
 
-void read_kpm_sm(void*);
+bool read_kpm_sm(void*);
 
 void read_kpm_setup_sm(void*);
 

openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc.c

@@ -20,7 +20,7 @@
  */
 
 #include "ran_func_rc.h"
-#include "../../flexric/test/rnd/fill_rnd_data_rc.h"
+#include "../../flexric/test/rnd/fill_rnd_data_rc.h"  // this dependancy will be taken out once RAN Function Definition is implemented
 #include "../../flexric/src/sm/rc_sm/ie/ir/lst_ran_param.h"
 #include "../../flexric/src/sm/rc_sm/ie/ir/ran_param_list.h"
 #include "../../flexric/src/agent/e2_agent_api.h"
@@ -30,11 +30,15 @@
 #include <pthread.h>
 #include <unistd.h>
 
-void read_rc_sm(void* data)
+// Please note: current implementation doesn't take split architecture into account, neither CU/DU nor CU-UP/CU-CP
+
+bool read_rc_sm(void* data)
 {
   assert(data != NULL);
 //  assert(data->type == RAN_CTRL_STATS_V1_03);
   assert(0!=0 && "Not implemented");
+
+  return true;
 }
 
 void read_rc_setup_sm(void* data)

openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc.h

@@ -24,7 +24,7 @@
 
 #include "openair2/E2AP/flexric/src/agent/../sm/sm_io.h"
 
-void read_rc_sm(void *);
+bool read_rc_sm(void *);
 
 void read_rc_setup_sm(void* data);
 

openair2/E2AP/RAN_FUNCTION/init_ran_func.c

@@ -22,24 +22,35 @@
 #include "init_ran_func.h"
 #include "read_setup_ran.h"
 #include "../flexric/src/agent/e2_agent_api.h"
+
+#if defined (NGRAN_GNB_DU)
 #include "CUSTOMIZED/ran_func_mac.h"
 #include "CUSTOMIZED/ran_func_rlc.h"
-#include "CUSTOMIZED/ran_func_pdcp.h"
 #include "CUSTOMIZED/ran_func_slice.h"
+#endif
+#if defined (NGRAN_GNB_CUUP)
 #include "CUSTOMIZED/ran_func_tc.h"
 #include "CUSTOMIZED/ran_func_gtp.h"
+#include "CUSTOMIZED/ran_func_pdcp.h"
+#endif
+
 #include "O-RAN/ran_func_kpm.h"
 #include "O-RAN/ran_func_rc.h"
 
 static
 void init_read_ind_tbl(read_ind_fp (*read_ind_tbl)[SM_AGENT_IF_READ_V0_END])
 {
+  #if defined (NGRAN_GNB_DU)
   (*read_ind_tbl)[MAC_STATS_V0] =  read_mac_sm;
   (*read_ind_tbl)[RLC_STATS_V0] =  read_rlc_sm ;
-  (*read_ind_tbl)[PDCP_STATS_V0] = read_pdcp_sm ;
   (*read_ind_tbl)[SLICE_STATS_V0] = read_slice_sm ;
+  #endif
+  #if defined (NGRAN_GNB_CUUP)
   (*read_ind_tbl)[TC_STATS_V0] = read_tc_sm ;
   (*read_ind_tbl)[GTP_STATS_V0] = read_gtp_sm ; 
+  (*read_ind_tbl)[PDCP_STATS_V0] = read_pdcp_sm ;
+  #endif
+  
   (*read_ind_tbl)[KPM_STATS_V3_0] = read_kpm_sm ; 
   (*read_ind_tbl)[RAN_CTRL_STATS_V1_03] = read_rc_sm;
 }
@@ -47,12 +58,17 @@ void init_read_ind_tbl(read_ind_fp (*read_ind_tbl)[SM_AGENT_IF_READ_V0_END])
 static
 void init_read_setup_tbl(read_e2_setup_fp (*read_setup_tbl)[SM_AGENT_IF_E2_SETUP_ANS_V0_END])
 {
+  #if defined (NGRAN_GNB_DU)
   (*read_setup_tbl)[MAC_AGENT_IF_E2_SETUP_ANS_V0] =  read_mac_setup_sm;
   (*read_setup_tbl)[RLC_AGENT_IF_E2_SETUP_ANS_V0] =  read_rlc_setup_sm ;
-  (*read_setup_tbl)[PDCP_AGENT_IF_E2_SETUP_ANS_V0] = read_pdcp_setup_sm ;
   (*read_setup_tbl)[SLICE_AGENT_IF_E2_SETUP_ANS_V0] =  read_slice_setup_sm ;
+  #endif
+  #if defined (NGRAN_GNB_CUUP)
   (*read_setup_tbl)[TC_AGENT_IF_E2_SETUP_ANS_V0] =  read_tc_setup_sm ;
   (*read_setup_tbl)[GTP_AGENT_IF_E2_SETUP_ANS_V0] = read_gtp_setup_sm ; 
+  (*read_setup_tbl)[PDCP_AGENT_IF_E2_SETUP_ANS_V0] = read_pdcp_setup_sm ;
+  #endif
+
   (*read_setup_tbl)[KPM_V3_0_AGENT_IF_E2_SETUP_ANS_V0] = read_kpm_setup_sm ; 
   (*read_setup_tbl)[RAN_CTRL_V1_3_AGENT_IF_E2_SETUP_ANS_V0] = read_rc_setup_sm;
 }
@@ -60,24 +76,34 @@ void init_read_setup_tbl(read_e2_setup_fp (*read_setup_tbl)[SM_AGENT_IF_E2_SETUP
 static
 void init_write_ctrl( write_ctrl_fp (*write_ctrl_tbl)[SM_AGENT_IF_WRITE_CTRL_V0_END])
 {
+  #if defined (NGRAN_GNB_DU)
   (*write_ctrl_tbl)[MAC_CTRL_REQ_V0] = write_ctrl_mac_sm;
   (*write_ctrl_tbl)[RLC_CTRL_REQ_V0] = write_ctrl_rlc_sm;
-  (*write_ctrl_tbl)[PDCP_CTRL_REQ_V0] = write_ctrl_pdcp_sm;
   (*write_ctrl_tbl)[SLICE_CTRL_REQ_V0] = write_ctrl_slice_sm;
+  #endif
+  #if defined (NGRAN_GNB_CUUP)
   (*write_ctrl_tbl)[TC_CTRL_REQ_V0] = write_ctrl_tc_sm;
   (*write_ctrl_tbl)[GTP_CTRL_REQ_V0] = write_ctrl_gtp_sm;
+  (*write_ctrl_tbl)[PDCP_CTRL_REQ_V0] = write_ctrl_pdcp_sm;
+  #endif
+
   (*write_ctrl_tbl)[RAN_CONTROL_CTRL_V1_03] = write_ctrl_rc_sm;
 }
 
 static
 void init_write_subs(write_subs_fp (*write_subs_tbl)[SM_AGENT_IF_WRITE_SUBS_V0_END])
 {
+  #if defined (NGRAN_GNB_DU)
   (*write_subs_tbl)[MAC_SUBS_V0] = NULL;
   (*write_subs_tbl)[RLC_SUBS_V0] = NULL;
-  (*write_subs_tbl)[PDCP_SUBS_V0] = NULL;
   (*write_subs_tbl)[SLICE_SUBS_V0] = NULL;
+  #endif
+  #if defined (NGRAN_GNB_CUUP)
   (*write_subs_tbl)[TC_SUBS_V0] = NULL;
   (*write_subs_tbl)[GTP_SUBS_V0] = NULL;
+  (*write_subs_tbl)[PDCP_SUBS_V0] = NULL;
+  #endif
+
   (*write_subs_tbl)[KPM_SUBS_V3_0] = NULL;
   (*write_subs_tbl)[RAN_CTRL_SUBS_V1_03] = write_subs_rc_sm;
 }
@@ -96,4 +122,3 @@ sm_io_ag_ran_t init_ran_func_ag(void)
 
   return io;
 }
-

openair2/E2AP/RAN_FUNCTION/read_setup_ran.c

@@ -25,18 +25,66 @@
 #include <assert.h>
 #include <stdlib.h>
 
-void read_setup_ran(void* data)
+void read_setup_ran(void* data, const ngran_node_t node_type)
 {
   assert(data != NULL);
 #ifdef E2AP_V1
 
 #elif defined(E2AP_V2) || defined(E2AP_V3) 
-  *((e2ap_node_component_config_add_t*)data) = fill_e2ap_node_component_config_add();
+
+  arr_node_component_config_add_t* dst = (arr_node_component_config_add_t*)data;
+  if(node_type == ngran_gNB){
+    dst->len_cca = 1;
+    dst->cca = calloc(1, sizeof(e2ap_node_component_config_add_t));
+    assert(dst->cca != NULL);
+    // NGAP
+    dst->cca[0] = fill_ngap_e2ap_node_component_config_add();
+  } else if(node_type == ngran_gNB_CU){
+    dst->len_cca = 2;
+    dst->cca = calloc(2, sizeof(e2ap_node_component_config_add_t));
+    assert(dst->cca != NULL);
+    // NGAP
+    dst->cca[0] = fill_ngap_e2ap_node_component_config_add();
+    // F1AP
+    dst->cca[1] = fill_f1ap_e2ap_node_component_config_add();
+  } else if(node_type == ngran_gNB_DU){
+    dst->len_cca = 1;
+    dst->cca = calloc(1, sizeof(e2ap_node_component_config_add_t));
+    assert(dst->cca != NULL);
+    // F1AP
+    dst->cca[0] = fill_f1ap_e2ap_node_component_config_add();
+  } else if(node_type == ngran_gNB_CUCP){
+    dst->len_cca = 3;
+    dst->cca = calloc(3, sizeof(e2ap_node_component_config_add_t));
+    assert(dst->cca != NULL);
+    // NGAP
+    dst->cca[0] = fill_ngap_e2ap_node_component_config_add();
+    // F1AP
+    dst->cca[1] = fill_f1ap_e2ap_node_component_config_add();
+    // E1AP
+    dst->cca[2] = fill_e1ap_e2ap_node_component_config_add();
+  } else if(node_type == ngran_gNB_CUUP){
+    dst->len_cca = 3;
+    dst->cca = calloc(3, sizeof(e2ap_node_component_config_add_t));
+    assert(dst->cca != NULL);
+    // NGAP
+    dst->cca[0] = fill_ngap_e2ap_node_component_config_add();
+    // F1AP
+    dst->cca[1] = fill_f1ap_e2ap_node_component_config_add();
+    // E1AP
+    dst->cca[2] = fill_e1ap_e2ap_node_component_config_add();
+  } else if(node_type == ngran_eNB){
+    dst->len_cca = 1;
+    dst->cca = calloc(1, sizeof(e2ap_node_component_config_add_t));
+    assert(dst->cca != NULL);
+    // S1AP
+    dst->cca[0] = fill_s1ap_e2ap_node_component_config_add();
+  } else {
+    assert(0 != 0 && "Not implemented");
+  }
+
 #else
   static_assert(0!=0, "Unknown E2AP version");
 #endif
 
 }
-
-
-

openair2/E2AP/RAN_FUNCTION/read_setup_ran.h

@@ -22,6 +22,8 @@
 #ifndef READ_SETUP_RAN_E2_AGENT_H
 #define READ_SETUP_RAN_E2_AGENT_H  
 
-void read_setup_ran(void* data);
+#include "common/ngran_types.h"
+
+void read_setup_ran(void* data, const ngran_node_t node_type);
 
 #endif

openair2/E2AP/README.md

@@ -62,6 +62,15 @@ cd oai/
 
 - By default, OAI will build the E2 Agent with E2AP v2 and KPM v2. If you want a different version, edit the variable E2AP\_VERSION and KPM\_VERSION at OAI's CMakeLists.txt file.
 
+Currently available versions:
+|            |KPM v2.03|KPM v3.00|
+|:-----------|:--------|:--------|
+| E2AP v1.01 | Y       | Y       |
+| E2AP v2.03 | Y       | Y       |
+| E2AP v3.01 | Y       | Y       |
+
+  Please note that KPM SM v2.01 is supported only in FlexRIC, but not in OAI.
+
 ```bash
 cd cmake_targets/
 ./build_oai -I -w SIMU --gNB --nrUE --build-e2 --ninja
@@ -89,7 +98,7 @@ git submodule update
 ```bash
 git clone https://gitlab.eurecom.fr/mosaic5g/flexric flexric
 cd flexric/
-git checkout 93961d2480b2c7a5721e03435cb34cf9446d1ad1
+git checkout 70dd779f5339f4dac3ac176a24b49c45046a59fa
 ```
 
 ### 2.2.2 Build FlexRIC
@@ -104,11 +113,21 @@ sudo make install
 
 By default the service model libraries will be installed in the path `/usr/local/lib/flexric` while the configuration file in `/usr/local/etc/flexric`.
 
-Available SMs in this version are:
-* KPM v02.03 and KPM v03.00 (xapp_kpm_moni)
-* RC v01.03 (xapp_kpm_rc)
-* GTP (xapp_gtp_moni)
-* MAC + RLC + PDCP (xapp_mac_rlc_pdcp_moni)
+#### 2.2.3.1 Available Service Models
+1. KPM v02.03 and KPM v03.00 (`xapp_kpm_moni`)
+At the moment, the following measurements are supported in OAI RAN:
+* "DRB.PdcpSduVolumeDL"
+* "DRB.PdcpSduVolumeUL"
+* "DRB.RlcSduDelayDl"
+* "DRB.UEThpDl"
+* "DRB.UEThpUl"
+* "RRU.PrbTotDl"
+* "RRU.PrbTotUl"
+
+2. RC v01.03 (`xapp_kpm_rc`)
+At the moment, OAI RAN supports the RAN control function "QoS flow mapping configuration", i.e. creating a new DRB.
+
+3. MAC + RLC + PDCP + GTP (`xapp_gtp_mac_rlc_pdcp_moni`)
 
 If you are interested in TC and SLICE SMs, please follow the instructions at https://gitlab.eurecom.fr/mosaic5g/flexric.
 
@@ -122,16 +141,23 @@ e2_agent = {
 }
 ```
 
-* start the gNB
+* start the gNB-mono
 ```bash
 cd oai/cmake_targets/ran_build/build
 sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --rfsim --sa -E
 ```
 
-* if CU-DU split is used, start the gNB as follows
+* if CU/DU split is used, start the gNB as follows
+```bash
+sudo ./nr-softmodem -O <path_to_du_conf_file> --rfsim --sa -E
+sudo ./nr-softmodem -O <path_to_cu_conf_file> --sa
+```
+
+* if CU-CP/CU-UP/DU split is used, start the gNB as follows
 ```bash
 sudo ./nr-softmodem -O <path_to_du_conf_file> --rfsim --sa -E
-sudo ./nr-softmodem -O <path_to_cu_conf_file> --rfsim --sa -E
+sudo ./nr-softmodem -O <path_to_cu_cp_conf_file> --sa
+sudo ./nr-cuup -O <path_to_cu_up_conf_file> --sa
 ```
 
 * start the nrUE
@@ -152,17 +178,17 @@ cd flexric
 ./build/examples/xApp/c/monitor/xapp_kpm_moni
 ```
 
-* start the GTP xApp
-```bash
-cd flexric
-./build/examples/xApp/c/monitor/xapp_gtp_moni
-```
-
-* start the (MAC + RLC + PDCP) xApp
+* start the (MAC + RLC + PDCP + GTP) xApp
 ```bash
 cd flexric
-./build/examples/xApp/c/monitor/xapp_mac_rlc_pdcp_moni
+./build/examples/xApp/c/monitor/xapp_gtp_mac_rlc_pdcp_moni
 ```
+The latency that you observe in your monitor xApp is the latency from the E2 Agent to the nearRT-RIC and xApp. 
+Therefore, FlexRIC is well suited for use cases with ultra low-latency requirements.
+Additionally, all the data received in the `xapp_gtp_mac_rlc_pdcp_moni` xApp is also written to /tmp/xapp_db in case that offline data processing is wanted (e.g., Machine Learning/Artificial Intelligence applications). You can browse the data using e.g., sqlitebrowser.
+Please note:
+* KPM SM database is not been updated, therefore commented in `flexric/src/xApp/db/sqlite3/sqlite3_wrapper.c:1152`
+* RC SM database is not yet implemented.
 
 # Optional - Multiple UEs
 

openair2/E2AP/e2_agent_arg.c

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#include "e2_agent_arg.h"
+#include "e2_agent_paramdef.h"
+#include "common/config/config_userapi.h"
+
+e2_agent_args_t RCconfig_NR_E2agent(void)
+{
+  paramdef_t e2agent_params[] = E2AGENT_PARAMS_DESC;
+  int ret = config_get(config_get_if(), e2agent_params, sizeofArray(e2agent_params), CONFIG_STRING_E2AGENT);
+  if (ret < 0) {
+    printf("configuration file does not contain a \"%s\" section, applying default parameters from FlexRIC\n", CONFIG_STRING_E2AGENT);
+    return (e2_agent_args_t) { 0 };
+  }
+
+  bool enabled = config_isparamset(e2agent_params, E2AGENT_CONFIG_SMDIR_IDX)
+              && config_isparamset(e2agent_params, E2AGENT_CONFIG_IP_IDX);
+  e2_agent_args_t dst = {.enabled = enabled};
+  if (!enabled) {
+    printf("E2 agent is DISABLED (for activation, define .%s.{%s,%s} parameters)\n", CONFIG_STRING_E2AGENT, E2AGENT_CONFIG_IP, E2AGENT_CONFIG_SMDIR);
+    return dst;
+  }
+
+  if (e2agent_params[E2AGENT_CONFIG_SMDIR_IDX].strptr != NULL)
+    dst.sm_dir = *e2agent_params[E2AGENT_CONFIG_SMDIR_IDX].strptr;
+
+  if (e2agent_params[E2AGENT_CONFIG_IP_IDX].strptr != NULL)
+    dst.ip = *e2agent_params[E2AGENT_CONFIG_IP_IDX].strptr;
+
+  return dst;
+}

openair2/E2AP/e2_agent_arg.h

@@ -23,6 +23,8 @@
 #define E2_AGENT_ARGS_H
 
 #include <stdint.h>
+#include <stdbool.h>
+#include <stddef.h>
 
 // Wrapper for OAI
 typedef struct{
@@ -31,6 +33,8 @@ typedef struct{
   const bool enabled;
 } e2_agent_args_t;
 
+e2_agent_args_t RCconfig_NR_E2agent(void);
+
 #endif
 
 

openair2/E2AP/e2_agent_paramdef.h

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#ifndef E2_AGENT_PARAMDEF_H_
+#define E2_AGENT_PARAMDEF_H_
+
+/* E2 Agent configuration */
+#define CONFIG_STRING_E2AGENT "e2_agent"
+
+#define E2AGENT_CONFIG_IP    "near_ric_ip_addr"
+#define E2AGENT_CONFIG_SMDIR "sm_dir"
+
+static const char* const e2agent_config_ip_default = "127.0.0.1";
+static const char* const e2agent_config_smdir_default = ".";
+
+#define E2AGENT_PARAMS_DESC { \
+  {E2AGENT_CONFIG_IP,    "RIC IP address",             0, strptr:NULL, defstrval:(char*)e2agent_config_ip_default,    TYPE_STRING, 0}, \
+  {E2AGENT_CONFIG_SMDIR, "Directory with SMs to load", 0, strptr:NULL, defstrval:(char*)e2agent_config_smdir_default, TYPE_STRING, 0}, \
+}
+
+#define E2AGENT_CONFIG_IP_IDX    0
+#define E2AGENT_CONFIG_SMDIR_IDX 1
+
+#endif 

flexric @ 70dd779f

-Subproject commit 93961d2480b2c7a5721e03435cb34cf9446d1ad1
+Subproject commit 70dd779f5339f4dac3ac176a24b49c45046a59fa

openair2/ENB_APP/enb_config.c

@@ -2931,35 +2931,3 @@ void read_config_and_init(void) {
     RCconfig_RRC(enb_id, RC.rrc[enb_id]);
   }
 }
-
-#ifdef E2_AGENT
-
-e2_agent_args_t RCconfig_E2agent(void)
-{
-  paramdef_t e2agent_params[] = E2AGENT_PARAMS_DESC;
-  int ret = config_get(config_get_if(), e2agent_params, sizeofArray(e2agent_params), CONFIG_STRING_E2AGENT);
-  if (ret < 0) {
-    LOG_W(GNB_APP, "configuration file does not contain a \"%s\" section, applying default parameters\n", CONFIG_STRING_E2AGENT);
-    return (e2_agent_args_t) {0}; 
-  }
-
-  bool enabled = config_isparamset(e2agent_params, E2AGENT_CONFIG_SMDIR_IDX)
-              && config_isparamset(e2agent_params, E2AGENT_CONFIG_IP_IDX);
-  if (!enabled) {
-    LOG_W(GNB_APP, "E2 agent is DISABLED (for activation, define .%s.{%s,%s} parameters)\n", CONFIG_STRING_E2AGENT, E2AGENT_CONFIG_IP, E2AGENT_CONFIG_SMDIR);
-    return (e2_agent_args_t) {
-      .enabled = false,
-    };
-  }
-
-  return (e2_agent_args_t) {
-    .enabled = true,
-    .ip = *e2agent_params[E2AGENT_CONFIG_IP_IDX].strptr,
-    .sm_dir = *e2agent_params[E2AGENT_CONFIG_SMDIR_IDX].strptr,
-  };
-}
-
-
-#endif
-
-

openair2/ENB_APP/enb_paramdef.h

@@ -1321,32 +1321,7 @@ typedef struct srb1_params_s {
 #define CONFIG_HLP_PARALLEL                        "PARALLEL_SINGLE_THREAD, PARALLEL_RU_L1_SPLIT, or PARALLEL_RU_L1_TRX_SPLIT(RU_L1_TRX_SPLIT by defult)\n"
 /*-------------------------------------------------------------------------------------------------------------------------------------------------------------*/
 
-#ifdef E2_AGENT
 
-/* E2 Agent configuration */
-#define CONFIG_STRING_E2AGENT "e2_agent"
-
-#define E2AGENT_CONFIG_IP    "near_ric_ip_addr"
-//#define E2AGENT_CONFIG_PORT  "port"
-#define E2AGENT_CONFIG_SMDIR "sm_dir"
-
-static const char* const e2agent_config_ip_default = "127.0.0.1";
-static const char* const e2agent_config_smdir_default = ".";
-
-#define E2AGENT_PARAMS_DESC { \
-  {E2AGENT_CONFIG_IP,    "RIC IP address",             0, strptr:NULL, defstrval:(char*)e2agent_config_ip_default,    TYPE_STRING, 0}, \
-  {E2AGENT_CONFIG_SMDIR, "Directory with SMs to load", 0, strptr:NULL, defstrval:(char*)e2agent_config_smdir_default, TYPE_STRING, 0}, \
-}
-/*
-//  {E2AGENT_CONFIG_PORT,  "RIC port",                   0, u16ptr:NULL, defuintval:e2agent_config_port_default,        TYPE_UINT16, 0}, \
-}
-*/
-
-#define E2AGENT_CONFIG_IP_IDX    0
-#define E2AGENT_CONFIG_SMDIR_IDX 1
-//#define E2AGENT_CONFIG_PORT_IDX  2
-
-#endif // E2_AGENT
 
 
 #include "enb_paramdef_emtc.h"

openair2/GNB_APP/gnb_config.c

@@ -2267,33 +2267,3 @@ ngran_node_t get_node_type(void)
     return ngran_gNB;
   }
 }
-
-#ifdef E2_AGENT
-
-e2_agent_args_t RCconfig_NR_E2agent(void)
-{
-  paramdef_t e2agent_params[] = E2AGENT_PARAMS_DESC;
-  int ret = config_get(config_get_if(), e2agent_params, sizeofArray(e2agent_params), CONFIG_STRING_E2AGENT);
-  if (ret < 0) {
-    LOG_W(GNB_APP, "configuration file does not contain a \"%s\" section, applying default parameters from FlexRIC\n", CONFIG_STRING_E2AGENT);
-    return (e2_agent_args_t) { 0 };
-  }
-
-  bool enabled = config_isparamset(e2agent_params, E2AGENT_CONFIG_SMDIR_IDX)
-              && config_isparamset(e2agent_params, E2AGENT_CONFIG_IP_IDX);
-  e2_agent_args_t dst = {.enabled = enabled};
-  if (!enabled) {
-    LOG_W(GNB_APP, "E2 agent is DISABLED (for activation, define .%s.{%s,%s} parameters)\n", CONFIG_STRING_E2AGENT, E2AGENT_CONFIG_IP, E2AGENT_CONFIG_SMDIR);
-    return dst;
-  }
-
-  if (e2agent_params[E2AGENT_CONFIG_SMDIR_IDX].strptr != NULL)
-    dst.sm_dir = *e2agent_params[E2AGENT_CONFIG_SMDIR_IDX].strptr;
-
-  if (e2agent_params[E2AGENT_CONFIG_IP_IDX].strptr != NULL)
-    dst.ip = *e2agent_params[E2AGENT_CONFIG_IP_IDX].strptr;
-
-  return dst;
-}
-
-#endif // E2_AGENT

openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c

@@ -1366,3 +1366,15 @@ bool nr_pdcp_get_statistics(ue_id_t ue_id, int srb_flag, int rb_id, nr_pdcp_stat
 
   return ret;
 }
+
+int nr_pdcp_get_num_ues(ue_id_t *ue_list, int len)
+{
+  nr_pdcp_manager_lock(nr_pdcp_ue_manager);
+  int num_ues = nr_pdcp_manager_get_ue_count(nr_pdcp_ue_manager);
+  nr_pdcp_ue_t **nr_pdcp_ue_list = nr_pdcp_manager_get_ue_list(nr_pdcp_ue_manager);
+  for (int i = 0; i < num_ues && i < len; i++)
+    ue_list[i] = nr_pdcp_ue_list[i]->ue_id;
+  nr_pdcp_manager_unlock(nr_pdcp_ue_manager);
+  
+  return num_ues;
+}

openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.h

@@ -124,6 +124,8 @@ void nr_pdcp_tick(int frame, int subframe);
 
 nr_pdcp_ue_manager_t *nr_pdcp_sdap_get_ue_manager();
 
+int nr_pdcp_get_num_ues(ue_id_t *ue_list, int len);
+
 bool nr_pdcp_get_statistics(ue_id_t ue_id, int srb_flag, int rb_id, nr_pdcp_statistics_t *out);
 
 #endif /* NR_PDCP_OAI_API_H */