diff --git a/srsgnb/src/stack/rrc/test/rrc_nr_test.cc b/srsgnb/src/stack/rrc/test/rrc_nr_test.cc index 3d70c1961..259802dbb 100644 --- a/srsgnb/src/stack/rrc/test/rrc_nr_test.cc +++ b/srsgnb/src/stack/rrc/test/rrc_nr_test.cc @@ -147,6 +147,11 @@ void test_rrc_sa_connection() rrc_nr rrc_obj(&task_sched); + // Dummy RLC/PDCP configs + asn1::rrc_nr::rlc_cfg_c rlc_cfg; + rlc_cfg.set_um_bi_dir(); + rlc_cfg.um_bi_dir().dl_um_rlc.t_reassembly = t_reassembly_e::ms50; + // set cfg rrc_nr_cfg_t rrc_cfg_nr; rrc_cfg_nr.cell_list.emplace_back(); @@ -158,6 +163,9 @@ void test_rrc_sa_connection() rrc_cfg_nr.cell_list[0].duplex_mode = SRSRAN_DUPLEX_MODE_FDD; rrc_cfg_nr.is_standalone = true; rrc_cfg_nr.enb_id = 0x19B; + rrc_cfg_nr.five_qi_cfg[9].configured = true; + rrc_cfg_nr.five_qi_cfg[9].rlc_cfg = rlc_cfg; + rrc_cfg_nr.five_qi_cfg[9].pdcp_cfg = {}; srsran::string_to_mcc("001", &rrc_cfg_nr.mcc); srsran::string_to_mnc("01", &rrc_cfg_nr.mnc); set_derived_nr_cell_params(rrc_cfg_nr.is_standalone, rrc_cfg_nr.cell_list[0]); diff --git a/srsgnb/src/stack/rrc/test/rrc_nr_test_helpers.cc b/srsgnb/src/stack/rrc/test/rrc_nr_test_helpers.cc index c183437bf..954e24a9f 100644 --- a/srsgnb/src/stack/rrc/test/rrc_nr_test_helpers.cc +++ b/srsgnb/src/stack/rrc/test/rrc_nr_test_helpers.cc @@ -314,14 +314,14 @@ void test_rrc_nr_2nd_reconfiguration(srsran::task_scheduler& task_sched, asn1::unbounded_octstring NAS_msg; NAS_msg.from_string("c574defc80ba722bffb8eacb6f8a163e3222cf1542ac529f6980bb15e0bf12d9f2b29f11fb458ec9"); - // STEP 2 - Trigger and send RRCReconfiguration command (gNB -> UE) - rrc_obj.establish_rrc_bearer(rnti, 1, NAS_msg, srsran::srb_to_lcid(srsran::nr_srb::srb1), 9); - // Test whether there exists the SRB1 initiated in the Connection Establishment // We test this as the SRB1 was set up in a different function TESTASSERT_EQ(rnti, pdcp.last_sdu_rnti); TESTASSERT_EQ(srsran::srb_to_lcid(srsran::nr_srb::srb1), pdcp.last_sdu_lcid); + // STEP 2 - Trigger and send RRCReconfiguration command (gNB -> UE) + rrc_obj.establish_rrc_bearer(rnti, 1, NAS_msg, 4, 9); + dl_dcch_msg_s dl_dcch_msg; { asn1::cbit_ref bref{pdcp.last_sdu->data(), pdcp.last_sdu->size()};