app: make gnb-DU id configurable

Author: frankist

apps/units/flexible_du/du_high/du_high_config.h

@@ -16,6 +16,7 @@
 #include "srsran/ran/bs_channel_bandwidth.h"
 #include "srsran/ran/direct_current_offset.h"
 #include "srsran/ran/five_qi.h"
+#include "srsran/ran/gnb_du_id.h"
 #include "srsran/ran/gnb_id.h"
 #include "srsran/ran/lcid.h"
 #include "srsran/ran/ntn.h"
@@ -723,6 +724,8 @@ struct du_high_unit_config {
   gnb_id_t gnb_id = {411, 22};
   /// Node name.
   std::string ran_node_name = "srsgnb01";
+  /// DU identifier.
+  gnb_du_id_t gnb_du_id = gnb_du_id_t::min;
   /// PCAPs.
   du_high_unit_pcap_config pcaps;
   /// Metrics.

apps/units/flexible_du/du_high/du_high_config_cli11_schema.cpp

@@ -1397,6 +1397,9 @@ void srsran::configure_cli11_with_du_high_config_schema(CLI::App& app, du_high_p
       ->capture_default_str()
       ->check(CLI::Range(22, 32));
   add_option(app, "--ran_node_name", parsed_cfg.config.ran_node_name, "RAN node name")->capture_default_str();
+  add_option(app, "--gnb_du_id", parsed_cfg.config.gnb_du_id, "gNB-DU Id")
+      ->capture_default_str()
+      ->check(CLI::Range(static_cast<uint64_t>(0U), static_cast<uint64_t>(pow(2, 36) - 1)));
 
   // Loggers section.
   CLI::App* log_subcmd = add_subcommand(app, "log", "Logging configuration")->configurable();

apps/units/flexible_du/du_high/du_high_wrapper_config_helper.cpp

@@ -60,7 +60,7 @@ void srsran::configure_du_high_metrics(const du_high_unit_config&   du_high_unit
 
 void srsran::fill_du_high_wrapper_config(du_high_wrapper_config&        out_cfg,
                                          const du_high_unit_config&     du_high_unit_cfg,
-                                         unsigned                       du_id,
+                                         unsigned                       du_idx,
                                          du_high_executor_mapper&       execution_mapper,
                                          srs_du::f1c_connection_client& f1c_client_handler,
                                          srs_du::f1u_du_gateway&        f1u_gw,
@@ -85,19 +85,19 @@ void srsran::fill_du_high_wrapper_config(du_high_wrapper_config&        out_cfg,
   du_hi_cfg.qos                            = generate_du_qos_config(du_high_unit_cfg);
   du_hi_cfg.mac_p                          = &mac_p;
   du_hi_cfg.rlc_p                          = &rlc_p;
-  du_hi_cfg.gnb_du_id                      = du_id + 1;
+  du_hi_cfg.gnb_du_id                      = (gnb_du_id_t)((unsigned)du_high_unit_cfg.gnb_du_id + du_idx);
   du_hi_cfg.gnb_du_name                    = fmt::format("srsdu{}", du_hi_cfg.gnb_du_id);
   du_hi_cfg.du_bind_addr = transport_layer_address::create_from_string(du_high_unit_cfg.f1u_bind_address);
   du_hi_cfg.mac_cfg      = generate_mac_expert_config(du_high_unit_cfg);
   // Assign different initial C-RNTIs to different DUs.
-  du_hi_cfg.mac_cfg.initial_crnti     = to_rnti(0x4601 + (0x1000 * du_id));
-  du_hi_cfg.sched_ue_metrics_notifier = metrics_hub.get_scheduler_ue_metrics_source("DU " + std::to_string(du_id));
+  du_hi_cfg.mac_cfg.initial_crnti     = to_rnti(0x4601 + (0x1000 * du_idx));
+  du_hi_cfg.sched_ue_metrics_notifier = metrics_hub.get_scheduler_ue_metrics_source("DU " + std::to_string(du_idx));
   du_hi_cfg.sched_cfg                 = generate_scheduler_expert_config(du_high_unit_cfg);
 
   // Connect RLC metrics to sinks, if required
   if (du_high_unit_cfg.metrics.rlc.json_enabled || du_high_unit_cfg.e2_cfg.enable_du_e2) {
     // This source aggregates the RLC metrics from all DRBs in a single DU.
-    std::string source_name = "rlc_metric_aggr_du_" + std::to_string(du_id);
+    std::string source_name = "rlc_metric_aggr_du_" + std::to_string(du_idx);
     auto        rlc_source  = std::make_unique<rlc_metrics_source>(source_name);
 
     if (du_high_unit_cfg.metrics.rlc.json_enabled) {
@@ -111,8 +111,8 @@ void srsran::fill_du_high_wrapper_config(du_high_wrapper_config&        out_cfg,
       // Connect E2 agent to RLC metric source.
       du_hi_cfg.e2_client          = &e2_client_handler;
       du_hi_cfg.e2ap_config        = generate_e2_config(du_high_unit_cfg);
-      du_hi_cfg.e2_du_metric_iface = &(e2_metric_connectors.get_e2_du_metrics_interface(du_id));
-      rlc_source->add_subscriber(e2_metric_connectors.get_e2_du_metric_notifier(du_id));
+      du_hi_cfg.e2_du_metric_iface = &(e2_metric_connectors.get_e2_du_metrics_interface(du_idx));
+      rlc_source->add_subscriber(e2_metric_connectors.get_e2_du_metric_notifier(du_idx));
     }
     // Pass RLC metric source to the DU high.
     metrics_hub.add_source(std::move(rlc_source));

include/srsran/du_high/du_high_configuration.h

@@ -15,6 +15,7 @@
 #include "srsran/mac/mac_config.h"
 #include "srsran/pcap/dlt_pcap.h"
 #include "srsran/pcap/rlc_pcap.h"
+#include "srsran/ran/gnb_du_id.h"
 #include "srsran/rlc/rlc_metrics.h"
 #include "srsran/scheduler/config/scheduler_expert_config.h"
 #include "srsran/scheduler/scheduler_metrics.h"
@@ -40,7 +41,7 @@ struct du_high_configuration {
   e2_connection_client*              e2_client                 = nullptr;
   e2_du_metrics_interface*           e2_du_metric_iface        = nullptr;
   std::string                        gnb_du_name;
-  uint64_t                           gnb_du_id;
+  gnb_du_id_t                        gnb_du_id;
   transport_layer_address            du_bind_addr;
   std::vector<du_cell_config>        cells;
   std::map<srb_id_t, du_srb_config>  srbs;

include/srsran/du_manager/du_manager_params.h

@@ -19,6 +19,7 @@
 #include "srsran/f1u/du/f1u_gateway.h"
 #include "srsran/mac/mac.h"
 #include "srsran/pcap/rlc_pcap.h"
+#include "srsran/ran/gnb_du_id.h"
 #include "srsran/rlc/rlc_metrics.h"
 #include "srsran/scheduler/config/scheduler_expert_config.h"
 #include <map>
@@ -32,7 +33,7 @@ namespace srs_du {
 struct du_manager_params {
   struct ran_params {
     std::string                        gnb_du_name;
-    uint64_t                           gnb_du_id;
+    gnb_du_id_t                        gnb_du_id;
     uint8_t                            rrc_version;
     transport_layer_address            du_bind_addr;
     std::vector<du_cell_config>        cells;

include/srsran/f1ap/du/f1ap_du_connection_manager.h

@@ -13,6 +13,7 @@
 #include "srsran/adt/byte_buffer.h"
 #include "srsran/ran/carrier_configuration.h"
 #include "srsran/ran/duplex_mode.h"
+#include "srsran/ran/gnb_du_id.h"
 #include "srsran/ran/nr_cgi.h"
 #include "srsran/ran/pci.h"
 #include "srsran/support/async/async_task.h"
@@ -36,7 +37,7 @@ struct f1_cell_setup_params {
 
 /// \brief Message that initiates a F1 Setup procedure.
 struct f1_setup_request_message {
-  uint64_t                          gnb_du_id;
+  gnb_du_id_t                       gnb_du_id;
   std::string                       gnb_du_name;
   uint8_t                           rrc_version;
   std::vector<f1_cell_setup_params> served_cells;

include/srsran/rlc/rlc_factory.h

@@ -11,6 +11,7 @@
 #pragma once
 
 #include "srsran/pcap/rlc_pcap.h"
+#include "srsran/ran/gnb_du_id.h"
 #include "srsran/rlc/rlc_config.h"
 #include "srsran/rlc/rlc_entity.h"
 #include "srsran/rlc/rlc_rx.h"
@@ -22,7 +23,7 @@
 namespace srsran {
 
 struct rlc_entity_creation_message {
-  uint32_t                             du_index;
+  gnb_du_id_t                          gnb_du_id;
   du_ue_index_t                        ue_index;
   rb_id_t                              rb_id;
   rlc_config                           config;

lib/du_manager/converters/rlc_config_helpers.cpp

@@ -15,15 +15,15 @@ using namespace srs_du;
 
 template <typename Bearer>
 static void fill_rlc_entity_creation_message_common(rlc_entity_creation_message&             msg,
-                                                    uint32_t                                 du_index,
+                                                    gnb_du_id_t                              du_id,
                                                     du_ue_index_t                            ue_index,
                                                     du_cell_index_t                          pcell_index,
                                                     Bearer&                                  bearer,
                                                     const du_manager_params::service_params& du_services,
                                                     rlc_tx_upper_layer_control_notifier&     rlc_rlf_notifier,
                                                     rlc_pcap&                                pcap_writer)
 {
-  msg.du_index       = du_index;
+  msg.gnb_du_id      = du_id;
   msg.ue_index       = ue_index;
   msg.config         = bearer.rlc_cfg;
   msg.rx_upper_dn    = &bearer.connector.rlc_rx_sdu_notif;
@@ -38,7 +38,7 @@ static void fill_rlc_entity_creation_message_common(rlc_entity_creation_message&
 
 // for SRBs
 rlc_entity_creation_message
-srsran::srs_du::make_rlc_entity_creation_message(uint32_t                                 du_index,
+srsran::srs_du::make_rlc_entity_creation_message(gnb_du_id_t                              gnb_du_id,
                                                  du_ue_index_t                            ue_index,
                                                  du_cell_index_t                          pcell_index,
                                                  du_ue_srb&                               bearer,
@@ -48,14 +48,14 @@ srsran::srs_du::make_rlc_entity_creation_message(uint32_t
 {
   rlc_entity_creation_message msg;
   fill_rlc_entity_creation_message_common(
-      msg, du_index, ue_index, pcell_index, bearer, du_services, rlc_rlf_notifier, pcap_writer);
+      msg, gnb_du_id, ue_index, pcell_index, bearer, du_services, rlc_rlf_notifier, pcap_writer);
   msg.rb_id = bearer.srb_id;
   return msg;
 }
 
 // for DRBs
 rlc_entity_creation_message
-srsran::srs_du::make_rlc_entity_creation_message(uint32_t                                 du_index,
+srsran::srs_du::make_rlc_entity_creation_message(gnb_du_id_t                              gnb_du_id,
                                                  du_ue_index_t                            ue_index,
                                                  du_cell_index_t                          pcell_index,
                                                  du_ue_drb&                               bearer,
@@ -66,7 +66,7 @@ srsran::srs_du::make_rlc_entity_creation_message(uint32_t
 {
   rlc_entity_creation_message msg;
   fill_rlc_entity_creation_message_common(
-      msg, du_index, ue_index, pcell_index, bearer, du_services, rlc_rlf_notifier, pcap_writer);
+      msg, gnb_du_id, ue_index, pcell_index, bearer, du_services, rlc_rlf_notifier, pcap_writer);
   msg.rb_id             = bearer.drb_id;
   msg.rlc_metrics_notif = rlc_metrics_notifier_;
   return msg;

lib/du_manager/converters/rlc_config_helpers.h

@@ -36,7 +36,7 @@ struct rlc_bearer_config {
 };
 
 /// \brief Create configuration for RLC SRB entity.
-rlc_entity_creation_message make_rlc_entity_creation_message(uint32_t                                 du_index,
+rlc_entity_creation_message make_rlc_entity_creation_message(gnb_du_id_t                              du_id,
                                                              du_ue_index_t                            ue_index,
                                                              du_cell_index_t                          pcell_index,
                                                              du_ue_srb&                               bearer,
@@ -45,7 +45,7 @@ rlc_entity_creation_message make_rlc_entity_creation_message(uint32_t
                                                              rlc_pcap&                                rlc_pcap);
 
 /// \brief Create configuration for RLC DRB entity.
-rlc_entity_creation_message make_rlc_entity_creation_message(uint32_t                                 du_index,
+rlc_entity_creation_message make_rlc_entity_creation_message(gnb_du_id_t                              du_id,
                                                              du_ue_index_t                            ue_index,
                                                              du_cell_index_t                          pcell_index,
                                                              du_ue_drb&                               bearer,

lib/f1ap/du/procedures/f1ap_du_setup_procedure.cpp

@@ -70,7 +70,7 @@ void f1ap_du_setup_procedure::operator()(coro_context<async_task<f1_setup_respon
 void f1ap_du_setup_procedure::send_f1_setup_request()
 {
   // Save the gNB-DU-Id before the F1 Setup is completed for the purpose of logging.
-  du_ctxt.du_id = int_to_gnb_du_id(request.gnb_du_id);
+  du_ctxt.du_id = request.gnb_du_id;
 
   f1ap_message msg = {};
   // set F1AP PDU contents
@@ -81,7 +81,7 @@ void f1ap_du_setup_procedure::send_f1_setup_request()
   setup_req->transaction_id = transaction.id();
 
   // DU-global parameters.
-  setup_req->gnb_du_id           = request.gnb_du_id;
+  setup_req->gnb_du_id           = static_cast<uint64_t>(request.gnb_du_id);
   setup_req->gnb_du_name_present = not request.gnb_du_name.empty();
   if (setup_req->gnb_du_name_present) {
     setup_req->gnb_du_name.from_string(request.gnb_du_name);
@@ -208,7 +208,7 @@ f1_setup_response_message f1ap_du_setup_procedure::create_f1_setup_result()
     res.success = true;
 
     // Update F1 DU Context (taking values from request).
-    du_ctxt.du_id       = int_to_gnb_du_id(request.gnb_du_id);
+    du_ctxt.du_id       = request.gnb_du_id;
     du_ctxt.gnb_du_name = request.gnb_du_name;
     du_ctxt.served_cells.resize(request.served_cells.size());
     for (unsigned i = 0; i != du_ctxt.served_cells.size(); ++i) {