diff --git a/srsgnb/src/stack/rrc/test/rrc_nr_test.cc b/srsgnb/src/stack/rrc/test/rrc_nr_test.cc index 24998dc21..3ad72f34f 100644 --- a/srsgnb/src/stack/rrc/test/rrc_nr_test.cc +++ b/srsgnb/src/stack/rrc/test/rrc_nr_test.cc @@ -162,6 +162,7 @@ void test_rrc_sa_connection() test_rrc_nr_info_transfer(task_sched, rrc_obj, pdcp_obj, ngap_obj, 0x4601); test_rrc_nr_security_mode_cmd(task_sched, rrc_obj, pdcp_obj, 0x4601); test_rrc_nr_reconfiguration( task_sched, rrc_obj, pdcp_obj, 0x4601); + test_rrc_nr_reconfiguration_II( task_sched, rrc_obj, pdcp_obj, 0x4601); } } // namespace srsenb 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 33565c68f..278198a81 100644 --- a/srsgnb/src/stack/rrc/test/rrc_nr_test_helpers.cc +++ b/srsgnb/src/stack/rrc/test/rrc_nr_test_helpers.cc @@ -296,8 +296,8 @@ void test_rrc_nr_reconfiguration(srsran::task_scheduler& task_sched, rrc_obj.write_pdu(rnti, 1, std::move(pdu)); } -#if 0 -void test_rrc_nr_reconfiguration(srsran::task_scheduler& task_sched, + +void test_rrc_nr_reconfiguration_II(srsran::task_scheduler& task_sched, rrc_nr& rrc_obj, pdcp_nr_rrc_tester& pdcp, uint16_t rnti) @@ -309,7 +309,7 @@ void test_rrc_nr_reconfiguration(srsran::task_scheduler& task_sched, NAS_msg.from_string("c574defc80ba722bffb8eacb6f8a163e3222cf1542ac529f6980bb15e0bf12d9f2b29f11fb458ec9"); // STEP 2 - Trigger and send RRCReconfiguration command (gNB -> UE) - //rrc_obj.start_rrc_reconfiguration(rnti); + rrc_obj.establish_rrc_bearer(rnti, 1, NAS_msg, srsran::srb_to_lcid(srsran::nr_srb::srb1)); // Test whether there exists the SRB1 initiated in the Connection Establishment // We test this as the SRB1 was set up in a different function @@ -376,6 +376,5 @@ void test_rrc_nr_reconfiguration(srsran::task_scheduler& task_sched, // send message to RRC rrc_obj.write_pdu(rnti, 1, std::move(pdu)); } -#endif } // namespace srsenb diff --git a/srsgnb/src/stack/rrc/test/rrc_nr_test_helpers.h b/srsgnb/src/stack/rrc/test/rrc_nr_test_helpers.h index 166cb1c65..3697c9ad4 100644 --- a/srsgnb/src/stack/rrc/test/rrc_nr_test_helpers.h +++ b/srsgnb/src/stack/rrc/test/rrc_nr_test_helpers.h @@ -70,8 +70,8 @@ public: memcpy(last_pdu.data(), pdu.data(), pdu.size()); } - uint16_t last_sdu_rnti; - asn1::dyn_octstring last_pdu; + uint16_t last_sdu_rnti; + asn1::dyn_octstring last_pdu; }; /** @@ -93,10 +93,10 @@ void test_rrc_nr_connection_establishment(srsran::task_scheduler& task_sched, uint16_t rnti); void test_rrc_nr_info_transfer(srsran::task_scheduler& task_sched, - rrc_nr& rrc_obj, - pdcp_nr_rrc_tester& pdcp, - ngap_rrc_tester& ngap, - uint16_t rnti); + rrc_nr& rrc_obj, + pdcp_nr_rrc_tester& pdcp, + ngap_rrc_tester& ngap, + uint16_t rnti); void test_rrc_nr_security_mode_cmd(srsran::task_scheduler& task_sched, rrc_nr& rrc_obj, @@ -104,9 +104,14 @@ void test_rrc_nr_security_mode_cmd(srsran::task_scheduler& task_sched, uint16_t rnti); void test_rrc_nr_reconfiguration(srsran::task_scheduler& task_sched, - rrc_nr& rrc_obj, - pdcp_nr_rrc_tester& pdcp, - uint16_t rnti); + rrc_nr& rrc_obj, + pdcp_nr_rrc_tester& pdcp, + uint16_t rnti); + +void test_rrc_nr_reconfiguration_II(srsran::task_scheduler& task_sched, + rrc_nr& rrc_obj, + pdcp_nr_rrc_tester& pdcp, + uint16_t rnti); } // namespace srsenb