du: move du srs res mng unittest to separate file

Signed-off-by: Carlo Galiotto <[email protected]>

Author: carlo-gal

lib/du/du_high/du_manager/ran_resource_management/du_ran_resource_manager_impl.cpp

@@ -38,7 +38,8 @@ du_ue_ran_resource_updater_impl::update(du_cell_index_t                       pc
 
 ///////////////////////////
 
-static void initialize_serv_cell_cfg(serving_cell_config& serv_cell_cfg)
+// Helper that resets the PUCCH and SRS configurations in the serving cell configuration.
+static void reset_serv_cell_cfg(serving_cell_config& serv_cell_cfg)
 {
   srsran_assert(serv_cell_cfg.ul_config.has_value() and
                     serv_cell_cfg.ul_config.value().init_ul_bwp.pucch_cfg.has_value() and
@@ -63,7 +64,7 @@ du_ran_resource_manager_impl::du_ran_resource_manager_impl(span<const du_cell_co
   test_cfg(test_cfg_),
   pucch_res_mng(cell_cfg_list, scheduler_cfg.ue.max_pucchs_per_slot),
   bearer_res_mng(srb_config, qos_config, logger),
-  srs_res_mng(std::make_unique<du_srs_policy_max_ul_th>(cell_cfg_list))
+  srs_res_mng(std::make_unique<du_srs_policy_max_ul_rate>(cell_cfg_list))
 {
 }
 
@@ -180,7 +181,7 @@ error_type<std::string> du_ran_resource_manager_impl::allocate_cell_resources(du
 
     // Start with removing PUCCH and SRS configurations. This step simplifies the handling of the allocation failure
     // path.
-    initialize_serv_cell_cfg(ue_res.cell_group.cells[0].serv_cell_cfg);
+    reset_serv_cell_cfg(ue_res.cell_group.cells[0].serv_cell_cfg);
 
     if (not srs_res_mng->alloc_resources(ue_res.cell_group)) {
       // Deallocate dedicated Search Spaces.

lib/du/du_high/du_manager/ran_resource_management/du_srs_resource_manager.cpp

@@ -114,10 +114,10 @@ static srs_config build_default_srs_cfg(const du_cell_config& default_cell_cfg)
   return srs_cfg;
 }
 
-du_srs_policy_max_ul_th::cell_context::cell_context(const du_cell_config& cfg) :
+du_srs_policy_max_ul_rate::cell_context::cell_context(const du_cell_config& cfg) :
   cell_cfg(cfg), default_srs_cfg(build_default_srs_cfg(cfg)){};
 
-du_srs_policy_max_ul_th::du_srs_policy_max_ul_th(span<const du_cell_config> cell_cfg_list_) :
+du_srs_policy_max_ul_rate::du_srs_policy_max_ul_rate(span<const du_cell_config> cell_cfg_list_) :
   cells(cell_cfg_list_.begin(), cell_cfg_list_.end())
 {
   for (auto& cell : cells) {
@@ -140,14 +140,14 @@ du_srs_policy_max_ul_th::du_srs_policy_max_ul_th(span<const du_cell_config> cell
     const auto srs_period_slots = static_cast<unsigned>(cell.cell_cfg.srs_cfg.srs_period.value());
     // Reserve the size of the vector and set the SRS counter of each offset to 0.
     cell.slot_resource_cnt.assign(srs_period_slots, 0U);
-    cell.srs_res_offset_free_list.reserve(du_srs_policy_max_ul_th::cell_context::max_nof_srs_res);
+    cell.srs_res_offset_free_list.reserve(du_srs_policy_max_ul_rate::cell_context::max_nof_srs_res);
     cell.nof_res_per_symb_interval = static_cast<unsigned>(cell.cell_cfg.srs_cfg.tx_comb) *
                                      static_cast<unsigned>(cell.cell_cfg.srs_cfg.cyclic_shift_reuse_factor) *
                                      static_cast<unsigned>(cell.cell_cfg.srs_cfg.sequence_id_reuse_factor);
 
     for (unsigned offset = 0; offset != srs_period_slots; ++offset) {
       // We don't generate more than the maximum number of SRS resources per cell.
-      if (cell.srs_res_offset_free_list.size() >= du_srs_policy_max_ul_th::cell_context::max_nof_srs_res) {
+      if (cell.srs_res_offset_free_list.size() >= du_srs_policy_max_ul_rate::cell_context::max_nof_srs_res) {
         break;
       }
 
@@ -195,7 +195,7 @@ du_srs_policy_max_ul_th::du_srs_policy_max_ul_th(span<const du_cell_config> cell
   }
 }
 
-bool du_srs_policy_max_ul_th::alloc_resources(cell_group_config& cell_grp_cfg)
+bool du_srs_policy_max_ul_rate::alloc_resources(cell_group_config& cell_grp_cfg)
 {
   // TODO: Adapt this to the case of UEs with multiple cells configs.
   srsran_assert(
@@ -288,7 +288,7 @@ bool du_srs_policy_max_ul_th::alloc_resources(cell_group_config& cell_grp_cfg)
 }
 
 std::vector<std::pair<unsigned, unsigned>>::const_iterator
-du_srs_policy_max_ul_th::cell_context::find_optimal_ue_srs_resource()
+du_srs_policy_max_ul_rate::cell_context::find_optimal_ue_srs_resource()
 {
   // The weights assigned here can be set to arbitrarily value, as long as:
   // - symbol_weight_base is greater than 0;
@@ -336,7 +336,7 @@ du_srs_policy_max_ul_th::cell_context::find_optimal_ue_srs_resource()
   return optimal_res_it;
 }
 
-void du_srs_policy_max_ul_th::dealloc_resources(cell_group_config& cell_grp_cfg)
+void du_srs_policy_max_ul_rate::dealloc_resources(cell_group_config& cell_grp_cfg)
 {
   if (not cells[0].cell_cfg.srs_cfg.srs_period.has_value() or
       not cell_grp_cfg.cells[0].serv_cell_cfg.ul_config->init_ul_bwp.srs_cfg.has_value()) {

lib/du/du_high/du_manager/ran_resource_management/du_srs_resource_manager.h

@@ -40,10 +40,10 @@ class du_srs_resource_manager
 /// objective to minimize the number of slots and symbols that contain the SRS resources, to reduce as much as possible
 /// the slots and symbols resources taken from the PUSCH. The drawback of this policy is that it can increase the
 /// inter-slot SRS interference among different UEs.
-class du_srs_policy_max_ul_th : public du_srs_resource_manager
+class du_srs_policy_max_ul_rate : public du_srs_resource_manager
 {
 public:
-  explicit du_srs_policy_max_ul_th(span<const du_cell_config> cell_cfg_list_);
+  explicit du_srs_policy_max_ul_rate(span<const du_cell_config> cell_cfg_list_);
 
   /// The SRS resources are allocate according to the following policy:
   /// - Give priority to resources that are placed on partially-UL slots, first.

tests/unittests/du_manager/CMakeLists.txt

@@ -77,4 +77,9 @@ gtest_discover_tests(pucch_resource_generator_test)
 add_executable(srs_resource_generator_test srs_resource_generator_test.cpp)
 target_include_directories(srs_resource_generator_test PRIVATE ${CMAKE_SOURCE_DIR})
 target_link_libraries(srs_resource_generator_test du_manager_test_helpers gtest gtest_main)
-gtest_discover_tests(srs_resource_generator_test)
+gtest_discover_tests(srs_resource_generator_test)
+
+add_executable(du_srs_resource_manager_test du_srs_resource_manager_test.cpp)
+target_include_directories(du_srs_resource_manager_test PRIVATE ${CMAKE_SOURCE_DIR})
+target_link_libraries(du_srs_resource_manager_test du_manager_test_helpers gtest gtest_main)
+gtest_discover_tests(du_srs_resource_manager_test)

tests/unittests/du_manager/du_ran_resource_manager_test.cpp

@@ -1058,7 +1058,7 @@ class du_srs_resource_manager_tester : public ::testing::TestWithParam<srs_param
   std::vector<du_cell_config> cell_cfg_list;
   // This is a reference to the first element of cell_cfg_list's SRS config.
   const srs_builder_params&                        srs_params;
-  du_srs_policy_max_ul_th                          du_srs_res_mng;
+  du_srs_policy_max_ul_rate                        du_srs_res_mng;
   slotted_array<cell_group_config, MAX_NOF_DU_UES> ues;
 };