du_high_unit: use min. and max. PRB ratios in slice scheduling configuration

Author: herlesupreeth

apps/units/flexible_du/du_high/du_high_config.h

@@ -489,10 +489,10 @@ struct du_high_unit_prach_config {
 
 /// Slice scheduling configuration for a cell.
 struct du_high_unit_cell_slice_sched_config {
-  /// Sets the minimum number of PRBs to be allocated to this group.
-  unsigned min_prb = 0;
-  /// Sets the maximum number of PRBs to be allocated to this group.
-  unsigned max_prb = MAX_NOF_PRBS;
+  /// Sets the minimum percentage of PRBs to be allocated to this group.
+  unsigned min_prb_policy_ratio = 0;
+  /// Sets the maximum percentage of PRBs to be allocated to this group.
+  unsigned max_prb_policy_ratio = 100;
 };
 
 /// Slice configuration for a cell.

apps/units/flexible_du/du_high/du_high_config_cli11_schema.cpp

@@ -1030,12 +1030,18 @@ static void configure_cli11_sib_args(CLI::App& app, du_high_unit_sib_config& sib
 static void configure_cli11_slicing_scheduling_args(CLI::App&                             app,
                                                     du_high_unit_cell_slice_sched_config& slice_sched_params)
 {
-  add_option(app, "--min_prb", slice_sched_params.min_prb, "Minimum number of PRBs to be allocated to the slice")
+  add_option(app,
+             "--min_prb_policy_ratio",
+             slice_sched_params.min_prb_policy_ratio,
+             "Minimum percentage of PRBs to be allocated to the slice")
       ->capture_default_str()
-      ->check(CLI::Range(0U, (unsigned)MAX_NOF_PRBS));
-  add_option(app, "--max_prb", slice_sched_params.max_prb, "Maximum number of PRBs to be allocated to the slice")
+      ->check(CLI::Range(0U, 100U));
+  add_option(app,
+             "--max_prb_policy_ratio",
+             slice_sched_params.max_prb_policy_ratio,
+             "Maximum percentage of PRBs to be allocated to the slice")
       ->capture_default_str()
-      ->check(CLI::Range(1U, (unsigned)MAX_NOF_PRBS));
+      ->check(CLI::Range(1U, 100U));
 }
 
 static void configure_cli11_slicing_args(CLI::App& app, du_high_unit_cell_slice_config& slice_params)

apps/units/flexible_du/du_high/du_high_config_translators.cpp

@@ -604,7 +604,8 @@ std::vector<du_cell_config> srsran::generate_du_cell_config(const du_high_unit_c
     }
 
     // Slicing configuration.
-    out_cell.rrm_policy_members = generate_du_slicing_rrm_policy_config(base_cell.plmn, base_cell.slice_cfg);
+    std::vector<std::string> cell_plmns{base_cell.plmn};
+    out_cell.rrm_policy_members = generate_du_slicing_rrm_policy_config(cell_plmns, base_cell.slice_cfg, nof_crbs);
 
     logger.info(
         "SSB derived parameters for cell: {}, band: {}, dl_arfcn:{}, crbs: {} scs:{}, ssb_scs:{}:\n\t - SSB offset "
@@ -671,16 +672,19 @@ static mac_lc_config generate_mac_lc_config(const du_high_unit_mac_lc_config& in
 }
 
 std::vector<slice_rrm_policy_config>
-srsran::generate_du_slicing_rrm_policy_config(const std::string&                         plmn,
-                                              span<const du_high_unit_cell_slice_config> slice_cfg)
+srsran::generate_du_slicing_rrm_policy_config(span<const std::string>                    plmns,
+                                              span<const du_high_unit_cell_slice_config> slice_cfg,
+                                              unsigned                                   nof_cell_crbs)
 {
   std::vector<slice_rrm_policy_config> rrm_policy_cfgs;
-  for (const auto& cfg : slice_cfg) {
-    rrm_policy_cfgs.emplace_back();
-    rrm_policy_cfgs.back().rrc_member.s_nssai = cfg.s_nssai;
-    rrm_policy_cfgs.back().rrc_member.plmn_id = plmn;
-    rrm_policy_cfgs.back().min_prb            = cfg.sched_cfg.min_prb;
-    rrm_policy_cfgs.back().max_prb            = cfg.sched_cfg.max_prb;
+  for (const auto& plmn : plmns) {
+    for (const auto& cfg : slice_cfg) {
+      rrm_policy_cfgs.emplace_back();
+      rrm_policy_cfgs.back().rrc_member.s_nssai = cfg.s_nssai;
+      rrm_policy_cfgs.back().rrc_member.plmn_id = plmn;
+      rrm_policy_cfgs.back().min_prb            = (nof_cell_crbs * cfg.sched_cfg.min_prb_policy_ratio) / 100;
+      rrm_policy_cfgs.back().max_prb            = (nof_cell_crbs * cfg.sched_cfg.max_prb_policy_ratio) / 100;
+    }
   }
   return rrm_policy_cfgs;
 }

apps/units/flexible_du/du_high/du_high_config_translators.h

@@ -48,6 +48,8 @@ void ntn_augment_rlc_parameters(const ntn_config& ntn_cfg, std::map<srb_id_t, du
 
 /// Converts and returns the given gnb application configuration to a DU slice RRM policy configuration list.
 std::vector<slice_rrm_policy_config>
-generate_du_slicing_rrm_policy_config(const std::string& plmn, span<const du_high_unit_cell_slice_config> slice_cfg);
+generate_du_slicing_rrm_policy_config(span<const std::string>                    plmns,
+                                      span<const du_high_unit_cell_slice_config> slice_cfg,
+                                      unsigned                                   nof_cell_crbs);
 
 } // namespace srsran