sched,du_mgr: store list of k1 candidates in cell configuration

Author: herlesupreeth

include/srsran/scheduler/scheduler_configurator.h

@@ -92,6 +92,9 @@ struct sched_cell_configuration_request_message {
   /// List of nzp-CSI-RS resources common to all UEs.
   std::vector<nzp_csi_rs_resource> nzp_csi_rs_res_list;
 
+  /// List of dl-DataToUL-ACK values sent to UE in its dedicated configuration.
+  static_vector<uint8_t, 8> dl_data_to_ul_ack;
+
   /// List of RAN slices to support in the scheduler.
   std::vector<slice_rrm_policy_config> rrm_policy_members;
 

lib/du_manager/converters/scheduler_configuration_helpers.cpp

@@ -70,6 +70,11 @@ srsran::srs_du::make_sched_cell_config_req(du_cell_index_t          cell_index,
     sched_req.nzp_csi_rs_res_list = du_cfg.ue_ded_serv_cell_cfg.csi_meas_cfg->nzp_csi_rs_res_list;
   }
 
+  if (du_cfg.ue_ded_serv_cell_cfg.ul_config.has_value() and
+      du_cfg.ue_ded_serv_cell_cfg.ul_config->init_ul_bwp.pucch_cfg.has_value()) {
+    sched_req.dl_data_to_ul_ack = du_cfg.ue_ded_serv_cell_cfg.ul_config->init_ul_bwp.pucch_cfg->dl_data_to_ul_ack;
+  }
+
   sched_req.rrm_policy_members = du_cfg.rrm_policy_members;
 
   return sched_req;

lib/scheduler/config/cell_configuration.cpp

@@ -36,6 +36,7 @@ cell_configuration::cell_configuration(const scheduler_expert_config&
   pucch_guardbands(msg.pucch_guardbands),
   zp_csi_rs_list(msg.zp_csi_rs_list),
   nzp_csi_rs_list(msg.nzp_csi_rs_res_list),
+  dl_data_to_ul_ack(msg.dl_data_to_ul_ack),
   rrm_policy_members(msg.rrm_policy_members),
   // SSB derived params.
   ssb_case(band_helper::get_ssb_pattern(msg.dl_carrier.band, msg.ssb_config.scs)),

lib/scheduler/config/cell_configuration.h

@@ -55,6 +55,9 @@ class cell_configuration
   /// List of nzp-CSI-RS resources.
   std::vector<nzp_csi_rs_resource> nzp_csi_rs_list;
 
+  /// List of dl-DataToUL-ACK values sent to UE in its dedicated configuration.
+  static_vector<uint8_t, 8> dl_data_to_ul_ack;
+
   /// List of RRM Policy members configured for this cell.
   std::vector<slice_rrm_policy_config> rrm_policy_members;
 

tests/unittests/scheduler/test_utils/config_generators.h

@@ -68,6 +68,13 @@ make_default_sched_cell_configuration_request(const config_helpers::cell_config_
     sched_req.nzp_csi_rs_res_list = csi_meas.nzp_csi_rs_res_list;
   }
 
+  if (sched_req.tdd_ul_dl_cfg_common.has_value()) {
+    sched_req.dl_data_to_ul_ack =
+        config_helpers::generate_k1_candidates(*sched_req.tdd_ul_dl_cfg_common, params.min_k1);
+  } else {
+    sched_req.dl_data_to_ul_ack = {params.min_k1};
+  }
+
   return sched_req;
 }