gnb,cu_cp,ngap: Change ue context setup timeout to seconds

Author: FabianEckermann

apps/gnb/gnb_appconfig.h

@@ -649,8 +649,8 @@ struct security_appconfig {
 };
 
 struct cu_cp_appconfig {
-  int                inactivity_timer       = 7200; // in seconds
-  int                ue_context_setup_timer = 2000; // in milliseconds
+  int                inactivity_timer           = 7200; // in seconds
+  int                ue_context_setup_timeout_s = 2;    // in seconds
   mobility_appconfig mobility_config;
   rrc_appconfig      rrc_config;
   security_appconfig security_config;

apps/gnb/gnb_appconfig_cli11_schema.cpp

@@ -360,10 +360,10 @@ static void configure_cli11_cu_cp_args(CLI::App& app, cu_cp_appconfig& cu_cp_par
       ->capture_default_str()
       ->check(CLI::Range(1, 7200));
 
-  app.add_option("--ue_context_setup_timer",
-                 cu_cp_params.ue_context_setup_timer,
+  app.add_option("--ue_context_setup_timeout_s",
+                 cu_cp_params.ue_context_setup_timeout_s,
                  "Timeout for the reception of an InitialContextSetupRequest after an InitialUeMessage was sent to the "
-                 "core. If the value is reached, the UE will be released")
+                 "core, in seconds. If the value is reached, the UE will be released")
       ->capture_default_str();
 
   CLI::App* mobility_subcmd = app.add_subcommand("mobility", "Mobility configuration");

apps/gnb/gnb_appconfig_translators.cpp

@@ -113,9 +113,9 @@ srs_cu_cp::cu_cp_configuration srsran::generate_cu_cp_config(const gnb_appconfig
                  config.cu_cp_cfg.security_config.confidentiality_protection);
   }
 
-  out_cfg.ue_config.inactivity_timer         = std::chrono::seconds{config.cu_cp_cfg.inactivity_timer};
-  out_cfg.ngap_config.ue_context_setup_timer = std::chrono::seconds{config.cu_cp_cfg.ue_context_setup_timer};
-  out_cfg.statistics_report_period           = std::chrono::seconds{config.metrics_cfg.cu_cp_statistics_report_period};
+  out_cfg.ue_config.inactivity_timer             = std::chrono::seconds{config.cu_cp_cfg.inactivity_timer};
+  out_cfg.ngap_config.ue_context_setup_timeout_s = std::chrono::seconds{config.cu_cp_cfg.ue_context_setup_timeout_s};
+  out_cfg.statistics_report_period = std::chrono::seconds{config.metrics_cfg.cu_cp_statistics_report_period};
 
   out_cfg.mobility_config.mobility_manager_config.trigger_handover_from_measurements =
       config.cu_cp_cfg.mobility_config.trigger_handover_from_measurements;

include/srsran/ngap/ngap_configuration.h

@@ -21,12 +21,12 @@ namespace srs_cu_cp {
 
 /// \brief NGAP configuration
 struct ngap_configuration {
-  unsigned                  gnb_id = 0;
-  std::string               ran_node_name;
-  std::string               plmn; /// Full PLMN as string (without possible filler digit) e.g. "00101"
-  unsigned                  tac;
-  std::vector<s_nssai_t>    slice_configurations;
-  std::chrono::milliseconds ue_context_setup_timer; // timeout for ue context setup in milliseconds
+  unsigned               gnb_id = 0;
+  std::string            ran_node_name;
+  std::string            plmn; /// Full PLMN as string (without possible filler digit) e.g. "00101"
+  unsigned               tac;
+  std::vector<s_nssai_t> slice_configurations;
+  std::chrono::seconds   ue_context_setup_timeout_s; // timeout for ue context setup in seconds
 };
 
 } // namespace srs_cu_cp

lib/ngap/ngap_context.h

@@ -19,13 +19,13 @@ namespace srs_cu_cp {
 
 /// \brief NGAP context
 struct ngap_context_t {
-  unsigned                  gnb_id = 0;
-  std::string               ran_node_name;
-  std::string               plmn; /// Full PLMN as string (without possible filler digit) e.g. "00101"
-  unsigned                  tac;
-  std::vector<guami_t>      served_guami_list;
-  guami_t                   current_guami;
-  std::chrono::milliseconds ue_context_setup_timer; // timeout for ue context setup in milliseconds
+  unsigned             gnb_id = 0;
+  std::string          ran_node_name;
+  std::string          plmn; /// Full PLMN as string (without possible filler digit) e.g. "00101"
+  unsigned             tac;
+  std::vector<guami_t> served_guami_list;
+  guami_t              current_guami;
+  std::chrono::seconds ue_context_setup_timeout_s; // timeout for ue context setup in seconds
 };
 
 } // namespace srs_cu_cp

lib/ngap/ngap_impl.cpp

@@ -43,11 +43,11 @@ ngap_impl::ngap_impl(ngap_configuration&                ngap_cfg_,
   ctrl_exec(ctrl_exec_),
   ev_mng(timer_factory{task_sched.get_timer_manager(), ctrl_exec})
 {
-  context.gnb_id                 = ngap_cfg_.gnb_id;
-  context.ran_node_name          = ngap_cfg_.ran_node_name;
-  context.plmn                   = ngap_cfg_.plmn;
-  context.tac                    = ngap_cfg_.tac;
-  context.ue_context_setup_timer = ngap_cfg_.ue_context_setup_timer;
+  context.gnb_id                     = ngap_cfg_.gnb_id;
+  context.ran_node_name              = ngap_cfg_.ran_node_name;
+  context.plmn                       = ngap_cfg_.plmn;
+  context.tac                        = ngap_cfg_.tac;
+  context.ue_context_setup_timeout_s = ngap_cfg_.ue_context_setup_timeout_s;
 }
 
 // Note: For fwd declaration of member types, dtor cannot be trivial.
@@ -120,12 +120,15 @@ void ngap_impl::handle_initial_ue_message(const cu_cp_initial_ue_message& msg)
   fill_asn1_initial_ue_message(init_ue_msg, msg, context);
 
   // Start UE context setup timer
-  ue_ctxt.ue_context_setup_timer.set(context.ue_context_setup_timer, [this, msg](timer_id_t /*tid*/) {
+  ue_ctxt.ue_context_setup_timer.set(context.ue_context_setup_timeout_s, [this, msg](timer_id_t /*tid*/) {
     on_ue_context_setup_timer_expired(msg.ue_index);
   });
   ue_ctxt.ue_context_setup_timer.run();
 
-  logger.info("ue={} ran_ue_id={}: Sending InitialUeMessage", msg.ue_index, ue_ctxt.ue_ids.ran_ue_id);
+  logger.info("ue={} ran_ue_id={}: Sending InitialUeMessage (timeout={}s)",
+              msg.ue_index,
+              ue_ctxt.ue_ids.ran_ue_id,
+              ue_ctxt.ue_context_setup_timer.duration().count());
 
   // Forward message to AMF
   ngap_notifier.on_new_message(ngap_msg);
@@ -915,7 +918,9 @@ void ngap_impl::on_ue_context_setup_timer_expired(ue_index_t ue_index)
   if (ue_ctxt_list.contains(ue_index)) {
     ngap_ue_context& ue_ctxt = ue_ctxt_list[ue_index];
 
-    logger.warning("ue={}: UE context setup timer expired. Releasing UE from DU", ue_index);
+    logger.warning("ue={}: UE context setup timer expired after {}s. Releasing UE from DU",
+                   ue_index,
+                   ue_ctxt.ue_context_setup_timer.duration().count());
 
     auto* ue = ue_manager.find_ngap_ue(ue_ctxt.ue_ids.ue_index);
     srsran_assert(ue != nullptr,

tests/unittests/ngap/ngap_nas_message_test.cpp

@@ -83,7 +83,7 @@ TEST_F(ngap_nas_message_routine_test, when_initial_context_setup_request_is_not_
 
   // tick timers
   // Status: NGAP does not receive new Initial Context Setup Request until ue_context_setup_timer has ended.
-  for (unsigned msec_elapsed = 0; msec_elapsed < cfg.ue_context_setup_timer.count(); ++msec_elapsed) {
+  for (unsigned msec_elapsed = 0; msec_elapsed < cfg.ue_context_setup_timeout_s.count() * 1000; ++msec_elapsed) {
     this->tick();
   }
 

tests/unittests/ngap/ngap_test_helpers.cpp

@@ -32,7 +32,7 @@ ngap_test::ngap_test() : ngap_ue_task_scheduler(timers, ctrl_worker)
   s_nssai_t slice_cfg;
   slice_cfg.sst = 1;
   cfg.slice_configurations.push_back(slice_cfg);
-  cfg.ue_context_setup_timer = std::chrono::milliseconds(2000);
+  cfg.ue_context_setup_timeout_s = std::chrono::seconds(2);
 
   ngap = create_ngap(cfg, cu_cp_paging_notifier, ngap_ue_task_scheduler, ue_mng, msg_notifier, ctrl_worker);