Merge remote-tracking branch 'origin/kpm-rc-cleanup' into integration_2024_w12

openair2/E2AP/RAN_FUNCTION/CMakeLists.txt

 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  # 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_e2sm_ue_id.c
+            O-RAN/ran_func_kpm.c
+            O-RAN/ran_func_kpm_subs.c
+            O-RAN/ran_func_rc.c
+            O-RAN/ran_func_rc_subs.c
+            CUSTOMIZED/ran_func_gtp.c    # GTP SM not yet implemented in CU-UP
+            CUSTOMIZED/ran_func_pdcp.c
             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
-            O-RAN/ran_func_rc_subs.c
-            ../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_cuup PUBLIC asn1_nr_rrc nr_rrc asn1_nr_rrc_hdrs e2_time_obj kpm_ric_info_common_obj 3gpp_derived_ie_obj)
+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 sm_common_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
+            O-RAN/ran_e2sm_ue_id.c
+            O-RAN/ran_func_kpm.c
+            O-RAN/ran_func_kpm_subs.c
+            O-RAN/ran_func_rc.c
             O-RAN/ran_func_rc_subs.c
-            ../flexric/test/rnd/fill_rnd_data_rc.c   # this dependancy will be taken out once RAN Function Definition is implemented
             ../flexric/src/sm/rc_sm/ie/rc_data_ie.c
+            CUSTOMIZED/ran_func_gtp.c
+            CUSTOMIZED/ran_func_pdcp.c
             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
+            CUSTOMIZED/ran_func_slice.c  # currently, not implemented; therefore, filling rnd data
             ../flexric/test/rnd/fill_rnd_data_slice.c
+            CUSTOMIZED/ran_func_tc.c     # currently, not implemented; therefore, filling rnd data
+            ../flexric/test/rnd/fill_rnd_data_tc.c
             )
 
-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 e2sm_rc_ir_obj sm_common_ie_obj e2_agent)
-target_compile_definitions(e2_ran_func_du_cucp_cuup PUBLIC ${E2AP_VERSION} ${KPM_VERSION} NGRAN_GNB_DU NGRAN_GNB_CUCP NGRAN_GNB_CUUP)
+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 e2sm_rc_ir_obj sm_common_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)
+
+# Current implementation:
+# - we only have one executable nr-softmodem for 4 node types: DU, CU, gNB-mono, CU-CP
+
+# In the future, when nr-softmodem is separated, linking should be done as following:
+# - DU: e2_ran_func_du
+# - CU-CP : e2_ran_func_cucp
+# - CU-UP: e2_ran_func_cuup (this is available at the moment, executable nr-cuup)
+# - CU: e2_ran_func_cucp + e2_ran_func_cuup
+# - gNB-mono: e2_ran_func_du + e2_ran_func_cucp + e2_ran_func_cuup

