cu_cp,rrc: define rrc procedure extra time

Author: FabianEckermann

include/srsran/rrc/rrc_types.h

@@ -23,6 +23,9 @@
 namespace srsran {
 namespace srs_cu_cp {
 
+// Extra time that is added to RRC procedures to make sure procedures can complete.
+constexpr std::chrono::milliseconds RRC_PROCEDURE_EXTRA_TIME{500};
+
 /// Arguments for the RRC Reconfiguration procedure.
 
 struct rrc_srb_to_add_mod {

lib/rrc/ue/procedures/rrc_reconfiguration_procedure.cpp

@@ -29,8 +29,7 @@ rrc_reconfiguration_procedure::rrc_reconfiguration_procedure(rrc_ue_context_t&
   srb_notifier(srb_notifier_),
   logger(logger_)
 {
-  procedure_timeout =
-      context.cell.timers.t311 + std::chrono::milliseconds(500) + context.cfg.rrc_procedure_guard_time_ms;
+  procedure_timeout = context.cell.timers.t311 + RRC_PROCEDURE_EXTRA_TIME + context.cfg.rrc_procedure_guard_time_ms;
 }
 
 void rrc_reconfiguration_procedure::operator()(coro_context<async_task<bool>>& ctx)

lib/rrc/ue/procedures/rrc_reestablishment_procedure.cpp

@@ -45,8 +45,7 @@ rrc_reestablishment_procedure::rrc_reestablishment_procedure(
   event_mng(event_mng_),
   logger(logger_)
 {
-  procedure_timeout =
-      context.cell.timers.t311 + std::chrono::milliseconds(500) + context.cfg.rrc_procedure_guard_time_ms;
+  procedure_timeout = context.cell.timers.t311 + RRC_PROCEDURE_EXTRA_TIME + context.cfg.rrc_procedure_guard_time_ms;
 }
 
 void rrc_reestablishment_procedure::operator()(coro_context<async_task<void>>& ctx)

lib/rrc/ue/procedures/rrc_setup_procedure.cpp

@@ -37,8 +37,7 @@ rrc_setup_procedure::rrc_setup_procedure(rrc_ue_context_t&               context
   is_reestablishment_fallback(is_reestablishment_fallback_),
   logger(logger_)
 {
-  procedure_timeout =
-      context.cell.timers.t300 + std::chrono::milliseconds(500) + context.cfg.rrc_procedure_guard_time_ms;
+  procedure_timeout = context.cell.timers.t300 + RRC_PROCEDURE_EXTRA_TIME + context.cfg.rrc_procedure_guard_time_ms;
 }
 
 void rrc_setup_procedure::operator()(coro_context<async_task<void>>& ctx)

lib/rrc/ue/procedures/rrc_ue_capability_transfer_procedure.cpp

@@ -22,7 +22,7 @@ rrc_ue_capability_transfer_procedure::rrc_ue_capability_transfer_procedure(
     rrc_ue_logger&                              logger_) :
   context(context_), rrc_ue(rrc_ue_notifier_), event_mng(event_mng_), logger(logger_)
 {
-  procedure_timeout = std::chrono::milliseconds(500) + context.cfg.rrc_procedure_guard_time_ms;
+  procedure_timeout = RRC_PROCEDURE_EXTRA_TIME + context.cfg.rrc_procedure_guard_time_ms;
 }
 
 void rrc_ue_capability_transfer_procedure::operator()(coro_context<async_task<bool>>& ctx)

lib/rrc/ue/rrc_ue_message_handlers.cpp

@@ -320,7 +320,7 @@ rrc_ue_security_mode_command_context rrc_ue_impl::get_security_mode_command_cont
 async_task<bool> rrc_ue_impl::handle_security_mode_complete_expected(uint8_t transaction_id)
 {
   return launch_async([this,
-                       timeout_ms = std::chrono::milliseconds{500} + context.cfg.rrc_procedure_guard_time_ms,
+                       timeout_ms = RRC_PROCEDURE_EXTRA_TIME + context.cfg.rrc_procedure_guard_time_ms,
                        transaction_id,
                        transaction = rrc_transaction{}](coro_context<async_task<bool>>& ctx) mutable {
     CORO_BEGIN(ctx);

tests/unittests/cu_cp/cu_cp_initial_context_setup_test.cpp

@@ -319,7 +319,7 @@ TEST_F(cu_cp_initial_context_setup_test, when_ue_capability_enquiry_fails_then_i
 
   // Fail UE Capability Enquiry (UE doesn't respond)
   ASSERT_FALSE(tick_until(
-      rrc_procedure_extra_time + this->get_cu_cp_cfg().rrc.rrc_procedure_guard_time_ms,
+      RRC_PROCEDURE_EXTRA_TIME + this->get_cu_cp_cfg().rrc.rrc_procedure_guard_time_ms,
       [&]() { return false; },
       false));
 

tests/unittests/cu_cp/cu_cp_pdu_session_resource_modify_test.cpp

@@ -283,7 +283,7 @@ class cu_cp_pdu_session_resource_modify_test : public cu_cp_test_environment, pu
   {
     // Fail RRC Reconfiguration (UE doesn't respond) and wait for PDU Session Resource Setup Response
     if (tick_until(
-            rrc_test_timer_values.t310 + rrc_test_timer_values.t311 + rrc_procedure_extra_time +
+            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)) {

tests/unittests/cu_cp/cu_cp_pdu_session_resource_setup_test.cpp

@@ -204,7 +204,7 @@ class cu_cp_pdu_session_resource_setup_test : public cu_cp_test_environment, pub
   {
     // Fail RRC Reconfiguration (UE doesn't respond) and wait for PDU Session Resource Setup Response
     if (tick_until(
-            rrc_test_timer_values.t310 + rrc_test_timer_values.t311 + rrc_procedure_extra_time +
+            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)) {

tests/unittests/cu_cp/cu_cp_reestablishment_test.cpp

@@ -515,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 =
-      rrc_test_timer_values.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();
   }