sched: extend NTN HARQ unit tests

Author: frankist

lib/scheduler/cell/cell_harq_manager.cpp

@@ -62,6 +62,18 @@ class base_ntn_harq_history
     }
   }
 
+  void handle_ack(harq_impl_type& h)
+  {
+    auto& hist_entry = history[get_offset_index(h.slot_ack)];
+    if (&h < hist_entry.data() or &h >= hist_entry.data() + hist_entry.size()) {
+      // Check if the HARQ Process being ACKed is the same as the one managed by the NTN history.
+      srsran_assertion_failure("ACK Info handled for a non-NTN HARQ process");
+      srslog::fetch_basic_logger("SCHED").error("ACK Info handled for a non-NTN HARQ process");
+      return;
+    }
+    h.status = harq_state_t::empty;
+  }
+
 protected:
   unsigned get_current_index(slot_point sl) const { return mod(sl.to_uint()); }
   unsigned get_offset_index(slot_point sl) const { return get_current_index(sl + ntn_cs_koffset); }
@@ -320,6 +332,7 @@ void cell_harq_repository<IsDl>::handle_ack(harq_type& h, bool ack)
 
   if (is_ntn_mode()) {
     // In NTN mode, ACK info does not affect the timeout/retx containers.
+    alloc_hist->handle_ack(h);
     return;
   }
 

lib/scheduler/cell/cell_harq_manager.h

@@ -402,7 +402,7 @@ class cell_harq_manager
                                unsigned      nof_dl_harq_procs = MAX_NOF_HARQS,
                                unsigned      nof_ul_harq_procs = MAX_NOF_HARQS);
 
-  /// Checks whether an UE with the provided ue index exists.
+  /// Checks whether a UE with the provided ue index exists.
   bool contains(du_ue_index_t ue_idx) const;
 
   /// Retrieve list of HARQ processes with pending retxs.

tests/unittests/scheduler/cell/cell_harq_manager_test.cpp

@@ -1064,4 +1064,24 @@ TEST_F(single_ntn_ue_harq_process_test, harq_history_is_reachable_after_timeout)
   ASSERT_EQ(h_ul.get_grant_params().tbs_bytes, pusch_info.tb_size_bytes);
 
   ASSERT_EQ(h_ul.get_grant_params().tbs_bytes, harq_ent.total_ul_bytes_waiting_crc());
+}
+
+TEST_F(single_ntn_ue_harq_process_test, when_harq_gets_acked_then_it_reports_the_correct_tbs)
+{
+  slot_point pusch_slot   = current_slot + k2;
+  slot_point uci_slot     = current_slot + k1;
+  slot_point slot_timeout = std::max(pusch_slot, uci_slot) + 1;
+  while (current_slot != slot_timeout) {
+    run_slot();
+  }
+
+  h_ul = harq_ent.find_ul_harq(pusch_slot).value();
+  ASSERT_EQ(harq_ent.total_ul_bytes_waiting_crc(), pusch_info.tb_size_bytes);
+  ASSERT_EQ(h_ul.ul_crc_info(true), pusch_info.tb_size_bytes);
+  ASSERT_EQ(harq_ent.total_ul_bytes_waiting_crc(), 0);
+
+  h_dl = harq_ent.find_dl_harq(uci_slot, 0).value();
+  ASSERT_EQ(h_dl.dl_ack_info(mac_harq_ack_report_status::ack, std::nullopt),
+            dl_harq_process_handle::status_update::acked);
+  ASSERT_EQ(h_dl.get_grant_params().tbs_bytes, pdsch_info.codewords[0].tb_size_bytes);
 }