cu_cp: extract rrc timers in unit tests from test message

Author: FabianEckermann

tests/unittests/cu_cp/cu_cp_initial_context_setup_test.cpp

@@ -273,8 +273,6 @@ class cu_cp_initial_context_setup_test : public cu_cp_test_environment, public :
   ngap_message ngap_pdu;
   f1ap_message f1ap_pdu;
   e1ap_message e1ap_pdu;
-
-  std::chrono::milliseconds rrc_procedure_extra_time{500};
 };
 
 TEST_F(cu_cp_initial_context_setup_test, when_ue_context_setup_fails_then_initial_context_setup_fails)

tests/unittests/cu_cp/cu_cp_pdu_session_resource_modify_test.cpp

@@ -279,15 +279,12 @@ class cu_cp_pdu_session_resource_modify_test : public cu_cp_test_environment, pu
     return true;
   }
 
-  std::chrono::milliseconds rrc_procedure_extra_time{500};
-  std::chrono::milliseconds t310{1000};
-  std::chrono::milliseconds t311{3000};
-
   [[nodiscard]] bool timeout_rrc_reconfiguration_and_await_pdu_session_modify_response()
   {
     // Fail RRC Reconfiguration (UE doesn't respond) and wait for PDU Session Resource Setup Response
     if (tick_until(
-            t310 + t311 + rrc_procedure_extra_time + this->get_cu_cp_cfg().rrc.rrc_procedure_guard_time_ms,
+            rrc_test_timer_values.t310 + rrc_test_timer_values.t311 + rrc_procedure_extra_time +
+                this->get_cu_cp_cfg().rrc.rrc_procedure_guard_time_ms,
             [&]() { return false; },
             false)) {
       return false;

tests/unittests/cu_cp/cu_cp_pdu_session_resource_setup_test.cpp

@@ -200,15 +200,12 @@ class cu_cp_pdu_session_resource_setup_test : public cu_cp_test_environment, pub
         pdu_sessions_failed_to_modify);
   }
 