openair2/E2AP/RAN_FUNCTION/O-RAN/ran_e2sm_ue_id.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 "ran_e2sm_ue_id.h"
+
+ue_id_e2sm_t fill_e2sm_gnb_ue_id_data(const gNB_RRC_UE_t *rrc_ue_context, __attribute__((unused))const uint32_t rrc_ue_id, __attribute__((unused))const ue_id_t cucp_ue_id)
+{
+  ue_id_e2sm_t ue_id = {0};
+
+  ue_id.type = GNB_UE_ID_E2SM;
+
+  // 6.2.3.16
+  // Mandatory
+  // AMF UE NGAP ID
+  ue_id.gnb.amf_ue_ngap_id = rrc_ue_context->amf_ue_ngap_id;
+
+  // Mandatory
+  //GUAMI 6.2.3.17 
+  ue_id.gnb.guami.plmn_id = (e2sm_plmn_t) {
+                                    .mcc = rrc_ue_context->ue_guami.mcc,
+                                    .mnc = rrc_ue_context->ue_guami.mnc,
+                                    .mnc_digit_len = rrc_ue_context->ue_guami.mnc_len
+                                    };
+  
+  ue_id.gnb.guami.amf_region_id = rrc_ue_context->ue_guami.amf_region_id;
+  ue_id.gnb.guami.amf_set_id = rrc_ue_context->ue_guami.amf_set_id;
+  ue_id.gnb.guami.amf_ptr = rrc_ue_context->ue_guami.amf_pointer;
+
+  // RAN UE ID
+  // Optional
+  // 6.2.3.25
+  // OCTET STRING (SIZE (8))
+  // Defined in TS 38.473 (F1AP) 
+  // clause 9.2.2.1
+  // UE CONTEXT SETUP REQUEST
+  ue_id.gnb.ran_ue_id = calloc(1, sizeof(uint64_t));
+  assert(ue_id.gnb.ran_ue_id != NULL);
+  *ue_id.gnb.ran_ue_id = rrc_ue_context->rrc_ue_id;
+
+  return ue_id;
+}
+
+ue_id_e2sm_t fill_e2sm_cu_ue_id_data(const gNB_RRC_UE_t *rrc_ue_context, const uint32_t rrc_ue_id, const ue_id_t cucp_ue_id)
+{
+  ue_id_e2sm_t ue_id = fill_e2sm_gnb_ue_id_data(rrc_ue_context, rrc_ue_id, cucp_ue_id);
+
+  // gNB-CU UE F1AP ID List
+  // C-ifCUDUseparated
+  ue_id.gnb.gnb_cu_ue_f1ap_lst_len = 1;
+  ue_id.gnb.gnb_cu_ue_f1ap_lst = calloc(ue_id.gnb.gnb_cu_ue_f1ap_lst_len, sizeof(uint32_t));
+  assert(ue_id.gnb.gnb_cu_ue_f1ap_lst != NULL && "Memory exhausted");
+  ue_id.gnb.gnb_cu_ue_f1ap_lst[0] = rrc_ue_context->rrc_ue_id;
+
+  return ue_id;
+}
+
+ue_id_e2sm_t fill_e2sm_du_ue_id_data(__attribute__((unused))const gNB_RRC_UE_t *rrc_ue_context, const uint32_t rrc_ue_id, __attribute__((unused))const ue_id_t cucp_ue_id)
+{
+  ue_id_e2sm_t ue_id = {0};
+
+  ue_id.type = GNB_DU_UE_ID_E2SM;
+
+  // 6.2.3.21
+  // gNB CU UE F1AP
+  // Mandatory
+  ue_id.gnb_du.gnb_cu_ue_f1ap = rrc_ue_id;
+
+  // 6.2.3.25
+  // RAN UE ID
+  // Optional
+  ue_id.gnb_du.ran_ue_id = calloc(1, sizeof(uint64_t));
+  assert(ue_id.gnb_du.ran_ue_id != NULL);
+  *ue_id.gnb_du.ran_ue_id = rrc_ue_id;
+
+  return ue_id;
+}
+
+ue_id_e2sm_t fill_e2sm_cucp_ue_id_data(const gNB_RRC_UE_t *rrc_ue_context, const uint32_t rrc_ue_id, const ue_id_t cucp_ue_id)
+{
+  ue_id_e2sm_t ue_id = fill_e2sm_gnb_ue_id_data(rrc_ue_context, rrc_ue_id, cucp_ue_id);
+
+  //gNB-CU-CP UE E1AP ID List
+  //C-ifCPUPseparated 
+  ue_id.gnb.gnb_cu_cp_ue_e1ap_lst_len = 1;
+  ue_id.gnb.gnb_cu_cp_ue_e1ap_lst = calloc(ue_id.gnb.gnb_cu_cp_ue_e1ap_lst_len, sizeof(uint32_t));
+  assert(ue_id.gnb.gnb_cu_cp_ue_e1ap_lst != NULL && "Memory exhausted");
+  ue_id.gnb.gnb_cu_cp_ue_e1ap_lst[0] = rrc_ue_context->rrc_ue_id;
+
+  return ue_id;
+}
+
+ue_id_e2sm_t fill_e2sm_cuup_ue_id_data(__attribute__((unused))const gNB_RRC_UE_t *rrc_ue_context, __attribute__((unused))const uint32_t rrc_ue_id, const ue_id_t cucp_ue_id)
+{
+  ue_id_e2sm_t ue_id = {0};
+
+  ue_id.type = GNB_CU_UP_UE_ID_E2SM;
+
+  // 6.2.3.20
+  // Mandatory
+  ue_id.gnb_cu_up.gnb_cu_cp_ue_e1ap = cucp_ue_id;  // RAN UE NGAP ID = gNB UE NGAP ID = rrc_ue_id
+
+  // 6.2.3.25
+  // RAN UE ID
+  // Optional
+  ue_id.gnb_cu_up.ran_ue_id = calloc(1, sizeof(uint64_t));
+  assert(ue_id.gnb_cu_up.ran_ue_id != NULL);
+  *ue_id.gnb_cu_up.ran_ue_id = cucp_ue_id;  // RAN UE NGAP ID = gNB UE NGAP ID = rrc_ue_id
+
+  return ue_id;
+}
+
+get_ue_id fill_ue_id_data[END_NGRAN_NODE_TYPE] =
+{
+  NULL,
+  NULL,
+  fill_e2sm_gnb_ue_id_data,
+  NULL,
+  NULL,
+  fill_e2sm_cu_ue_id_data,
+  NULL,
+  fill_e2sm_du_ue_id_data,
+  NULL,
+  fill_e2sm_cucp_ue_id_data,
+  fill_e2sm_cuup_ue_id_data,
+};

