cu_cp: fix pre-mature release of DRB1 in inter-du intra-gnb ho

Author: alvasMan

lib/cu_cp/routines/mobility/handover_reconfiguration_routine.cpp

@@ -105,9 +105,8 @@ void handover_reconfiguration_routine::operator()(coro_context<async_task<bool>>
 
 void handover_reconfiguration_routine::generate_ue_context_modification_request()
 {
-  ue_context_mod_request.ue_index                 = source_ue.get_ue_index();
-  ue_context_mod_request.drbs_to_be_released_list = source_ue.get_up_resource_manager().get_drbs();
-  ue_context_mod_request.rrc_container            = ho_reconf_ctxt.rrc_ue_handover_reconfiguration_pdu.copy();
+  ue_context_mod_request.ue_index      = source_ue.get_ue_index();
+  ue_context_mod_request.rrc_container = ho_reconf_ctxt.rrc_ue_handover_reconfiguration_pdu.copy();
 
   // Stop data transmission for the UE on the source DU (see TS 38.473 section 8.3.4.2).
   ue_context_mod_request.tx_action_ind = f1ap_tx_action_ind::stop;

tests/unittests/cu_cp/mobility/handover_reconfiguration_routine_test.cpp

@@ -301,6 +301,11 @@ class handover_reconfiguration_routine_test : public mobility_test
 
   bool check_transaction_id(unsigned transaction_id) { return cu_cp_handler.last_transaction_id == transaction_id; }
 
+  const f1ap_ue_context_modification_request& get_source_f1ap_ctxt_mod_request()
+  {
+    return source_f1ap_ue_ctxt_mng.get_ctxt_mod_request();
+  }
+
 private:
   // source UE parameters.
   du_index_t                    source_du_index = uint_to_du_index(0);
@@ -339,6 +344,11 @@ TEST_F(handover_reconfiguration_routine_test, when_reconfiguration_successful_th
   ASSERT_TRUE(get_result());
 
   ASSERT_TRUE(check_transaction_id(test_transaction_id));
+
+  // Make sure that the source UP context was not modified.
+  f1ap_ue_context_modification_request context_mod = get_source_f1ap_ctxt_mod_request();
+  ASSERT_TRUE(context_mod.drbs_to_be_setup_mod_list.empty());
+  ASSERT_TRUE(context_mod.drbs_to_be_released_list.empty());
 }
 
 TEST_F(handover_reconfiguration_routine_test, when_ue_context_mod_unsuccessful_then_return_false)