cu_cp,f1ap: align ue context release procedure to other ue context procedures

Author: FabianEckermann

lib/f1ap/cu_cp/f1ap_cu_impl.cpp

@@ -108,7 +108,7 @@ async_task<ue_index_t> f1ap_cu_impl::handle_ue_context_release_command(const f1a
     });
   }
 
-  return launch_async<ue_context_release_procedure>(msg, ue_ctxt_list[msg.ue_index], tx_pdu_notifier, cfg.proc_timeout);
+  return launch_async<ue_context_release_procedure>(cfg, msg, ue_ctxt_list[msg.ue_index], tx_pdu_notifier);
 }
 
 async_task<f1ap_ue_context_modification_response>

lib/f1ap/cu_cp/procedures/ue_context_release_procedure.cpp

@@ -18,14 +18,11 @@ using namespace srsran;
 using namespace srsran::srs_cu_cp;
 using namespace asn1::f1ap;
 
-ue_context_release_procedure::ue_context_release_procedure(const f1ap_ue_context_release_command& cmd_,
+ue_context_release_procedure::ue_context_release_procedure(const f1ap_configuration&              f1ap_cfg_,
+                                                           const f1ap_ue_context_release_command& cmd_,
                                                            f1ap_ue_context&                       ue_ctxt_,
-                                                           f1ap_message_notifier&                 f1ap_notif_,
-                                                           std::chrono::milliseconds              proc_timeout_) :
-  ue_ctxt(ue_ctxt_),
-  f1ap_notifier(f1ap_notif_),
-  proc_timeout(proc_timeout_),
-  logger(srslog::fetch_basic_logger("CU-CP-F1"))
+                                                           f1ap_message_notifier&                 f1ap_notif_) :
+  f1ap_cfg(f1ap_cfg_), ue_ctxt(ue_ctxt_), f1ap_notifier(f1ap_notif_), logger(srslog::fetch_basic_logger("CU-CP-F1"))
 {
   command->gnb_cu_ue_f1ap_id = gnb_cu_ue_f1ap_id_to_uint(ue_ctxt.ue_ids.cu_ue_f1ap_id);
   command->gnb_du_ue_f1ap_id = gnb_du_ue_f1ap_id_to_uint(ue_ctxt.ue_ids.du_ue_f1ap_id);
@@ -47,7 +44,7 @@ void ue_context_release_procedure::operator()(coro_context<async_task<ue_index_t
 
   logger.debug("{}: Procedure started...", f1ap_ue_log_prefix{ue_ctxt.ue_ids, name()});
 
-  transaction_sink.subscribe_to(ue_ctxt.ev_mng.context_release_complete, proc_timeout);
+  transaction_sink.subscribe_to(ue_ctxt.ev_mng.context_release_complete, f1ap_cfg.proc_timeout);
 
   ue_ctxt.marked_for_release = true;
 

lib/f1ap/cu_cp/procedures/ue_context_release_procedure.h

@@ -24,10 +24,10 @@ namespace srs_cu_cp {
 class ue_context_release_procedure
 {
 public:
-  ue_context_release_procedure(const f1ap_ue_context_release_command& cmd_,
+  ue_context_release_procedure(const f1ap_configuration&              f1ap_cfg_,
+                               const f1ap_ue_context_release_command& cmd_,
                                f1ap_ue_context&                       ue_ctxt_,
-                               f1ap_message_notifier&                 f1ap_notif_,
-                               std::chrono::milliseconds              proc_timeout);
+                               f1ap_message_notifier&                 f1ap_notif_);
 
   void operator()(coro_context<async_task<ue_index_t>>& ctx);
 
@@ -40,10 +40,10 @@ class ue_context_release_procedure
   /// Creates procedure result to send back to procedure caller.
   ue_index_t create_ue_context_release_complete();
 
+  const f1ap_configuration&            f1ap_cfg;
   f1ap_ue_context&                     ue_ctxt;
   asn1::f1ap::ue_context_release_cmd_s command;
   f1ap_message_notifier&               f1ap_notifier;
-  const std::chrono::milliseconds      proc_timeout;
   srslog::basic_logger&                logger;
 
   protocol_transaction_outcome_observer<asn1::f1ap::ue_context_release_complete_s> transaction_sink;