cu-cp: make rrc setup timeout for old UE in reestablishment integration test

Author: frankist

tests/unittests/cu_cp/cu_cp_reestablishment_test.cpp

@@ -235,7 +235,7 @@ TEST_F(cu_cp_reestablishment_test, when_old_ue_is_busy_with_a_procedure_then_ree
   rnti_t              new_crnti    = to_rnti(0x4602);
   ASSERT_FALSE(send_rrc_reest_request_and_wait_response(new_du_ue_id, new_crnti, old_crnti, old_pci));
 
-  // new UE sends RRC Setup Complete and completes fallback procedure.
+  // EVENT: new UE sends RRC Setup Complete and completes fallback procedure.
   gnb_cu_ue_f1ap_id_t cu_ue_id = int_to_gnb_cu_ue_f1ap_id(1);
   this->ue_sends_rrc_setup_complete(new_du_ue_id, cu_ue_id);
 
@@ -248,12 +248,13 @@ TEST_F(cu_cp_reestablishment_test, when_old_ue_is_busy_with_a_procedure_then_ree
   f1ap_message f1ap_pdu;
   ASSERT_FALSE(this->get_du(du_idx).try_pop_dl_pdu(f1ap_pdu)) << "UE Context Release Command sent to soon";
 
-  // Send RRC Setup Complete for old UE.
-  gnb_cu_ue_f1ap_id_t old_cu_ue_id =
-      int_to_gnb_cu_ue_f1ap_id(msg->pdu.init_msg().value.dl_rrc_msg_transfer()->gnb_cu_ue_f1ap_id);
-  this->ue_sends_rrc_setup_complete(old_du_ue_id, old_cu_ue_id);
+  // RRC Setup timeout for old UE.
+  std::chrono::milliseconds timeout{this->get_cu_cp_cfg().rrc_config.rrc_procedure_timeout_ms};
+  for (unsigned i = 0; i != timeout.count(); ++i) {
+    this->tick();
+  }
 
-  // STATUS: CU-CP sends UE Context Release Command after the previous procedure times out.
+  // STATUS: CU-CP sends F1AP UE Context Release Command for old UE after the previous procedure times out.
   ASSERT_TRUE(this->wait_for_f1ap_tx_pdu(du_idx, f1ap_pdu));
   ASSERT_TRUE(test_helpers::is_valid_ue_context_release_command(f1ap_pdu));
   auto report = this->get_cu_cp().get_metrics_handler().request_metrics_report();

tests/unittests/cu_cp/cu_cp_test_environment.cpp

@@ -63,28 +63,28 @@ cu_cp_test_environment::cu_cp_test_environment(cu_cp_test_env_params params_) :
   srslog::init();
 
   // create CU-CP config
-  cu_cp_configuration cfg             = config_helpers::make_default_cu_cp_config();
-  cfg.cu_cp_executor                  = cu_cp_workers->exec.get();
-  cfg.ngap_notifier                   = &*amf_stub;
-  cfg.timers                          = &timers;
-  cfg.ngap_config                     = config_helpers::make_default_ngap_config();
-  cfg.max_nof_dus                     = params.max_nof_dus;
-  cfg.max_nof_cu_ups                  = params.max_nof_cu_ups;
-  cfg.ue_config.max_nof_supported_ues = params.max_nof_dus * MAX_NOF_UES_PER_DU;
+  cu_cp_cfg                                 = config_helpers::make_default_cu_cp_config();
+  cu_cp_cfg.cu_cp_executor                  = cu_cp_workers->exec.get();
+  cu_cp_cfg.ngap_notifier                   = &*amf_stub;
+  cu_cp_cfg.timers                          = &timers;
+  cu_cp_cfg.ngap_config                     = config_helpers::make_default_ngap_config();
+  cu_cp_cfg.max_nof_dus                     = params.max_nof_dus;
+  cu_cp_cfg.max_nof_cu_ups                  = params.max_nof_cu_ups;
+  cu_cp_cfg.ue_config.max_nof_supported_ues = params.max_nof_dus * MAX_NOF_UES_PER_DU;
   // > RRC config.
-  cfg.rrc_config.gnb_id             = cfg.ngap_config.gnb_id;
-  cfg.rrc_config.drb_config         = config_helpers::make_default_cu_cp_qos_config_list();
-  cfg.rrc_config.int_algo_pref_list = {security::integrity_algorithm::nia2,
-                                       security::integrity_algorithm::nia1,
-                                       security::integrity_algorithm::nia3,
-                                       security::integrity_algorithm::nia0};
-  cfg.rrc_config.enc_algo_pref_list = {security::ciphering_algorithm::nea0,
-                                       security::ciphering_algorithm::nea2,
-                                       security::ciphering_algorithm::nea1,
-                                       security::ciphering_algorithm::nea3};
+  cu_cp_cfg.rrc_config.gnb_id             = cu_cp_cfg.ngap_config.gnb_id;
+  cu_cp_cfg.rrc_config.drb_config         = config_helpers::make_default_cu_cp_qos_config_list();
+  cu_cp_cfg.rrc_config.int_algo_pref_list = {security::integrity_algorithm::nia2,
+                                             security::integrity_algorithm::nia1,
+                                             security::integrity_algorithm::nia3,
+                                             security::integrity_algorithm::nia0};
+  cu_cp_cfg.rrc_config.enc_algo_pref_list = {security::ciphering_algorithm::nea0,
+                                             security::ciphering_algorithm::nea2,
+                                             security::ciphering_algorithm::nea1,
+                                             security::ciphering_algorithm::nea3};
 
   // create CU-CP instance.
-  cu_cp_inst = create_cu_cp(cfg);
+  cu_cp_inst = create_cu_cp(cu_cp_cfg);
 
   // Pass CU-CP PDU handler to AMF.
   amf_stub->attach_cu_cp_pdu_handler(cu_cp_inst->get_ng_handler().get_ngap_message_handler());

tests/unittests/cu_cp/cu_cp_test_environment.h

@@ -14,6 +14,7 @@
 #include "test_doubles/mock_cu_up.h"
 #include "test_doubles/mock_du.h"
 #include "srsran/cu_cp/cu_cp.h"
+#include "srsran/cu_cp/cu_cp_configuration.h"
 #include "srsran/ngap/ngap_configuration.h"
 #include "srsran/ngap/ngap_configuration_helpers.h"
 #include <unordered_map>
@@ -101,10 +102,14 @@ class cu_cp_test_environment
 
   const ue_context* find_ue_context(unsigned du_idx, gnb_du_ue_f1ap_id_t du_ue_id) const;
 
+  /// Get CU-CP configuration used to instantiate CU-CP.
+  const cu_cp_configuration& get_cu_cp_cfg() const { return cu_cp_cfg; }
+
 private:
   class worker_manager;
 
   cu_cp_test_env_params params;
+  cu_cp_configuration   cu_cp_cfg{};
 
   /// Workers for CU-CP.
   std::unique_ptr<worker_manager> cu_cp_workers;