cu_cp,ngap,du_processor,f1ap: Add rrc release container to f1ap ue context release command

FabianEckermann · codebot · commit 24e4ed40a7a8 · 2023-06-19T14:07:36.000Z
diff --git a/include/srsran/cu_cp/cu_cp_types.h b/include/srsran/cu_cp/cu_cp_types.h
@@ -656,11 +656,17 @@ struct cu_cp_ue_capability_transfer_request {
   // Empty for now but should include ratType and capabilityRequestFilter, etc.
 };
 
-struct cu_cp_ue_context_release_command {
+struct cu_cp_ngap_ue_context_release_command {
   ue_index_t ue_index = ue_index_t::invalid;
   cause_t    cause    = cause_t::nulltype;
 };
 
+struct cu_cp_ue_context_release_command {
+  ue_index_t  ue_index = ue_index_t::invalid;
+  cause_t     cause    = cause_t::nulltype;
+  byte_buffer rrc_release_pdu;
+};
+
 struct cu_cp_ue_context_release_request {
   ue_index_t                    ue_index = ue_index_t::invalid;
   std::vector<pdu_session_id_t> pdu_session_res_list_cxt_rel_req;
diff --git a/include/srsran/cu_cp/du_processor.h b/include/srsran/cu_cp/du_processor.h
@@ -224,7 +224,7 @@ class du_processor_ngap_interface
   /// \brief Handle a UE Context Release Command.
   /// \param[in] cmd The UE Context Release Command.
   virtual cu_cp_ue_context_release_complete
-  handle_new_ue_context_release_command(const cu_cp_ue_context_release_command& cmd) = 0;
+  handle_new_ue_context_release_command(const cu_cp_ngap_ue_context_release_command& cmd) = 0;
 };
 
 /// Interface to notify the NGAP about control messages.
diff --git a/include/srsran/f1ap/cu_cp/f1ap_cu.h b/include/srsran/f1ap/cu_cp/f1ap_cu.h
@@ -12,8 +12,6 @@
 
 #include "../common/f1ap_types.h"
 #include "srsran/adt/byte_buffer.h"
-#include "srsran/adt/expected.h"
-#include "srsran/asn1/f1ap/f1ap.h"
 #include "srsran/cu_cp/cu_cp_types.h"
 #include "srsran/f1ap/common/f1ap_common.h"
 #include "srsran/f1ap/cu_cp/f1ap_cu_ue_context_update.h"
@@ -62,8 +60,9 @@ class f1ap_connection_manager
 };
 
 struct f1ap_ue_context_release_command {
-  ue_index_t ue_index = ue_index_t::invalid;
-  cause_t    cause;
+  ue_index_t  ue_index = ue_index_t::invalid;
+  cause_t     cause;
+  byte_buffer rrc_release_pdu;
 };
 
 struct f1ap_ue_context_release_complete {
diff --git a/include/srsran/ngap/ngap.h b/include/srsran/ngap/ngap.h
@@ -197,7 +197,7 @@ class ngap_du_processor_control_notifier
   /// \param[in] command the UE Context Release Command.
   /// \returns The UE Context Release Complete.
   virtual cu_cp_ue_context_release_complete
-  on_new_ue_context_release_command(cu_cp_ue_context_release_command& command) = 0;
+  on_new_ue_context_release_command(const cu_cp_ngap_ue_context_release_command& command) = 0;
 };
 
 /// Interface to control the NGAP.
diff --git a/include/srsran/rrc/rrc_ue.h b/include/srsran/rrc/rrc_ue.h
@@ -11,9 +11,7 @@
 #pragma once
 
 #include "rrc_cell_context.h"
-#include "srsran/adt/bounded_bitset.h"
 #include "srsran/adt/byte_buffer.h"
-#include "srsran/asn1/rrc_nr/rrc_nr.h"
 #include "srsran/cu_cp/cu_cp_types.h"
 #include "srsran/cu_cp/up_resource_manager.h"
 #include "srsran/rrc/rrc.h"
diff --git a/lib/cu_cp/adapters/ngap_adapters.h b/lib/cu_cp/adapters/ngap_adapters.h
@@ -171,7 +171,7 @@ class ngap_du_processor_adapter : public ngap_du_processor_control_notifier
   }
 
   cu_cp_ue_context_release_complete
