tests: add du params to f1 setup request

Author: andrepuschmann

tests/unittests/cu_cp/du_processor_test_messages.cpp

@@ -19,23 +19,26 @@
 using namespace srsran;
 using namespace srs_cu_cp;
 
-void srsran::srs_cu_cp::generate_valid_f1_setup_request(f1ap_f1_setup_request& f1_setup_request)
+void srsran::srs_cu_cp::generate_valid_f1_setup_request(f1ap_f1_setup_request& f1_setup_request,
+                                                        unsigned               gnb_du_id,
+                                                        unsigned               nrcell_id,
+                                                        pci_t                  pci)
 {
-  f1ap_message f1setup_msg = generate_f1_setup_request(0);
+  f1ap_message f1setup_msg = generate_f1_setup_request(gnb_du_id, nrcell_id, pci);
   fill_f1_setup_request(f1_setup_request, f1setup_msg.pdu.init_msg().value.f1_setup_request());
 }
 
 void srsran::srs_cu_cp::generate_f1_setup_request_base(f1ap_f1_setup_request& f1_setup_request)
 {
-  f1ap_message f1setup_msg                                                              = generate_f1_setup_request(0);
+  f1ap_message f1setup_msg = generate_f1_setup_request(0x11, 6576, 0);
   f1setup_msg.pdu.init_msg().value.f1_setup_request()->gnb_du_served_cells_list_present = false;
   f1setup_msg.pdu.init_msg().value.f1_setup_request()->gnb_du_served_cells_list.clear();
   fill_f1_setup_request(f1_setup_request, f1setup_msg.pdu.init_msg().value.f1_setup_request());
 }
 
 void srsran::srs_cu_cp::generate_f1_setup_request_with_too_many_cells(f1ap_f1_setup_request& f1_setup_request)
 {
-  f1ap_message f1setup_msg  = generate_f1_setup_request(0);
+  f1ap_message f1setup_msg  = generate_f1_setup_request(0x11, 6576, 0);
   auto&        f1_setup_req = f1setup_msg.pdu.init_msg().value.f1_setup_request();
   f1_setup_req->gnb_du_served_cells_list.clear();
 

tests/unittests/cu_cp/du_processor_test_messages.h

@@ -18,7 +18,10 @@ namespace srsran {
 namespace srs_cu_cp {
 
 /// \brief Generate a valid dummy F1 Setup Request.
-void generate_valid_f1_setup_request(f1ap_f1_setup_request& f1_setup_request);
+void generate_valid_f1_setup_request(f1ap_f1_setup_request& f1_setup_request,
+                                     unsigned               gnb_du_id = 0x11,
+                                     unsigned               nrcell_id = 6576,
+                                     pci_t                  pci       = 0);
 
 /// \brief Generate a dummy F1 Setup Request base to extend.
 void generate_f1_setup_request_base(f1ap_f1_setup_request& f1_setup_request);

tests/unittests/f1ap/common/f1ap_asn1_packer_test.cpp

@@ -48,7 +48,7 @@ class f1ap_asn1_packer_test : public ::testing::Test
 TEST_F(f1ap_asn1_packer_test, when_packing_successful_then_unpacking_successful)
 {
   // Action 1: Create valid f1ap message
-  f1ap_message f1_setup_request = generate_f1_setup_request(0);
+  f1ap_message f1_setup_request = generate_f1_setup_request();
 
   // Action 2: Pack message and forward to gateway
   packer->handle_message(f1_setup_request);
@@ -64,13 +64,13 @@ TEST_F(f1ap_asn1_packer_test, when_packing_successful_then_unpacking_successful)
 TEST_F(f1ap_asn1_packer_test, when_packing_unsuccessful_then_message_not_forwarded)
 {
   // Action 1: Generate, pack and forward valid message to bring gw into known state
-  f1ap_message f1_setup_request = generate_f1_setup_request(0);
+  f1ap_message f1_setup_request = generate_f1_setup_request();
   packer->handle_message(f1_setup_request);
   // store size of valid pdu
   int valid_pdu_size = gw->last_pdu.length();
 
   // Action 2: Create invalid f1ap message
-  f1ap_message f1ap_msg                       = generate_f1_setup_request(0);
+  f1ap_message f1ap_msg                       = generate_f1_setup_request();
   auto&        setup_req                      = f1ap_msg.pdu.init_msg().value.f1_setup_request();
   setup_req->gnb_du_served_cells_list_present = true;
   setup_req->gnb_du_served_cells_list.clear();

tests/unittests/f1ap/common/f1ap_cu_test_messages.cpp

@@ -51,22 +51,23 @@ asn1::f1ap::gnb_du_served_cells_item_s srsran::srs_cu_cp::generate_served_cells_
   return served_cells_item;
 }
 
-f1ap_message srsran::srs_cu_cp::generate_f1_setup_request(pci_t pci)
+f1ap_message srsran::srs_cu_cp::generate_f1_setup_request(unsigned gnb_du_id, unsigned nrcell_id, pci_t pci)
 {
   f1ap_message msg;
   msg.pdu.set_init_msg();
   msg.pdu.init_msg().load_info_obj(ASN1_F1AP_ID_F1_SETUP);
 
   auto& setup_req                = msg.pdu.init_msg().value.f1_setup_request();
   setup_req->transaction_id      = 99;
-  setup_req->gnb_du_id           = 0x11;
+  setup_req->gnb_du_id           = gnb_du_id;
   setup_req->gnb_du_name_present = true;
   setup_req->gnb_du_name.from_string("srsDU");
   setup_req->gnb_du_rrc_version.latest_rrc_version.from_number(1);
   setup_req->gnb_du_served_cells_list_present = true;
   setup_req->gnb_du_served_cells_list.resize(1);
   setup_req->gnb_du_served_cells_list[0].load_info_obj(ASN1_F1AP_ID_GNB_DU_SERVED_CELLS_ITEM);
-  setup_req->gnb_du_served_cells_list[0].value().gnb_du_served_cells_item() = generate_served_cells_item(6576, pci);
+  setup_req->gnb_du_served_cells_list[0].value().gnb_du_served_cells_item() =
+      generate_served_cells_item(nrcell_id, pci);
 
   return msg;
 }

tests/unittests/f1ap/common/f1ap_cu_test_messages.h

@@ -21,7 +21,7 @@ namespace srs_cu_cp {
 asn1::f1ap::gnb_du_served_cells_item_s generate_served_cells_item(unsigned nrcell_id, pci_t nrpci);
 
 /// \brief Generates dummy F1AP SETUP REQUEST message.
-f1ap_message generate_f1_setup_request(pci_t pci);
+f1ap_message generate_f1_setup_request(unsigned gnb_du_id = 0x11, unsigned nrcell_id = 6576, pci_t pci = 0);
 
 /// \brief Generates dummy F1AP Initial UL RRC TRANSFER message.
 f1ap_message generate_init_ul_rrc_message_transfer(gnb_du_ue_f1ap_id_t du_ue_id,