-  std::chrono::milliseconds rrc_procedure_extra_time{500};
-  std::chrono::milliseconds t310{1000};
-  std::chrono::milliseconds t311{3000};
-
   [[nodiscard]] bool timeout_rrc_reconfiguration_and_await_pdu_session_setup_response()
   {
     // Fail RRC Reconfiguration (UE doesn't respond) and wait for PDU Session Resource Setup Response
     if (tick_until(
-            t310 + t311 + rrc_procedure_extra_time + this->get_cu_cp_cfg().rrc.rrc_procedure_guard_time_ms,
+            rrc_test_timer_values.t310 + rrc_test_timer_values.t311 + rrc_procedure_extra_time +
+                this->get_cu_cp_cfg().rrc.rrc_procedure_guard_time_ms,
             [&]() { return false; },
             false)) {
       return false;

tests/unittests/cu_cp/cu_cp_reestablishment_test.cpp

@@ -362,9 +362,6 @@ class cu_cp_reestablishment_test : public cu_cp_test_environment, public ::testi
   pci_t                  old_pci       = 0;
   amf_ue_id_t            amf_ue_id     = amf_ue_id_t::min;
   gnb_cu_up_ue_e1ap_id_t cu_up_e1ap_id = gnb_cu_up_ue_e1ap_id_t::min;
-
-  std::chrono::milliseconds rrc_procedure_extra_time{500};
-  std::chrono::milliseconds t300{400};
 };
 
 TEST_F(cu_cp_reestablishment_test, when_old_ue_does_not_exist_then_reestablishment_fails)
@@ -518,7 +515,7 @@ TEST_F(cu_cp_reestablishment_test, when_old_ue_is_busy_with_a_procedure_then_ree
 
   // RRC Setup timeout for old UE.
   std::chrono::milliseconds timeout =
-      t300 + rrc_procedure_extra_time + this->get_cu_cp_cfg().rrc.rrc_procedure_guard_time_ms;
+      rrc_test_timer_values.t300 + rrc_procedure_extra_time + this->get_cu_cp_cfg().rrc.rrc_procedure_guard_time_ms;
   for (unsigned i = 0; i != timeout.count(); ++i) {
     this->tick();
   }

tests/unittests/cu_cp/cu_cp_test_environment.cpp

@@ -15,8 +15,10 @@
 #include "tests/test_doubles/rrc/rrc_test_message_validators.h"
 #include "tests/test_doubles/rrc/rrc_test_messages.h"
 #include "tests/unittests/cu_cp/test_doubles/mock_cu_up.h"
+#include "tests/unittests/cu_cp/test_helpers.h"
 #include "tests/unittests/e1ap/common/e1ap_cu_cp_test_messages.h"
 #include "tests/unittests/ngap/ngap_test_messages.h"
+#include "srsran/asn1/f1ap/f1ap_pdu_contents.h"
 #include "srsran/asn1/f1ap/f1ap_pdu_contents_ue.h"
 #include "srsran/asn1/ngap/ngap_pdu_contents.h"
 #include "srsran/asn1/rrc_nr/dl_ccch_msg.h"
@@ -361,7 +363,9 @@ bool cu_cp_test_environment::run_f1_setup(unsigned
                                           gnb_du_id_t                                      gnb_du_id,
                                           std::vector<test_helpers::served_cell_item_info> cells)
 {
-  get_du(du_idx).push_ul_pdu(test_helpers::generate_f1_setup_request(gnb_du_id, std::move(cells)));
+  f1ap_message f1_setup_req = test_helpers::generate_f1_setup_request(gnb_du_id, cells);
+  rrc_test_timer_values     = get_timers(f1_setup_req.pdu.init_msg().value.f1_setup_request());
+  get_du(du_idx).push_ul_pdu(f1_setup_req);
   f1ap_message f1ap_pdu;
   bool         result = this->wait_for_f1ap_tx_pdu(du_idx, f1ap_pdu);
   return result;

tests/unittests/cu_cp/cu_cp_test_environment.h

@@ -229,6 +229,9 @@ class cu_cp_test_environment
       const std::vector<pdu_session_id_t>& expected_pdu_sessions_to_setup,
       const std::vector<pdu_session_id_t>& expected_pdu_sessions_failed_to_setup);
 
+  rrc_timers_t              rrc_test_timer_values;
+  std::chrono::milliseconds rrc_procedure_extra_time{500};
+
 private:
   class worker_manager;
 

tests/unittests/cu_cp/test_helpers.cpp

@@ -11,6 +11,8 @@
 #include "test_helpers.h"
 #include "../rrc/rrc_ue_test_helpers.h"
 #include "tests/test_doubles/rrc/rrc_test_messages.h"
+#include "srsran/asn1/f1ap/f1ap.h"
+#include "srsran/asn1/f1ap/f1ap_pdu_contents.h"
 #include "srsran/security/integrity.h"
 
 using namespace srsran;
@@ -57,3 +59,23 @@ byte_buffer srsran::srs_cu_cp::generate_rrc_reconfiguration_complete_pdu(unsigne
 
   return pdu_with_count;
 }
+
+rrc_timers_t srsran::srs_cu_cp::get_timers(const asn1::f1ap::f1_setup_request_s& f1_setup_req)
+{
+  rrc_timers_t timers;
+
+  auto& sib1_container = f1_setup_req->gnb_du_served_cells_list[0]->gnb_du_served_cells_item().gnb_du_sys_info.sib1_msg;
+
+  // Unpack SIB1 to store timers.
+  asn1::rrc_nr::sib1_s sib1_msg;
+  asn1::cbit_ref       bref2(sib1_container);
+  if (sib1_msg.unpack(bref2) != asn1::SRSASN_SUCCESS) {
+    report_fatal_error("Failed to unpack SIB1");
+  }
+  timers.t300 = std::chrono::milliseconds{sib1_msg.ue_timers_and_consts.t300.to_number()};
+  timers.t301 = std::chrono::milliseconds{sib1_msg.ue_timers_and_consts.t301.to_number()};
+  timers.t310 = std::chrono::milliseconds{sib1_msg.ue_timers_and_consts.t310.to_number()};
+  timers.t311 = std::chrono::milliseconds{sib1_msg.ue_timers_and_consts.t311.to_number()};
+
+  return timers;
+}

tests/unittests/cu_cp/test_helpers.h

@@ -15,6 +15,7 @@
 #include "lib/cu_cp/cu_up_processor/cu_up_processor_impl_interface.h"
 #include "lib/cu_cp/du_processor/du_processor.h"
 #include "lib/cu_cp/ue_manager/ue_manager_impl.h"
+#include "srsran/asn1/f1ap/f1ap.h"
 #include "srsran/cu_cp/cu_cp_types.h"
 #include "srsran/support/async/async_task.h"
 #include "srsran/support/async/fifo_async_task_scheduler.h"
@@ -35,6 +36,9 @@ byte_buffer generate_rrc_setup_complete();
 // Generate RRC Reconfiguration Complete PDU.
 byte_buffer generate_rrc_reconfiguration_complete_pdu(unsigned transaction_id, uint8_t count);
 
+// Extract RRC timers from F1 Setup Request.
+rrc_timers_t get_timers(const asn1::f1ap::f1_setup_request_s& f1_setup_req);
+
 struct dummy_du_processor_cu_cp_notifier : public du_processor_cu_cp_notifier {
 public:
   explicit dummy_du_processor_cu_cp_notifier(ue_manager* ue_mng_ = nullptr) : ue_mng(ue_mng_) {}