gnb: add function to convert appconfig to DU SRB configuration

Author: frankist

apps/gnb/gnb_appconfig_translators.cpp

@@ -991,6 +991,15 @@ std::map<five_qi_t, du_qos_config> srsran::generate_du_qos_config(const gnb_appc
   return out_cfg;
 }
 
+std::map<srb_id_t, du_srb_config> srsran::generate_du_srb_config(const gnb_appconfig& config)
+{
+  std::map<srb_id_t, du_srb_config> srb_cfg;
+
+  // TODO: Set SRB parameters based on the gNB appconfig.
+
+  return srb_cfg;
+}
+
 /// Fills the given low PHY configuration from the given gnb configuration.
 static void generate_low_phy_config(lower_phy_configuration&           out_cfg,
                                     const cell_appconfig&              config,

apps/gnb/gnb_appconfig_translators.h

@@ -14,6 +14,7 @@
 #include "srsran/cu_up/cu_up_configuration.h"
 #include "srsran/du/du_cell_config.h"
 #include "srsran/du/du_qos_config.h"
+#include "srsran/du/du_srb_config.h"
 #include "srsran/e2/e2ap_configuration.h"
 #include "srsran/gateways/sctp_network_gateway.h"
 #include "srsran/mac/mac_config.h"
@@ -60,9 +61,12 @@ generate_preferred_integrity_algorithms_list(const gnb_appconfig& config);
 srsran::security::preferred_ciphering_algorithms
 generate_preferred_ciphering_algorithms_list(const gnb_appconfig& config);
 
-/// Converts and returns the given gnb application QoS configuration to a DU configuration.
+/// Converts and returns the given gnb application QoS configuration to a DU QoS list configuration.
 std::map<five_qi_t, du_qos_config> generate_du_qos_config(const gnb_appconfig& config);
 
+/// Converts and returns the given gnb application QoS configuration to a DU SRB list configuration.
+std::map<srb_id_t, du_srb_config> generate_du_srb_config(const gnb_appconfig& config);
+
 /// Converts and returns the given gnb application configuration to a mac expert configuration.
 mac_expert_config generate_mac_expert_config(const gnb_appconfig& config);
 

apps/gnb/gnb_du_factory.cpp

@@ -126,9 +126,6 @@ std::vector<std::unique_ptr<du>> srsran::make_gnb_dus(const gnb_appconfig&
     tmp_cfg.cells_cfg.resize(1);
     tmp_cfg.cells_cfg[0] = gnb_cfg.cells_cfg[i];
 
-    // DU QoS config
-    std::map<five_qi_t, du_qos_config> du_qos_cfg = generate_du_qos_config(gnb_cfg);
-
     du_config                   du_cfg = {};
     std::vector<task_executor*> du_low_dl_exec;
     workers.get_du_low_dl_executors(du_low_dl_exec, i);
@@ -151,7 +148,8 @@ std::vector<std::unique_ptr<du>> srsran::make_gnb_dus(const gnb_appconfig&
     du_hi_cfg.phy_adapter                    = nullptr;
     du_hi_cfg.timers                         = &timer_mng;
     du_hi_cfg.cells                          = {du_cells[i]};
-    du_hi_cfg.qos                            = du_qos_cfg;
+    du_hi_cfg.srbs                           = generate_du_srb_config(gnb_cfg);
+    du_hi_cfg.qos                            = generate_du_qos_config(gnb_cfg);
     du_hi_cfg.mac_p                          = &mac_p;
     du_hi_cfg.rlc_p                          = &rlc_p;
     du_hi_cfg.gnb_du_id                      = du_insts.size() + 1;