sched: add PUCCH res manager unittest for 2 SRs

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

Author: carlo-gal

tests/unittests/scheduler/test_utils/config_generators.h

@@ -201,7 +201,12 @@ inline uplink_config make_test_ue_uplink_config(const cell_config_builder_params
   pucch_resource& res10 = pucch_cfg.pucch_res_list.back();
   res10.res_id          = 10;
   res10.starting_prb    = 0;
-  res10.second_hop_prb  = nof_rbs - 1;
+
+  // >>> PUCCH resource 11.
+  pucch_cfg.pucch_res_list.push_back(res_basic);
+  pucch_resource& res11 = pucch_cfg.pucch_res_list.back();
+  res11.res_id          = 11;
+  res11.starting_prb    = nof_rbs - 3;
 
   // TODO: add more PUCCH resources.
 

tests/unittests/scheduler/uci_and_pucch/pucch_allocator_test.cpp

@@ -60,7 +60,7 @@ struct pucch_test_parameters {
 static expected_output_params_f1 make_expected_output_params_sr_only()
 {
   return expected_output_params_f1{.format               = pucch_format::FORMAT_1,
-                                   .prbs                 = prb_interval{0, 1},
+                                   .prbs                 = prb_interval{NOF_RBS - 3, NOF_RBS - 2},
                                    .second_hop_prbs      = prb_interval{0, 0},
                                    .symbols              = ofdm_symbol_range{0, 14},
                                    .intra_slot_freq_hop  = false,

tests/unittests/scheduler/uci_and_pucch/pucch_res_manager_test.cpp

@@ -38,14 +38,19 @@ class test_pucch_resource_manager : public ::testing::Test
     pucch_cfg{ue_cell_cfg.cfg_dedicated().ul_config.value().init_ul_bwp.pucch_cfg.value()},
     sl_tx(slot_point(0, 0))
   {
+    uplink_config ul_cfg = test_helpers::make_test_ue_uplink_config(cell_config_builder_params{});
+    ul_cfg.init_ul_bwp.pucch_cfg.value().sr_res_list.front().pucch_res_id = 10;
+    pucch_cfg_ue_2                                                        = ul_cfg.init_ul_bwp.pucch_cfg.value();
     res_manager.slot_indication(sl_tx);
   };
 
 protected:
   cell_configuration    cell_cfg;
   ue_cell_configuration ue_cell_cfg;
   // Helper variable.
-  const pucch_config&    pucch_cfg;
+  const pucch_config& pucch_cfg;
+  // Config with alternative configuration for SR using PUCCH resource idx 10.
+  pucch_config           pucch_cfg_ue_2;
   pucch_resource_manager res_manager;
   slot_point             sl_tx;
 
@@ -366,13 +371,32 @@ TEST_F(test_pucch_resource_manager, test_allocation_release_sr_resource)
   // Release resource and verify it was successful.
   ASSERT_TRUE(res_manager.release_sr_resource(sl_tx, to_rnti(0x4601)));
 
-  // Assigne a different UE and verify it is assigned a resource.
+  // Allocate SR to another UE and verify it is assigned a resource.
   const pucch_resource* sr_resource_ue2 = res_manager.reserve_sr_res_available(sl_tx, to_rnti(0x4602), pucch_cfg);
   ASSERT_FALSE(nullptr == sr_resource_ue2);
   unsigned sr_pucch_res_idx = pucch_cfg.pucch_res_list.size() - 1;
   ASSERT_EQ(&pucch_cfg.pucch_res_list[sr_pucch_res_idx], sr_resource_ue2);
 }
 
+// Tests SRs for 2 UEs using different PUCCH resource indices.
+TEST_F(test_pucch_resource_manager, test_allocation_2_sr_resource)
+{
+  res_manager.reserve_sr_res_available(sl_tx, to_rnti(0x4601), pucch_cfg);
+  res_manager.reserve_sr_res_available(sl_tx, to_rnti(0x4602), pucch_cfg_ue_2);
+
+  // Attempt to allocate UEs over already used SR resources.
+  ASSERT_EQ(nullptr, res_manager.reserve_sr_res_available(sl_tx, to_rnti(0x4603), pucch_cfg));
+  ASSERT_EQ(nullptr, res_manager.reserve_sr_res_available(sl_tx, to_rnti(0x4604), pucch_cfg_ue_2));
+
+  // Release resource and verify it was successful.
+  ASSERT_TRUE(res_manager.release_sr_resource(sl_tx, to_rnti(0x4601)));
+  ASSERT_TRUE(res_manager.release_sr_resource(sl_tx, to_rnti(0x4602)));
+
+  // Attempt to allocate UEs over released SR resources.
+  ASSERT_NE(nullptr, res_manager.reserve_sr_res_available(sl_tx, to_rnti(0x4603), pucch_cfg));
+  ASSERT_NE(nullptr, res_manager.reserve_sr_res_available(sl_tx, to_rnti(0x4604), pucch_cfg_ue_2));
+}
+
 int main(int argc, char** argv)
 {
   srslog::fetch_basic_logger("TEST").set_level(srslog::basic_levels::info);

tests/unittests/scheduler/uci_and_pucch/uci_scheduling_test.cpp

@@ -53,7 +53,7 @@ class test_pucch_output_sr_only : public ::testing::TestWithParam<sr_periodicity
     pucch_expected.crnti   = to_rnti(0x4601);
     pucch_expected.bwp_cfg = &t_bench.cell_cfg.ul_cfg_common.init_ul_bwp.generic_params;
 
-    pucch_expected.resources.prbs            = prb_interval{0, 1};
+    pucch_expected.resources.prbs            = prb_interval{49, 50};
     pucch_expected.resources.second_hop_prbs = prb_interval{0, 0};
     pucch_expected.resources.symbols         = ofdm_symbol_range{0, 14};
 
@@ -132,7 +132,7 @@ class test_pucch_output_sr_harq : public ::testing::TestWithParam<sr_periodicity
     pucch_expected.crnti   = to_rnti(0x4601);
     pucch_expected.bwp_cfg = &t_bench.cell_cfg.ul_cfg_common.init_ul_bwp.generic_params;
 
-    pucch_expected.resources.prbs            = prb_interval{0, 1};
+    pucch_expected.resources.prbs            = prb_interval{49, 50};
     pucch_expected.resources.second_hop_prbs = prb_interval{0, 0};
     pucch_expected.resources.symbols         = ofdm_symbol_range{0, 14};