openair2/E2AP/RAN_FUNCTION/O-RAN/ran_e2sm_ue_id.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 RAN_E2SM_UE_ID_H
+#define RAN_E2SM_UE_ID_H
+
+#include "openair2/E2AP/flexric/src/agent/../sm/sm_io.h"
+#include "openair2/RRC/NR/rrc_gNB_UE_context.h"
+
+ue_id_e2sm_t fill_e2sm_gnb_ue_id_data(const gNB_RRC_UE_t *rrc_ue_context, const uint32_t rrc_ue_id, const ue_id_t cucp_ue_id);
+
+ue_id_e2sm_t fill_e2sm_cu_ue_id_data(const gNB_RRC_UE_t *rrc_ue_context, const uint32_t rrc_ue_id, const ue_id_t cucp_ue_id);
+
+ue_id_e2sm_t fill_e2sm_du_ue_id_data(const gNB_RRC_UE_t *rrc_ue_context, const uint32_t rrc_ue_id, const ue_id_t cucp_ue_id);
+
+ue_id_e2sm_t fill_e2sm_cucp_ue_id_data(const gNB_RRC_UE_t *rrc_ue_context, const uint32_t rrc_ue_id, const ue_id_t cucp_ue_id);
+
+ue_id_e2sm_t fill_e2sm_cuup_ue_id_data(const gNB_RRC_UE_t *rrc_ue_context, const uint32_t rrc_ue_id, const ue_id_t cucp_ue_id);
+
+typedef ue_id_e2sm_t (*get_ue_id)(const gNB_RRC_UE_t *rrc_ue_context, const uint32_t rrc_ue_id, const ue_id_t cucp_ue_id);
+
+extern get_ue_id fill_ue_id_data[END_NGRAN_NODE_TYPE];
+
+#endif

openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_kpm_subs.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 "ran_func_kpm_subs.h"
+
+#include <search.h>
+
+/* measurements that need to store values from previous reporting period have a limitation
+   when it comes to multiple subscriptions to the same UEs; ric_req_id is unique per subscription */
+typedef struct uldlcounter {
+  uint32_t dl;
+  uint32_t ul;
+} uldlcounter_t;
+
+static uldlcounter_t last_pdcp_sdu_total_bytes[MAX_MOBILES_PER_GNB] = {0};
+
+static nr_pdcp_statistics_t get_pdcp_stats_per_drb(const uint32_t rrc_ue_id, const int rb_id)
+{
+  nr_pdcp_statistics_t pdcp = {0};
+  const int srb_flag = 0;
+
+  // Get PDCP stats for specific DRB
+  const bool rc = nr_pdcp_get_statistics(rrc_ue_id, srb_flag, rb_id, &pdcp);
+  assert(rc == true && "Cannot get PDCP stats\n");
+
+  return pdcp;
+}
+
+/* 3GPP TS 28.522 - section 5.1.2.1.1.1
+  note: this measurement is calculated as per spec */
+static meas_record_lst_t fill_DRB_PdcpSduVolumeDL(__attribute__((unused))uint32_t gran_period_ms, cudu_ue_info_pair_t ue_info, const size_t ue_idx)
+{
+  meas_record_lst_t meas_record = {0};
+
+  // Get PDCP stats per DRB
+  const int rb_id = 1;  // at the moment, only 1 DRB is supported
+  nr_pdcp_statistics_t pdcp = get_pdcp_stats_per_drb(ue_info.rrc_ue_id, rb_id);
+
+  meas_record.value = INTEGER_MEAS_VALUE;
+
+  // Get DL data volume delivered to PDCP layer
+  meas_record.int_val = (pdcp.rxsdu_bytes - last_pdcp_sdu_total_bytes[ue_idx].dl)*8/1000;   // [kb]
+  last_pdcp_sdu_total_bytes[ue_idx].dl = pdcp.rxsdu_bytes;
+
+  return meas_record;
+}
+
+/* 3GPP TS 28.522 - section 5.1.2.1.2.1
+  note: this measurement is calculated as per spec */
+static meas_record_lst_t fill_DRB_PdcpSduVolumeUL(__attribute__((unused))uint32_t gran_period_ms, cudu_ue_info_pair_t ue_info, const size_t ue_idx)
+{
+  meas_record_lst_t meas_record = {0};
+
+  // Get PDCP stats per DRB
+  const int rb_id = 1;  // at the moment, only 1 DRB is supported
+  nr_pdcp_statistics_t pdcp = get_pdcp_stats_per_drb(ue_info.rrc_ue_id, rb_id);
+
+  meas_record.value = INTEGER_MEAS_VALUE;
+
+  // Get UL data volume delivered from PDCP layer
+  meas_record.int_val = (pdcp.txsdu_bytes - last_pdcp_sdu_total_bytes[ue_idx].ul)*8/1000;   // [kb]
+  last_pdcp_sdu_total_bytes[ue_idx].ul = pdcp.txsdu_bytes;
+
+  return meas_record;
+}
+
+#if defined (NGRAN_GNB_DU)
+static uldlcounter_t last_rlc_pdu_total_bytes[MAX_MOBILES_PER_GNB] = {0};
+static uldlcounter_t last_total_prbs[MAX_MOBILES_PER_GNB] = {0};
+
+static nr_rlc_statistics_t get_rlc_stats_per_drb(const rnti_t rnti, const int rb_id)
+{
+  nr_rlc_statistics_t rlc = {0};
+  const int srb_flag = 0;
+
+  // Get RLC stats for specific DRB
+  const bool rc = nr_rlc_get_statistics(rnti, srb_flag, rb_id, &rlc);
+  assert(rc == true && "Cannot get RLC stats\n");
+
+  // Activate average sojourn time at the RLC buffer for specific DRB
+  nr_rlc_activate_avg_time_to_tx(rnti, rb_id+3, 1);
+  
+  return rlc;  
+}
+
+/* 3GPP TS 28.522 - section 5.1.3.3.3
+  note: by default this measurement is calculated for previous 100ms (openair2/LAYER2/nr_rlc/nr_rlc_entity.c:118, 173, 213); please, update according to your needs */
+static meas_record_lst_t fill_DRB_RlcSduDelayDl(__attribute__((unused))uint32_t gran_period_ms, cudu_ue_info_pair_t ue_info, __attribute__((unused))const size_t ue_idx)
+{
+  meas_record_lst_t meas_record = {0};
+  
+  // Get RLC stats per DRB
+  const int rb_id = 1;  // at the moment, only 1 DRB is supported
+  nr_rlc_statistics_t rlc = get_rlc_stats_per_drb(ue_info.ue->rnti, rb_id);
+
+  meas_record.value = REAL_MEAS_VALUE;
+
+  // Get the value of sojourn time at the RLC buffer
+  meas_record.real_val = rlc.txsdu_avg_time_to_tx;  // [μs]
+
+  return meas_record;
+}
+
+/* 3GPP TS 28.522 - section 5.1.1.3.1
+  note: per spec, average UE throughput in DL (taken into consideration values from all UEs, and averaged)
+        here calculated as: UE specific throughput in DL */
+static meas_record_lst_t fill_DRB_UEThpDl(uint32_t gran_period_ms, cudu_ue_info_pair_t ue_info, const size_t ue_idx)
+{
+  meas_record_lst_t meas_record = {0};
+  
+  // Get RLC stats per DRB
+  const int rb_id = 1;  // at the moment, only 1 DRB is supported
+  nr_rlc_statistics_t rlc = get_rlc_stats_per_drb(ue_info.ue->rnti, rb_id);
+  meas_record.value = REAL_MEAS_VALUE;
+
+  // Calculate DL Thp
+  meas_record.real_val = (double)(rlc.txpdu_bytes - last_rlc_pdu_total_bytes[ue_idx].dl)*8/gran_period_ms;  // [kbps]
+  last_rlc_pdu_total_bytes[ue_idx].dl = rlc.txpdu_bytes;
+
+  return meas_record;
+}
+
+/* 3GPP TS 28.522 - section 5.1.1.3.3
+  note: per spec, average UE throughput in UL (taken into consideration values from all UEs, and averaged)
+        here calculated as: UE specific throughput in UL */
+static meas_record_lst_t fill_DRB_UEThpUl(uint32_t gran_period_ms, cudu_ue_info_pair_t ue_info, const size_t ue_idx)
+{
+  meas_record_lst_t meas_record = {0};
+  
+  // Get RLC stats per DRB
+  const int rb_id = 1;  // at the moment, only 1 DRB is supported
+  nr_rlc_statistics_t rlc = get_rlc_stats_per_drb(ue_info.ue->rnti, rb_id);
+
+  meas_record.value = REAL_MEAS_VALUE;
+
+  // Calculate UL Thp
+  meas_record.real_val = (double)(rlc.rxpdu_bytes - last_rlc_pdu_total_bytes[ue_idx].ul)*8/gran_period_ms;  // [kbps]
+  last_rlc_pdu_total_bytes[ue_idx].ul = rlc.rxpdu_bytes;
+  
+  return meas_record;
+}
+
+/* 3GPP TS 28.522 - section 5.1.1.2.1
+  note: per spec, DL PRB usage [%] = (total used PRBs for DL traffic / total available PRBs for DL traffic) * 100   
+        here calculated as: aggregated DL PRBs (t) - aggregated DL PRBs (t-gran_period) */
+static meas_record_lst_t fill_RRU_PrbTotDl(__attribute__((unused))uint32_t gran_period_ms, cudu_ue_info_pair_t ue_info, const size_t ue_idx)
+{
+  meas_record_lst_t meas_record = {0};
+  
+  meas_record.value = INTEGER_MEAS_VALUE;
+
+  // Get the number of DL PRBs
+  meas_record.int_val = ue_info.ue->mac_stats.dl.total_rbs - last_total_prbs[ue_idx].dl;   // [PRBs]
+  last_total_prbs[ue_idx].dl = ue_info.ue->mac_stats.dl.total_rbs;
+
+  return meas_record;
+}
+
+/* 3GPP TS 28.522 - section 5.1.1.2.2
+  note: per spec, UL PRB usage [%] = (total used PRBs for UL traffic / total available PRBs for UL traffic) * 100   
+        here calculated as: aggregated UL PRBs (t) - aggregated UL PRBs (t-gran_period) */
+static meas_record_lst_t fill_RRU_PrbTotUl(__attribute__((unused))uint32_t gran_period_ms, cudu_ue_info_pair_t ue_info, const size_t ue_idx)
+{
+  meas_record_lst_t meas_record = {0};
+
+  meas_record.value = INTEGER_MEAS_VALUE;
+
+  // Get the number of UL PRBs
+  meas_record.int_val = ue_info.ue->mac_stats.ul.total_rbs - last_total_prbs[ue_idx].ul;   // [PRBs]
+  last_total_prbs[ue_idx].ul = ue_info.ue->mac_stats.ul.total_rbs;
+
+  return meas_record;
+}
+#endif
+
+static kv_measure_t lst_measure[] = {
+  {.key = "DRB.PdcpSduVolumeDL", .value = fill_DRB_PdcpSduVolumeDL }, 
+  {.key = "DRB.PdcpSduVolumeUL", .value = fill_DRB_PdcpSduVolumeUL },
+#if defined (NGRAN_GNB_DU)
+  {.key = "DRB.RlcSduDelayDl", .value =  fill_DRB_RlcSduDelayDl }, 
+  {.key = "DRB.UEThpDl", .value =  fill_DRB_UEThpDl }, 
+  {.key = "DRB.UEThpUl", .value =  fill_DRB_UEThpUl }, 
+  {.key = "RRU.PrbTotDl", .value =  fill_RRU_PrbTotDl }, 
+  {.key = "RRU.PrbTotUl", .value =  fill_RRU_PrbTotUl }, 
+#endif
+}; 
+
+void init_kpm_subs_data(void)
+{
+  const size_t ht_len = sizeof(lst_measure) / sizeof(lst_measure[0]);
+  hcreate(ht_len);
+
+  ENTRY kv_pair;
+
+  for (size_t i = 0; i < ht_len; i++) {
+    kv_pair.key = lst_measure[i].key;
+    kv_pair.data = &lst_measure[i];
+    hsearch(kv_pair, ENTER);
+  }
+}
+
+meas_record_lst_t get_kpm_meas_value(char* kpm_meas_name, uint32_t gran_period_ms, cudu_ue_info_pair_t ue_info, const size_t ue_idx)
+{
+  assert(kpm_meas_name != NULL);
+
+  ENTRY search_entry = {.key = kpm_meas_name};
+  ENTRY *found_entry = hsearch(search_entry, FIND);
+  assert(found_entry != NULL && "Unsupported KPM measurement name");
+
+  kv_measure_t *kv_found = (kv_measure_t *)found_entry->data;
+  meas_record_lst_t meas_record = kv_found->value(gran_period_ms, ue_info, ue_idx);
+
+  return meas_record;
+}

openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_kpm_subs.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 RAN_FUNC_SM_KPM_SUBSCRIPTION_AGENT_H
+#define RAN_FUNC_SM_KPM_SUBSCRIPTION_AGENT_H
+
+#include "openair2/E2AP/flexric/src/sm/kpm_sm/kpm_data_ie_wrapper.h"
+
+#include "openair2/LAYER2/NR_MAC_gNB/mac_proto.h"
+#include "openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.h"
+#include "openair2/LAYER2/nr_rlc/nr_rlc_oai_api.h"
+
+typedef struct {
+  uint32_t rrc_ue_id;
+  NR_UE_info_t* ue;
+
+} cudu_ue_info_pair_t;
+
+typedef meas_record_lst_t (*kpm_meas_fp)(uint32_t gran_period_ms, cudu_ue_info_pair_t ue_info, const size_t ue_idx);
+
+typedef struct{ 
+  char* key; 
+  kpm_meas_fp value;
+} kv_measure_t;
+
+
+void init_kpm_subs_data(void);
+
+meas_record_lst_t get_kpm_meas_value(char* kpm_meas_name, uint32_t gran_period_ms, cudu_ue_info_pair_t ue_info, const size_t ue_idx);
+
+#endif

openair2/E2AP/RAN_FUNCTION/read_setup_ran.c

