cu_cp,ngap: revert skipping rrc release

Author: FabianEckermann

lib/ngap/ngap_impl.cpp

@@ -691,14 +691,6 @@ void ngap_impl::handle_ue_context_release_command(const asn1::ngap::ue_context_r
   msg.ue_index = ue_ctxt.ue_ids.ue_index;
   fill_cu_cp_ue_context_release_command(msg, cmd);
 
-  // When release cause is of type nas-normal-release or nas-deregister, then no RRC release is required
-  if (cmd->cause.type() == asn1::ngap::cause_c::types_opts::nas) {
-    if (cmd->cause.nas().value == cause_nas_opts::normal_release or
-        cmd->cause.nas().value == cause_nas_opts::deregister) {
-      msg.requires_rrc_release = false;
-    }
-  }
-
   // start routine
   ue->schedule_async_task(launch_async<ngap_ue_context_release_procedure>(
       msg, ue_ctxt.ue_ids, stored_error_indications, cu_cp_notifier, *tx_pdu_notifier, ue_ctxt.logger));

tests/unittests/cu_cp/routines/ue_context_release_routine_test.cpp

@@ -75,37 +75,3 @@ TEST_F(ue_context_release_test, when_ue_context_release_command_received_then_re
   // nothing has failed to be released
   ASSERT_TRUE(was_ue_context_release_successful());
 }
-
-TEST_F(ue_context_release_test,
-       when_ue_context_release_command_with_cause_normal_release_received_then_no_rrc_release_is_sent)
-{
-  // Add UE
-  ue_index_t ue_index = add_ue(MIN_PCI, rnti_t::MIN_CRNTI);
-
-  // Generate UE context release command message
-  cu_cp_ue_context_release_command ue_context_release_command =
-      generate_ue_context_release_command(ue_index, cause_nas_t::normal_release);
-  this->start_procedure(ue_context_release_command, {true}, {true});
-
-  // nothing has failed to be released
-  ASSERT_TRUE(was_ue_context_release_successful());
-
-  ASSERT_TRUE(f1ap_ue_ctxt_mng.last_release_command.rrc_release_pdu.empty());
-}
-
-TEST_F(ue_context_release_test,
-       when_ue_context_release_command_with_cause_deregister_received_then_no_rrc_release_is_sent)
-{
-  // Add UE
-  ue_index_t ue_index = add_ue(MIN_PCI, rnti_t::MIN_CRNTI);
-
-  // Generate UE context release command message
-  cu_cp_ue_context_release_command ue_context_release_command =
-      generate_ue_context_release_command(ue_index, cause_nas_t::deregister);
-  this->start_procedure(ue_context_release_command, {true}, {true});
-
-  // nothing has failed to be released
-  ASSERT_TRUE(was_ue_context_release_successful());
-
-  ASSERT_TRUE(f1ap_ue_ctxt_mng.last_release_command.rrc_release_pdu.empty());
-}