f1ap-du: fix unit tests for ue context setup

Author: frankist

lib/f1ap/du/procedures/f1ap_du_ue_context_setup_procedure.cpp

@@ -14,6 +14,7 @@
 #include "proc_logger.h"
 #include "srsran/asn1/f1ap/common.h"
 #include "srsran/f1ap/common/f1ap_message.h"
+#include "srsran/support/async/async_no_op_task.h"
 
 using namespace srsran;
 using namespace srs_du;
@@ -91,7 +92,7 @@ void f1ap_du_ue_context_setup_procedure::operator()(coro_context<async_task<void
   // > If the UE CONTEXT SETUP REQUEST message contains the RRC-Container IE, the gNB-DU shall send the corresponding
   // RRC message to the UE via SRB1.
   if (msg->rrc_container_present and not msg->rrc_container.empty()) {
-    CORO_AWAIT(ue->bearers.find_srb(srb_id_t::srb1)->handle_pdu_and_await_transmission(msg->rrc_container.copy()));
+    CORO_AWAIT(handle_rrc_container());
   }
 
   // Respond back to CU-CP with success.
@@ -100,6 +101,16 @@ void f1ap_du_ue_context_setup_procedure::operator()(coro_context<async_task<void
   CORO_RETURN();
 }
 
+async_task<void> f1ap_du_ue_context_setup_procedure::handle_rrc_container()
+{
+  f1c_bearer* srb1 = ue->bearers.find_srb(srb_id_t::srb1);
+  if (srb1 != nullptr) {
+    return srb1->handle_pdu_and_await_transmission(msg->rrc_container.copy());
+  }
+  logger.error("{}: Failed to find SRB1 bearer to send RRC container.", f1ap_log_prefix{ue->context, name()});
+  return launch_no_op_task();
+}
+
 async_task<f1ap_ue_context_update_response> f1ap_du_ue_context_setup_procedure::request_du_ue_config()
 {
   // Construct DU request.

lib/f1ap/du/procedures/f1ap_du_ue_context_setup_procedure.h

@@ -39,6 +39,8 @@ class f1ap_du_ue_context_setup_procedure
   // Send UE Context Setup Failure to CU.
   void send_ue_context_setup_failure();
 
+  async_task<void> handle_rrc_container();
+
   const char* name() const { return "UE Context Setup"; }
 
   const asn1::f1ap::ue_context_setup_request_s msg;

tests/unittests/f1ap/du/f1ap_du_ue_context_setup_procedure_test.cpp

@@ -79,6 +79,18 @@ class f1ap_du_ue_context_setup_test : public f1ap_du_test
     }
 
     f1ap->handle_message(msg);
+
+    if (not ue_ctx_setup.gnb_du_ue_f1ap_id_present) {
+      report_fatal_error_if_not(this->f1ap_du_cfg_handler.last_ue_creation_response.has_value(),
+                                "UE should have been created");
+      test_ue->f1c_bearers[srb_id_to_uint(srb_id_t::srb1)].bearer =
+          this->f1ap_du_cfg_handler.last_ue_creation_response.value().f1c_bearers_added[0];
+    }
+  }
+
+  void on_rrc_container_transmitted(uint32_t highest_pdcp_sn)
+  {
+    this->test_ue->f1c_bearers[LCID_SRB1].bearer->handle_transmit_notification(highest_pdcp_sn);
   }
 
   ue_test_context* test_ue = nullptr;
@@ -110,6 +122,10 @@ TEST_F(f1ap_du_ue_context_setup_test, when_f1ap_receives_request_then_f1ap_respo
       gnb_cu_ue_f1ap_id_t{0}, gnb_du_ue_f1ap_id_t{0}, 1, {drb_id_t::drb1});
   start_procedure(msg);
 
+  // Lower layers handle RRC container.
+  this->f1c_gw.last_tx_f1ap_pdu = {};
+  on_rrc_container_transmitted(1);
+
   // F1AP sends UE CONTEXT SETUP RESPONSE to CU-CP.
   ASSERT_EQ(this->f1c_gw.last_tx_f1ap_pdu.pdu.type().value, f1ap_pdu_c::types_opts::successful_outcome);
   ASSERT_EQ(this->f1c_gw.last_tx_f1ap_pdu.pdu.successful_outcome().value.type().value,
@@ -168,9 +184,8 @@ TEST_F(f1ap_du_ue_context_setup_test, when_f1ap_receives_request_then_new_srbs_b
 
 TEST_F(f1ap_du_ue_context_setup_test, when_f1ap_receives_request_without_gnb_du_ue_f1ap_id_then_ue_is_created)
 {
-  f1ap_message msg = test_helpers::create_ue_context_setup_request(
-      gnb_cu_ue_f1ap_id_t{0}, gnb_du_ue_f1ap_id_t{0}, 1, {drb_id_t::drb1});
-  msg.pdu.init_msg().value.ue_context_setup_request()->gnb_du_ue_f1ap_id_present = false;
+  f1ap_message msg =
+      test_helpers::create_ue_context_setup_request(gnb_cu_ue_f1ap_id_t{0}, std::nullopt, 1, {drb_id_t::drb1});
 
   start_procedure(msg);
 
@@ -180,9 +195,8 @@ TEST_F(f1ap_du_ue_context_setup_test, when_f1ap_receives_request_without_gnb_du_
 
 TEST_F(f1ap_du_ue_context_setup_test, when_f1ap_receives_request_without_gnb_du_ue_f1ap_id_then_ue_context_is_updated)
 {
-  f1ap_message msg = test_helpers::create_ue_context_setup_request(
-      gnb_cu_ue_f1ap_id_t{0}, gnb_du_ue_f1ap_id_t{0}, 1, {drb_id_t::drb1});
-  msg.pdu.init_msg().value.ue_context_setup_request()->gnb_du_ue_f1ap_id_present = false;
+  f1ap_message msg =
+      test_helpers::create_ue_context_setup_request(gnb_cu_ue_f1ap_id_t{0}, std::nullopt, 1, {drb_id_t::drb1});
 
   start_procedure(msg);
 
@@ -199,11 +213,11 @@ TEST_F(
     f1ap_du_ue_context_setup_test,
     when_f1ap_receives_request_without_gnb_du_ue_f1ap_id_then_ue_context_setup_response_is_sent_to_cu_cp_with_crnti_ie)
 {
-  f1ap_message msg = test_helpers::create_ue_context_setup_request(
-      gnb_cu_ue_f1ap_id_t{0}, gnb_du_ue_f1ap_id_t{0}, 1, {drb_id_t::drb1});
-  msg.pdu.init_msg().value.ue_context_setup_request()->gnb_du_ue_f1ap_id_present = false;
+  f1ap_message msg =
+      test_helpers::create_ue_context_setup_request(gnb_cu_ue_f1ap_id_t{0}, std::nullopt, 1, {drb_id_t::drb1});
 
   start_procedure(msg);
+  on_rrc_container_transmitted(1);
 
   // F1AP sends UE CONTEXT SETUP RESPONSE to CU-CP.
   ASSERT_EQ(this->f1c_gw.last_tx_f1ap_pdu.pdu.type().value, f1ap_pdu_c::types_opts::successful_outcome);