f1ap-du: fix ue context setup tests

Author: frankist

tests/unittests/f1ap/du/f1ap_du_test_helpers.cpp

@@ -15,6 +15,7 @@
 #include "srsran/asn1/f1ap/common.h"
 #include "srsran/asn1/f1ap/f1ap_pdu_contents_ue.h"
 #include "srsran/du/du_cell_config_helpers.h"
+#include "srsran/pdcp/pdcp_sn_util.h"
 #include "srsran/support/async/async_test_utils.h"
 #include "srsran/support/test_utils.h"
 
@@ -368,6 +369,10 @@ void f1ap_du_test::run_ue_context_setup_procedure(du_ue_index_t ue_index, const
   for (const auto& created_srb : f1ap_du_cfg_handler.last_ue_cfg_response->f1c_bearers_added) {
     ue.f1c_bearers[srb_id_to_uint(created_srb.srb_id)].bearer = created_srb.bearer;
   }
+
+  // Report transmission notification back to F1AP.
+  std::optional<uint32_t> pdcp_sn = get_pdcp_sn(f1ap_req->rrc_container, pdcp_sn_size::size12bits, true, test_logger);
+  ue.f1c_bearers[LCID_SRB1].bearer->handle_transmit_notification(pdcp_sn.value());
 }
 
 f1ap_ue_configuration_response f1ap_du_test::update_f1ap_ue_config(du_ue_index_t                   ue_index,

tests/unittests/f1ap/du/f1ap_du_ue_context_modification_test.cpp

@@ -25,7 +25,9 @@ class f1ap_du_ue_context_modification_test : public f1ap_du_test
     // Test Preamble.
     run_f1_setup_procedure();
     run_f1ap_ue_create(test_ue_index);
-    run_ue_context_setup_procedure(test_ue_index, generate_ue_context_setup_request({}));
+    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, {});
+    run_ue_context_setup_procedure(test_ue_index, msg);
   }
 
   void start_procedure(const std::initializer_list<drb_id_t>& drbs, byte_buffer rrc_container = {})

tests/unittests/f1ap/du/f1ap_du_ue_context_release_test.cpp

@@ -25,7 +25,9 @@ class f1ap_du_ue_context_release_test : public f1ap_du_test
     run_f1_setup_procedure();
     du_ue_index_t ue_index = to_du_ue_index(test_rgen::uniform_int<unsigned>(0, MAX_DU_UE_INDEX));
     test_ue                = run_f1ap_ue_create(ue_index);
-    run_ue_context_setup_procedure(ue_index, generate_ue_context_setup_request({}));
+    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, {});
+    run_ue_context_setup_procedure(ue_index, msg);
   }
 
   void start_procedure(const f1ap_message& msg = generate_ue_context_release_command())

tests/unittests/f1ap/du/f1ap_du_ue_context_setup_procedure_test.cpp

@@ -9,6 +9,7 @@
  */
 
 #include "f1ap_du_test_helpers.h"
+#include "tests/test_doubles/f1ap/f1ap_test_messages.h"
 #include "srsran/support/test_utils.h"
 #include <gtest/gtest.h>
 
@@ -145,7 +146,9 @@ TEST_F(f1ap_du_ue_context_setup_test, when_f1ap_receives_request_then_the_rrc_co
 TEST_F(f1ap_du_ue_context_setup_test, when_f1ap_receives_request_then_new_srbs_become_active)
 {
   du_creates_f1_logical_connection();
-  run_ue_context_setup_procedure(test_ue->ue_index, generate_ue_context_setup_request({drb_id_t::drb1}));
+  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});
+  run_ue_context_setup_procedure(test_ue->ue_index, msg);
 
   // UL data through created SRB2 reaches F1-C.
   ASSERT_EQ(this->f1ap_du_cfg_handler.last_ue_cfg_response->f1c_bearers_added.size(), 1);

tests/unittests/f1ap/du/f1ap_du_ul_rrc_message_transfer_test.cpp

@@ -10,6 +10,7 @@
 
 #include "f1ap_du_test_helpers.h"
 #include "lib/f1ap/du/ue_context/f1c_du_bearer_impl.h"
+#include "tests/test_doubles/f1ap/f1ap_test_messages.h"
 #include "srsran/asn1/f1ap/common.h"
 #include "srsran/support/test_utils.h"
 #include <gtest/gtest.h>
@@ -23,7 +24,9 @@ TEST_F(f1ap_du_test, when_sdu_is_received_then_sdu_is_forwarded_to_tx_pdu_notifi
   // Run Test Preamble.
   run_f1_setup_procedure();
   ue_test_context* ue = run_f1ap_ue_create(to_du_ue_index(0));
-  run_ue_context_setup_procedure(ue->ue_index, generate_ue_context_setup_request({}));
+  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, {});
+  run_ue_context_setup_procedure(ue->ue_index, msg);
   this->f1c_gw.last_tx_f1ap_pdu.pdu = {};
 
   std::vector<uint8_t> bytes = test_rgen::random_vector<uint8_t>(test_rgen::uniform_int<unsigned>(1, 4000));