du: add srb config to du high configuration

Author: frankist

include/srsran/du/du_qos_config.h

@@ -13,7 +13,6 @@
 #include "srsran/f1u/du/f1u_config.h"
 #include "srsran/mac/mac_lc_config.h"
 #include "srsran/rlc/rlc_config.h"
-#include <cstdint>
 
 namespace srsran {
 

include/srsran/du/du_srb_config.h

@@ -0,0 +1,24 @@
+/*
+ *
+ * Copyright 2021-2023 Software Radio Systems Limited
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the distribution.
+ *
+ */
+
+#pragma once
+
+#include "srsran/mac/mac_lc_config.h"
+#include "srsran/rlc/rlc_config.h"
+
+namespace srsran {
+
+/// \brief SRB Configuration, i.e. associated RLC and MAC configuration for SRBs in the DU
+struct du_srb_config {
+  rlc_config    rlc;
+  mac_lc_config mac;
+};
+
+} // namespace srsran

include/srsran/du_high/du_high_configuration.h

@@ -3,6 +3,7 @@
 
 #include "srsran/du/du_cell_config.h"
 #include "srsran/du/du_qos_config.h"
+#include "srsran/du/du_srb_config.h"
 #include "srsran/du/du_test_config.h"
 #include "srsran/du_high/du_high_executor_mapper.h"
 #include "srsran/e2/e2.h"
@@ -42,6 +43,7 @@ struct du_high_configuration {
   uint64_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;
   std::map<five_qi_t, du_qos_config> qos; // 5QI as key
   mac_expert_config                  mac_cfg;
   scheduler_expert_config            sched_cfg;

include/srsran/du_manager/du_manager_params.h

@@ -12,6 +12,7 @@
 
 #include "srsran/du/du_cell_config.h"
 #include "srsran/du/du_qos_config.h"
+#include "srsran/du/du_srb_config.h"
 #include "srsran/du/du_test_config.h"
 #include "srsran/du_high/du_high_executor_mapper.h"
 #include "srsran/f1ap/du/f1ap_du.h"
@@ -35,6 +36,7 @@ struct du_manager_params {
     uint8_t                            rrc_version;
     transport_layer_address            du_bind_addr;
     std::vector<du_cell_config>        cells;
+    std::map<srb_id_t, du_srb_config>  srbs;
     std::map<five_qi_t, du_qos_config> qos;
   };
   struct service_params {

lib/du_high/du_high_impl.cpp

@@ -112,7 +112,7 @@ du_high_impl::du_high_impl(const du_high_configuration& config_) :
                      cfg.exec_mapper->ue_mapper(),
                      adapters->f1ap_paging_notifier);
   du_manager = create_du_manager(du_manager_params{
-      {cfg.gnb_du_name, cfg.gnb_du_id, 1, cfg.du_bind_addr, cfg.cells, cfg.qos},
+      {cfg.gnb_du_name, cfg.gnb_du_id, 1, cfg.du_bind_addr, cfg.cells, cfg.srbs, cfg.qos},
       {timers, cfg.exec_mapper->du_control_executor(), cfg.exec_mapper->ue_mapper(), cfg.exec_mapper->cell_mapper()},
       {*f1ap, *f1ap},
       {*config_.f1u_gw},

lib/du_manager/du_manager_impl.cpp

@@ -22,7 +22,7 @@ du_manager_impl::du_manager_impl(const du_manager_params& params_) :
   params(params_),
   logger(srslog::fetch_basic_logger("DU-MNG")),
   cell_mng(params),
-  cell_res_alloc(params.ran.cells, params.ran.qos),
+  cell_res_alloc(params.ran.cells, params.ran.srbs, params.ran.qos),
   ue_mng(params, cell_res_alloc),
   main_ctrl_loop(128)
 {

lib/du_manager/ran_resource_management/du_ran_resource_manager_impl.cpp

@@ -63,8 +63,10 @@ du_ue_resource_update_response du_ue_ran_resource_updater_impl::update(du_cell_i
 ///////////////////////////
 
 du_ran_resource_manager_impl::du_ran_resource_manager_impl(span<const du_cell_config>                cell_cfg_list_,
+                                                           const std::map<srb_id_t, du_srb_config>&  srbs_,
                                                            const std::map<five_qi_t, du_qos_config>& qos_) :
   cell_cfg_list(cell_cfg_list_),
+  srb_config(srbs_),
   qos_config(qos_),
   logger(srslog::fetch_basic_logger("DU-MNG")),
   pucch_res_mng(cell_cfg_list)
@@ -130,10 +132,16 @@ du_ran_resource_manager_impl::update_context(du_ue_index_t
     // >> New or Modified SRB.
     lcid_t lcid = srb_id_to_lcid(srb_id);
     ue_mcg.rlc_bearers.emplace_back();
-    ue_mcg.rlc_bearers.back().lcid    = lcid;
-    ue_mcg.rlc_bearers.back().rlc_cfg = make_default_srb_rlc_config();
-    ue_mcg.rlc_bearers.back().mac_cfg = make_default_srb_mac_lc_config(lcid);
-    // TODO: Parameterize SRB config.
+    ue_mcg.rlc_bearers.back().lcid = lcid;
+
+    auto srb_it = srb_config.find(srb_id);
+    if (srb_it != srb_config.end()) {
+      ue_mcg.rlc_bearers.back().rlc_cfg = srb_it->second.rlc;
+      ue_mcg.rlc_bearers.back().mac_cfg = srb_it->second.mac;
+    } else {
+      ue_mcg.rlc_bearers.back().rlc_cfg = make_default_srb_rlc_config();
+      ue_mcg.rlc_bearers.back().mac_cfg = make_default_srb_mac_lc_config(lcid);
+    }
   }
   for (const f1ap_drb_to_setup& drb : upd_req.drbs_to_setup) {
     // >> New or Modified DRB.

lib/du_manager/ran_resource_management/du_ran_resource_manager_impl.h

@@ -46,6 +46,7 @@ class du_ran_resource_manager_impl : public du_ran_resource_manager
 {
 public:
   du_ran_resource_manager_impl(span<const du_cell_config>                cell_cfg_list_,
+                               const std::map<srb_id_t, du_srb_config>&  srbs,
                                const std::map<five_qi_t, du_qos_config>& qos);
   du_ran_resource_manager_impl(du_ran_resource_manager_impl&&)                 = delete;
   du_ran_resource_manager_impl(const du_ran_resource_manager_impl&)            = delete;
@@ -76,6 +77,7 @@ class du_ran_resource_manager_impl : public du_ran_resource_manager
   void deallocate_cell_resources(du_ue_index_t ue_index, serv_cell_index_t serv_cell_index);
 
   span<const du_cell_config>                cell_cfg_list;
+  const std::map<srb_id_t, du_srb_config>&  srb_config;
   const std::map<five_qi_t, du_qos_config>& qos_config;
   srslog::basic_logger&                     logger;
 

tests/unittests/du_manager/du_ran_resource_manager_test.cpp

@@ -29,7 +29,7 @@ class du_ran_resource_manager_tester : public ::testing::TestWithParam<params>
     cell_cfg_list({config_helpers::make_default_du_cell_config(params)}),
     qos_cfg_list(config_helpers::make_default_du_qos_config_list(1000)),
     default_ue_cell_cfg(config_helpers::create_default_initial_ue_serving_cell_config(params)),
-    res_mng(std::make_unique<du_ran_resource_manager_impl>(cell_cfg_list, qos_cfg_list))
+    res_mng(std::make_unique<du_ran_resource_manager_impl>(cell_cfg_list, srb_cfg_list, qos_cfg_list))
   {
   }
 
@@ -105,6 +105,7 @@ class du_ran_resource_manager_tester : public ::testing::TestWithParam<params>
   }
 
   std::vector<du_cell_config>                                 cell_cfg_list;
+  std::map<srb_id_t, du_srb_config>                           srb_cfg_list;
   std::map<five_qi_t, du_qos_config>                          qos_cfg_list;
   const serving_cell_config                                   default_ue_cell_cfg;
   std::unique_ptr<du_ran_resource_manager>                    res_mng;
@@ -254,7 +255,7 @@ class du_ran_res_mng_multiple_cfg_tester : public ::testing::TestWithParam<pucch
     cell_cfg_list({make_custom_du_cell_config(GetParam())}),
     qos_cfg_list(config_helpers::make_default_du_qos_config_list(1000)),
     default_ue_cell_cfg(config_helpers::create_default_initial_ue_serving_cell_config()),
-    res_mng(std::make_unique<du_ran_resource_manager_impl>(cell_cfg_list, qos_cfg_list))
+    res_mng(std::make_unique<du_ran_resource_manager_impl>(cell_cfg_list, srb_cfg_list, qos_cfg_list))
   {
     srsran_assert(default_ue_cell_cfg.csi_meas_cfg.has_value() and
                       not default_ue_cell_cfg.csi_meas_cfg.value().csi_report_cfg_list.empty() and
@@ -392,6 +393,7 @@ class du_ran_res_mng_multiple_cfg_tester : public ::testing::TestWithParam<pucch
   }
 
   std::vector<du_cell_config>                                            cell_cfg_list;
+  std::map<srb_id_t, du_srb_config>                                      srb_cfg_list;
   std::map<five_qi_t, du_qos_config>                                     qos_cfg_list;
   const serving_cell_config                                              default_ue_cell_cfg;
   srsran::csi_report_config::periodic_or_semi_persistent_report_on_pucch default_csi_pucch_res_cfg;