-  on_new_ue_context_release_command(cu_cp_ue_context_release_command& command) override
+  on_new_ue_context_release_command(const cu_cp_ngap_ue_context_release_command& command) override
   {
     srsran_assert(du_processor_ngap_handler != nullptr, "DU Processor handler must not be nullptr");
 
diff --git a/lib/cu_cp/du_processor_impl.cpp b/lib/cu_cp/du_processor_impl.cpp
@@ -446,7 +446,7 @@ du_processor_impl::handle_new_pdu_session_resource_release_command(
 }
 
 cu_cp_ue_context_release_complete
-du_processor_impl::handle_new_ue_context_release_command(const cu_cp_ue_context_release_command& cmd)
+du_processor_impl::handle_new_ue_context_release_command(const cu_cp_ngap_ue_context_release_command& cmd)
 {
   du_ue* ue = ue_manager.find_du_ue(cmd.ue_index);
   srsran_assert(ue != nullptr, "Could not find DU UE");
@@ -460,7 +460,13 @@ du_processor_impl::handle_new_ue_context_release_command(const cu_cp_ue_context_
   rrc_ue_release_context release_context = ue->get_rrc_ue_notifier().get_rrc_ue_release_context();
   release_complete.user_location_info    = release_context.user_location_info;
 
-  handle_ue_context_release_command(cmd);
+  // Create release command from NGAP UE context release command
+  cu_cp_ue_context_release_command release_command;
+  release_command.ue_index        = cmd.ue_index;
+  release_command.cause           = cmd.cause;
+  release_command.rrc_release_pdu = release_context.rrc_release_pdu.copy();
+
+  handle_ue_context_release_command(release_command);
 
   return release_complete;
 }
diff --git a/lib/cu_cp/du_processor_impl.h b/lib/cu_cp/du_processor_impl.h
@@ -14,8 +14,6 @@
 #include "adapters/f1ap_adapters.h"
 #include "adapters/rrc_ue_adapters.h"
 #include "routine_managers/du_processor_routine_manager.h"
-#include "ue_manager_impl.h"
-#include "srsran/asn1/rrc_nr/rrc_nr.h"
 #include "srsran/cu_cp/cu_cp_types.h"
 #include "srsran/cu_cp/du_processor_config.h"
 #include "srsran/f1ap/cu_cp/f1ap_cu.h"
@@ -78,7 +76,7 @@ class du_processor_impl : public du_processor_interface
   async_task<cu_cp_pdu_session_resource_release_response>
   handle_new_pdu_session_resource_release_command(const cu_cp_pdu_session_resource_release_command& msg) override;
   cu_cp_ue_context_release_complete
-  handle_new_ue_context_release_command(const cu_cp_ue_context_release_command& cmd) override;
+  handle_new_ue_context_release_command(const cu_cp_ngap_ue_context_release_command& cmd) override;
 
   // du_processor paging handler
   void handle_paging_message(cu_cp_paging_message& msg) override;
diff --git a/lib/cu_cp/routines/ue_context_release_routine.cpp b/lib/cu_cp/routines/ue_context_release_routine.cpp
@@ -49,8 +49,9 @@ void ue_context_release_routine::operator()(coro_context<async_task<void>>& ctx)
 
   {
     // prepare F1AP UE Context Release Command and call F1AP notifier
-    f1ap_ue_context_release_cmd.ue_index = command.ue_index;
-    f1ap_ue_context_release_cmd.cause    = command.cause;
+    f1ap_ue_context_release_cmd.ue_index        = command.ue_index;
+    f1ap_ue_context_release_cmd.cause           = command.cause;
+    f1ap_ue_context_release_cmd.rrc_release_pdu = command.rrc_release_pdu.copy();
 
     CORO_AWAIT_VALUE(f1ap_ue_context_release_result,
                      f1ap_ue_ctxt_notifier.on_ue_context_release_command(f1ap_ue_context_release_cmd));
diff --git a/lib/f1ap/cu_cp/procedures/ue_context_release_procedure.cpp b/lib/f1ap/cu_cp/procedures/ue_context_release_procedure.cpp
@@ -24,6 +24,10 @@ ue_context_release_procedure::ue_context_release_procedure(f1ap_ue_context_list&
   command->gnb_cu_ue_f1ap_id.value = gnb_cu_ue_f1ap_id_to_uint(ue_ctxt.cu_ue_f1ap_id);
   command->gnb_du_ue_f1ap_id.value = gnb_du_ue_f1ap_id_to_uint(ue_ctxt.du_ue_f1ap_id);
   command->cause.value             = cause_to_f1ap_cause(cmd_.cause);
+  if (!cmd_.rrc_release_pdu.empty()) {
+    command->rrc_container_present = true;
+    command->rrc_container.value   = cmd_.rrc_release_pdu.copy();
+  }
 }
 
 void ue_context_release_procedure::operator()(coro_context<async_task<ue_index_t>>& ctx)
diff --git a/lib/ngap/ngap_asn1_helpers.h b/lib/ngap/ngap_asn1_helpers.h
@@ -580,11 +580,11 @@ fill_asn1_pdu_session_resource_release_response(asn1::ngap::pdu_session_res_rele
 }
 
 /// \brief Convert NGAP ASN1 UE Context Release Command ASN1 struct to common type.
-/// \param[out] cu_cp_ue_context_release_cmd The cu_cp_ue_context_release_cmd struct to fill.
+/// \param[out] cu_cp_ngap_ue_context_release_cmd The cu_cp_ngap_ue_context_release_cmd struct to fill.
 /// \param[in] asn1_ue_context_release_cmd The UE Context Release Command ASN1 struct.
 inline void
-fill_cu_cp_ue_context_release_command(cu_cp_ue_context_release_command&           cu_cp_ue_context_release_cmd,
-                                      const asn1::ngap::ue_context_release_cmd_s& asn1_ue_context_release_cmd)
+fill_cu_cp_ngap_ue_context_release_command(cu_cp_ngap_ue_context_release_command&      cu_cp_ue_context_release_cmd,
+                                           const asn1::ngap::ue_context_release_cmd_s& asn1_ue_context_release_cmd)
 {
   cu_cp_ue_context_release_cmd.cause = ngap_cause_to_cause(asn1_ue_context_release_cmd->cause.value);
 }
diff --git a/lib/ngap/ngap_impl.cpp b/lib/ngap/ngap_impl.cpp
@@ -385,9 +385,9 @@ void ngap_impl::handle_ue_context_release_command(const asn1::ngap::ue_context_r
   logger.info("ue={} Received UeContextReleaseCommand (ran_ue_id={})", ue_index, ue->get_ran_ue_id());
 
   // Convert to common type
-  cu_cp_ue_context_release_command msg;
+  cu_cp_ngap_ue_context_release_command msg;
   msg.ue_index = ue_index;
-  fill_cu_cp_ue_context_release_command(msg, cmd);
+  fill_cu_cp_ngap_ue_context_release_command(msg, cmd);
 
   // Notify DU processor about UE Context Release Command
   cu_cp_ue_context_release_complete ue_context_release_complete =
diff --git a/lib/ngap/procedures/ngap_initial_context_setup_procedure.cpp b/lib/ngap/procedures/ngap_initial_context_setup_procedure.cpp
@@ -64,9 +64,9 @@ void ngap_initial_context_setup_procedure::operator()(coro_context<async_task<vo
     send_initial_context_setup_failure(fail_msg, ue->get_amf_ue_id(), ue->get_ran_ue_id());
 
     // Release UE
-    cu_cp_ue_context_release_command rel_cmd = {};
-    rel_cmd.ue_index                         = ue->get_ue_index();
-    rel_cmd.cause                            = cause_t::protocol;
+    cu_cp_ngap_ue_context_release_command rel_cmd = {};
+    rel_cmd.ue_index                              = ue->get_ue_index();
+    rel_cmd.cause                                 = cause_t::protocol;
 
     ue->get_du_processor_control_notifier().on_new_ue_context_release_command(rel_cmd);
 
diff --git a/tests/unittests/ngap/test_helpers.h b/tests/unittests/ngap/test_helpers.h
@@ -10,14 +10,9 @@
 
 #pragma once
 
-#include "lib/ngap/ngap_asn1_helpers.h"
 #include "ngap_test_messages.h"
-#include "srsran/cu_cp/cu_cp.h"
 #include "srsran/cu_cp/cu_cp_types.h"
 #include "srsran/cu_cp/ue_manager.h"
-#include "srsran/e1ap/cu_cp/e1ap_cu_cp.h"
-#include "srsran/gateways/network_gateway.h"
-#include "srsran/ngap/ngap.h"
 #include "srsran/pcap/pcap.h"
 #include "srsran/support/async/async_task_loop.h"
 #include <gtest/gtest.h>
@@ -423,11 +418,12 @@ class dummy_ngap_du_processor_notifier : public ngap_du_processor_control_notifi
   }
 
   cu_cp_ue_context_release_complete
-  on_new_ue_context_release_command(cu_cp_ue_context_release_command& command) override
+  on_new_ue_context_release_command(const cu_cp_ngap_ue_context_release_command& command) override
   {
     logger.info("Received a new UE Context Release Command");
 
-    last_command = command;
+    last_command.ue_index = command.ue_index;
+    last_command.cause    = command.cause;
 
     cu_cp_ue_context_release_complete release_complete;
     // TODO: Add values
diff --git a/tests/unittests/rrc/test_helpers.h b/tests/unittests/rrc/test_helpers.h
@@ -84,7 +84,9 @@ class dummy_rrc_ue_du_processor_adapter : public rrc_ue_du_processor_notifier
   void on_ue_context_release_command(const cu_cp_ue_context_release_command& msg) override
   {
     logger.info("Received UE Context Release Command");
-    last_cu_cp_ue_context_release_command = msg;
+    last_cu_cp_ue_context_release_command.ue_index        = msg.ue_index;
+    last_cu_cp_ue_context_release_command.cause           = msg.cause;
+    last_cu_cp_ue_context_release_command.rrc_release_pdu = msg.rrc_release_pdu.copy();
   }
 
   void on_rrc_reestablishment_context_modification_required(ue_index_t ue_index) override

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ class ngap_du_processor_adapter : public ngap_du_processor_control_notifier`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`cu_cp_ue_context_release_complete`
`174`		`- on_new_ue_context_release_command(cu_cp_ue_context_release_command& command) override`
	`174`	`+ on_new_ue_context_release_command(const cu_cp_ngap_ue_context_release_command& command) override`
`175`	`175`	`{`
`176`	`176`	`srsran_assert(du_processor_ngap_handler != nullptr, "DU Processor handler must not be nullptr");`
`177`	`177`