e2ap,metrics: adding metrics hub to send metrics to an arbitrary number of subscribers (e2,console)

Author: yagoda

apps/gnb/gnb.cpp

@@ -40,6 +40,7 @@
 #include "gnb_worker_manager.h"
 
 #include "helpers/gnb_console_helper.h"
+#include "helpers/metrics_hub.h"
 
 #include "gnb_du_factory.h"
 #include "lib/pcap/dlt_pcap_impl.h"
@@ -52,6 +53,7 @@
 #include "srsran/ru/ru_ofh_factory.h"
 
 #include "apps/gnb/adapters/e2_gateway_remote_connector.h"
+#include "srsran/e2/e2_du_metrics_manager.h"
 #include "srsran/support/sysinfo.h"
 
 #include <atomic>
@@ -408,6 +410,10 @@ int main(int argc, char** argv)
   gnb_console_helper console(*epoll_broker);
   console.on_app_starting();
 
+  std::unique_ptr<metrics_hub>           hub = std::make_unique<metrics_hub>(*workers.metrics_hub_exec.get());
+  std::unique_ptr<e2_du_metrics_manager> e2_du_metric_manager = std::make_unique<e2_du_metrics_manager>();
+  hub->add_subscriber(*e2_du_metric_manager.get());
+
   // Create NGAP adapter.
   std::unique_ptr<srsran::srs_cu_cp::ngap_network_adapter> ngap_adapter =
       std::make_unique<srsran::srs_cu_cp::ngap_network_adapter>(*epoll_broker, *ngap_p);
@@ -501,7 +507,9 @@ int main(int argc, char** argv)
                                                           app_timers,
                                                           *mac_p,
                                                           console,
