e2ap: fixing small regression in config passing, changing label on e2…

…sm_kpm for Preambles
srsran · Dec 2, 2024 · e570a95 · e570a95
1 parent 3f7197f
commit e570a95
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/apps/units/flexible_o_du/split_helpers/o_du_high_factory.cpp b/apps/units/flexible_o_du/split_helpers/o_du_high_factory.cpp
@@ -64,6 +64,7 @@ std::vector<o_du_high_unit> srsran::make_multicell_with_multi_du(const o_du_high
     tmp_cfg.du_high_cfg.config.cells_cfg.resize(1);
     tmp_cfg.du_high_cfg.config.cells_cfg[0] = du_hi.cells_cfg[i];
     tmp_cfg.fapi_cfg                        = o_du_high_unit_cfg.fapi_cfg;
+    tmp_cfg.e2_cfg                          = o_du_high_unit_cfg.e2_cfg;
     srs_du::o_du_high_dependencies sector_deps;
     sector_deps.sectors.push_back(dependencies.o_du_hi_dependencies.sectors[i]);
 

diff --git a/lib/e2/common/e2_entity.cpp b/lib/e2/common/e2_entity.cpp
@@ -27,7 +27,7 @@ using namespace srsran;
 using namespace asn1::e2ap;
 using metrics_interface = std::variant<e2_du_metrics_interface*, e2_cu_metrics_interface*>;
 
-e2_entity::e2_entity(const e2ap_configuration&      cfg_,
+e2_entity::e2_entity(const e2ap_configuration       cfg_,
                      e2_connection_client&          e2_client_,
                      metrics_interface              e2_metrics_,
                      srs_du::f1ap_ue_id_translator* f1ap_ue_id_translator_,
@@ -64,7 +64,7 @@ e2_entity::e2_entity(const e2ap_configuration&      cfg_,
     e2sm_mngr->add_e2sm_service(e2sm_rc_asn1_packer::oid, std::move(e2sm_rc_iface));
   }
 
-  e2ap = std::make_unique<e2_impl>(cfg_, *this, timers_, e2_client_, *subscription_mngr, *e2sm_mngr, task_exec_);
+  e2ap = std::make_unique<e2_impl>(cfg, *this, timers_, e2_client_, *subscription_mngr, *e2sm_mngr, task_exec_);
 }
 
 void e2_entity::build_e2_kpm_du(metrics_interface e2_metrics_, srs_du::f1ap_ue_id_translator* f1ap_ue_id_translator)

diff --git a/lib/e2/common/e2_entity.h b/lib/e2/common/e2_entity.h
@@ -34,7 +34,7 @@ namespace srsran {
 class e2_entity final : public e2_agent
 {
 public:
-  e2_entity(const e2ap_configuration&                                        cfg_,
+  e2_entity(const e2ap_configuration                                         cfg_,
             e2_connection_client&                                            e2_client_,
             std::variant<e2_du_metrics_interface*, e2_cu_metrics_interface*> e2_metrics_,
             srs_du::f1ap_ue_id_translator*                                   f1ap_ue_id_translator_,
@@ -50,8 +50,8 @@ class e2_entity final : public e2_agent
   void on_e2_disconnection() override;
 
 private:
-  srslog::basic_logger&     logger;
-  const e2ap_configuration& cfg;
+  srslog::basic_logger&    logger;
+  const e2ap_configuration cfg;
 
   void build_e2_kpm_du(std::variant<e2_du_metrics_interface*, e2_cu_metrics_interface*> e2_metrics_,
                        srs_du::f1ap_ue_id_translator*                                   f1ap_ue_id_translator);

diff --git a/lib/e2/e2sm/e2sm_kpm/e2sm_kpm_du_meas_provider_impl.cpp b/lib/e2/e2sm/e2sm_kpm/e2sm_kpm_du_meas_provider_impl.cpp
@@ -94,9 +94,9 @@ e2sm_kpm_du_meas_provider_impl::e2sm_kpm_du_meas_provider_impl(srs_du::f1ap_ue_i
       e2sm_kpm_supported_metric_t{
           NO_LABEL, ALL_LEVELS, true, &e2sm_kpm_du_meas_provider_impl::get_drb_ul_rlc_sdu_latency});
 
-  supported_metrics.emplace(
-      "RACH.PreambleDedCell",
-      e2sm_kpm_supported_metric_t{NO_LABEL, ALL_LEVELS, true, &e2sm_kpm_du_meas_provider_impl::get_prach_cell_count});
+  supported_metrics.emplace("RACH.PreambleDedCell",
+                            e2sm_kpm_supported_metric_t{
+                                NO_LABEL, E2_NODE_LEVEL, true, &e2sm_kpm_du_meas_provider_impl::get_prach_cell_count});
 
   // Check if the supported metrics are matching e2sm_kpm metrics definitions.
   check_e2sm_kpm_metrics_definitions(get_e2sm_kpm_28_552_metrics());