@@ -21,10 +21,109 @@
 
 #include "read_setup_ran.h"
 #include "../../E2AP/flexric/src/lib/e2ap/e2ap_node_component_config_add_wrapper.h"
-#include "../../E2AP/flexric/test/rnd/fill_rnd_data_e2_setup_req.h"
 #include <assert.h>
 #include <stdlib.h>
 
+#if defined(E2AP_V2) || defined(E2AP_V3)
+// NGAP
+static e2ap_node_component_config_add_t fill_ngap_e2ap_node_component_config_add(void)
+{
+  e2ap_node_component_config_add_t dst = {0};
+
+  // Mandatory
+  // 9.2.26
+  dst.e2_node_comp_interface_type = NG_E2AP_NODE_COMP_INTERFACE_TYPE;
+  // Bug!! Optional in the standard, mandatory in ASN.1
+  // 9.2.32
+  dst.e2_node_comp_id.type = NG_E2AP_NODE_COMP_INTERFACE_TYPE;
+ 
+  const char ng_msg[] = "Dummy message";
+  dst.e2_node_comp_id.ng_amf_name = cp_str_to_ba(ng_msg); 
+ 
+  // Mandatory
+  // 9.2.27
+  const char req[] = "NGAP Request Message sent";
+  const char res[] = "NGAP Response Message reveived";
+
+  dst.e2_node_comp_conf.request = cp_str_to_ba(req); 
+  dst.e2_node_comp_conf.response = cp_str_to_ba(res); 
+  return dst;
+}
+
+// F1AP
+static e2ap_node_component_config_add_t fill_f1ap_e2ap_node_component_config_add(void)
+{
+  e2ap_node_component_config_add_t dst = {0};
+
+  // Mandatory
+  // 9.2.26
+  dst.e2_node_comp_interface_type = F1_E2AP_NODE_COMP_INTERFACE_TYPE;
+  // Bug!! Optional in the standard, mandatory in ASN.1
+  // 9.2.32
+  dst.e2_node_comp_id.type = F1_E2AP_NODE_COMP_INTERFACE_TYPE;
+
+  dst.e2_node_comp_id.f1_gnb_du_id = 1023;
+
+  // Mandatory
+  // 9.2.27
+  const char req[] = "F1AP Request Message sent";
+  const char res[] = "F1AP Response Message reveived";
+
+  dst.e2_node_comp_conf.request = cp_str_to_ba(req);
+  dst.e2_node_comp_conf.response = cp_str_to_ba(res);
+  return dst;
+}
+
+// E1AP
+static e2ap_node_component_config_add_t fill_e1ap_e2ap_node_component_config_add(void)
+{
+  e2ap_node_component_config_add_t dst = {0};
+
+  // Mandatory
+  // 9.2.26
+  dst.e2_node_comp_interface_type = E1_E2AP_NODE_COMP_INTERFACE_TYPE;
+  // Bug!! Optional in the standard, mandatory in ASN.1
+  // 9.2.32
+  dst.e2_node_comp_id.type = E1_E2AP_NODE_COMP_INTERFACE_TYPE;
+
+  dst.e2_node_comp_id.e1_gnb_cu_up_id = 1025;
+
+  // Mandatory
+  // 9.2.27
+  const char req[] = "E1AP Request Message sent";
+  const char res[] = "E1AP Response Message reveived";
+
+  dst.e2_node_comp_conf.request = cp_str_to_ba(req);
+  dst.e2_node_comp_conf.response = cp_str_to_ba(res);
+  return dst;
+}
+
+// S1AP
+static e2ap_node_component_config_add_t fill_s1ap_e2ap_node_component_config_add(void)
+{
+  e2ap_node_component_config_add_t dst = {0};
+
+  // Mandatory
+  // 9.2.26
+  dst.e2_node_comp_interface_type = S1_E2AP_NODE_COMP_INTERFACE_TYPE;
+  // Bug!! Optional in the standard, mandatory in ASN.1
+  // 9.2.32
+  dst.e2_node_comp_id.type = S1_E2AP_NODE_COMP_INTERFACE_TYPE;
+
+  const char str[] = "S1 NAME";
+  dst.e2_node_comp_id.s1_mme_name = cp_str_to_ba(str);
+
+  // Mandatory
+  // 9.2.27
+  const char req[] = "S1AP Request Message sent";
+  const char res[] = "S1AP Response Message reveived";
+
+  dst.e2_node_comp_conf.request = cp_str_to_ba(req);
+  dst.e2_node_comp_conf.response = cp_str_to_ba(res);
+  return dst;
+}
+#endif
+
 void read_setup_ran(void* data, const ngran_node_t node_type)
 {
   assert(data != NULL);

flexric @ 34d6810f

-Subproject commit 7c424e882adae6ad72a24470d8c3e731189062c0
+Subproject commit 34d6810f9ab435ac3a4023d5e1917669e24341da