-                                                          e2_gw);
+                                                          e2_gw,
+                                                          *e2_du_metric_manager.get(),
+                                                          *hub);
 
   for (unsigned sector_id = 0, sector_end = du_inst.size(); sector_id != sector_end; ++sector_id) {
     auto& du = du_inst[sector_id];

apps/gnb/gnb_du_factory.cpp

@@ -61,11 +61,14 @@ std::vector<std::unique_ptr<du>> srsran::make_gnb_dus(const gnb_appconfig&
                                                       timer_manager&                        timer_mng,
                                                       mac_pcap&                             mac_p,
                                                       gnb_console_helper&                   console_helper,
-                                                      e2_connection_client&                 e2_client_handler)
+                                                      e2_connection_client&                 e2_client_handler,
+                                                      e2_du_metrics_manager&                e2_du_metric_manager,
+                                                      metrics_hub&                          metrics_hub)
 {
   // DU cell config
   std::vector<du_cell_config> du_cells = generate_du_cell_config(gnb_cfg);
   console_helper.set_cells(du_cells);
+  metrics_hub.add_subscriber(console_helper.get_metrics_notifier());
 
   std::vector<std::unique_ptr<du>> du_insts;
   for (unsigned i = 0, e = du_cells.size(); i != e; ++i) {
@@ -104,11 +107,12 @@ std::vector<std::unique_ptr<du>> srsran::make_gnb_dus(const gnb_appconfig&
     du_hi_cfg.gnb_du_name                    = fmt::format("srsdu{}", du_hi_cfg.gnb_du_id);
     du_hi_cfg.du_bind_addr                   = {fmt::format("127.0.0.{}", du_hi_cfg.gnb_du_id)};
     du_hi_cfg.mac_cfg                        = generate_mac_expert_config(gnb_cfg);
-    du_hi_cfg.metrics_notifier               = &console_helper.get_metrics_notifier();
+    du_hi_cfg.metrics_notifier               = &metrics_hub;
     du_hi_cfg.sched_cfg                      = generate_scheduler_expert_config(gnb_cfg);
     if (gnb_cfg.e2_cfg.enable_du_e2) {
-      du_hi_cfg.e2_client   = &e2_client_handler;
-      du_hi_cfg.e2ap_config = generate_e2_config(gnb_cfg);
+      du_hi_cfg.e2_client            = &e2_client_handler;
+      du_hi_cfg.e2ap_config          = generate_e2_config(gnb_cfg);
+      du_hi_cfg.e2_du_metric_manager = &e2_du_metric_manager;
     }
     if (gnb_cfg.test_mode_cfg.test_ue.rnti != INVALID_RNTI) {
       du_hi_cfg.test_cfg.test_ue = srs_du::du_test_config::test_ue_config{gnb_cfg.test_mode_cfg.test_ue.rnti,

apps/gnb/gnb_du_factory.h

@@ -12,9 +12,10 @@
 
 #include "gnb_appconfig.h"
 #include "gnb_worker_manager.h"
+#include "helpers/metrics_hub.h"
 #include "srsran/du/du.h"
 #include "srsran/du/du_cell_config.h"
-
+#include "srsran/e2/e2_du_metrics_manager.h"
 namespace srsran {
 
 class upper_phy_rg_gateway;
@@ -40,6 +41,8 @@ std::vector<std::unique_ptr<du>> make_gnb_dus(const gnb_appconfig&
                                               timer_manager&                        timer_mng,
                                               mac_pcap&                             mac_p,
                                               gnb_console_helper&                   console_helper,
-                                              e2_connection_client&                 e2_client_handler);
+                                              e2_connection_client&                 e2_client_handler,
+                                              e2_du_metrics_manager&                e2_du_metric_manager,
+                                              metrics_hub&                          metrics_hub);
 
 } // namespace srsran

apps/gnb/gnb_worker_manager.cpp

@@ -131,6 +131,9 @@ void worker_manager::create_du_cu_executors(bool                       is_blocki
   cu_cp_e2_exec = make_priority_task_executor_ptr<task_queue_priority::min>(*gnb_ctrl_worker);
   cu_up_e2_exec = make_priority_task_executor_ptr<task_queue_priority::min>(*gnb_ctrl_worker);
 
+  // metrics hub executor
+  metrics_hub_exec = make_priority_task_executor_ptr<task_queue_priority::min>(*gnb_ctrl_worker);
+
   du_high_executors.resize(cells_cfg.size());
   for (unsigned i = 0, e = cells_cfg.size(); i != e; ++i) {
     auto& du_item = du_high_executors[i];

apps/gnb/gnb_worker_manager.h

@@ -115,6 +115,7 @@ struct worker_manager {
   std::vector<std::unique_ptr<task_executor>>              ru_rx_exec;
   std::unique_ptr<task_executor>                           cu_cp_e2_exec;
   std::unique_ptr<task_executor>                           cu_up_e2_exec;
+  std::unique_ptr<task_executor>                           metrics_hub_exec;
 
   std::unordered_map<std::string, std::unique_ptr<task_executor>> task_execs;
 

include/srsran/du_high/du_high_configuration.h

@@ -7,6 +7,7 @@
 #include "srsran/du_high/du_high_executor_mapper.h"
 #include "srsran/e2/e2.h"
 #include "srsran/e2/e2_connection_client.h"
+#include "srsran/e2/e2_du_metrics_manager.h"
 #include "srsran/e2/e2ap_configuration.h"
 #include "srsran/f1ap/du/f1ap_du.h"
 #include "srsran/f1ap/du/f1c_connection_client.h"
@@ -27,13 +28,14 @@ class f1u_du_gateway;
 
 /// Configuration passed to DU-High.
 struct du_high_configuration {
-  du_high_executor_mapper*           exec_mapper      = nullptr;
-  f1c_connection_client*             f1c_client       = nullptr;
-  f1u_du_gateway*                    f1u_gw           = nullptr;
-  mac_result_notifier*               phy_adapter      = nullptr;
-  timer_manager*                     timers           = nullptr;
-  scheduler_ue_metrics_notifier*     metrics_notifier = nullptr;
-  e2_connection_client*              e2_client        = nullptr;
+  du_high_executor_mapper*           exec_mapper          = nullptr;
+  f1c_connection_client*             f1c_client           = nullptr;
+  f1u_du_gateway*                    f1u_gw               = nullptr;
+  mac_result_notifier*               phy_adapter          = nullptr;
+  timer_manager*                     timers               = nullptr;
+  scheduler_ue_metrics_notifier*     metrics_notifier     = nullptr;
+  e2_connection_client*              e2_client            = nullptr;
+  e2_du_metrics_manager*             e2_du_metric_manager = nullptr;
   std::string                        gnb_du_name;
   uint64_t                           gnb_du_id;
   transport_layer_address            du_bind_addr;

lib/du_high/du_high_impl.cpp

@@ -126,11 +126,10 @@ du_high_impl::du_high_impl(const du_high_configuration& config_) :
   main_cell_slot_handler = std::make_unique<du_high_slot_handler>(timers, *mac, cfg.exec_mapper->du_timer_executor());
 
   if (cfg.e2_client) {
-    e2_metric_manager = std::make_unique<e2_du_metrics_manager>();
     // todo: subscribe e2_metric_manager to a metric hub (currently not present)
     e2ap_entity = create_e2_entity(cfg.e2ap_config,
                                    cfg.e2_client,
-                                   *e2_metric_manager,
+                                   *cfg.e2_du_metric_manager,
                                    timer_factory{timers, cfg.exec_mapper->du_e2_executor()},
                                    cfg.exec_mapper->du_e2_executor());
   }

lib/du_high/du_high_impl.h

@@ -55,6 +55,7 @@ class du_high_impl final : public du_high
   // Connection between DU-high layers.
   std::unique_ptr<layer_connector> adapters;
 
+  std::unique_ptr<scheduler_ue_metrics_notifier> hub_metrics;
   std::unique_ptr<scheduler_ue_metrics_notifier> metrics_notifier;
 
   // DU-high Layers.

lib/e2/e2sm/e2sm_kpm_impl.cpp

@@ -97,7 +97,8 @@ void e2sm_kpm_impl::handle_action_definition_format1(asn1::e2sm_kpm::e2_sm_kpm_i
   // Set the granularity period (TODO: disable as currently not supported in flexric)
   ric_ind_message.ind_msg_formats.ind_msg_format1().granul_period_present = false;
   // ric_ind_message.ind_msg_formats.ind_msg_format2().granul_period         = action_def.granul_period;
-
+  scheduler_ue_metrics ue_metrics = {};
+  du_metrics_interface.get_metrics(ue_metrics);
   // Fill indication msg
   auto& meas_info_list = action_def.meas_info_list;
   for (auto& meas_info : meas_info_list) {
@@ -112,7 +113,7 @@ void e2sm_kpm_impl::handle_action_definition_format1(asn1::e2sm_kpm::e2_sm_kpm_i
 
       meas_data_item_s   meas_data_item;
       meas_record_item_c meas_record_item;
-      meas_record_item.set_integer() = 123;
+      meas_record_item.set_integer() = (int)ue_metrics.pusch_snr_db;
       meas_data_item.meas_record.push_back(meas_record_item);
       ric_ind_message.ind_msg_formats.ind_msg_format1().meas_data.push_back(meas_data_item);
     }

lib/e2/procedures/e2_indication_procedure.cpp

@@ -43,6 +43,7 @@ void e2_indication_procedure::operator()(coro_context<eager_async_task<void>>& c
     }
     for (const auto& action : subscription.action_list) {
       e2_indication_message e2_ind                        = {};
+      e2_ind.indication->ri_cind_msg.crit                 = asn1::crit_opts::reject;
       e2_ind.request_id                                   = subscription.request_id;
       e2_ind.indication->ra_nfunction_id.value            = subscription.ran_function_id;
       e2_ind.indication->ri_caction_id.value              = action.ric_action_id;
@@ -82,5 +83,6 @@ void e2_indication_procedure::send_e2_indication(e2_indication_message& e2_ind)
   e2_msg.pdu.set_init_msg();
   e2_msg.pdu.init_msg().load_info_obj(ASN1_E2AP_ID_RI_CIND);
   e2_msg.pdu.init_msg().value.ri_cind() = e2_ind.indication;
+  e2_msg.pdu.init_msg().crit            = e2_ind.indication->ri_cind_msg.crit;
   notifier.on_new_message(e2_msg);
 }