cu_cp.rrc: Move ue context release struct to rrc

FabianEckermann · codebot · commit a5915bc4384b · 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
@@ -661,12 +661,6 @@ struct cu_cp_ngap_ue_context_release_command {
   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
@@ -176,7 +176,7 @@ class du_processor_rrc_ue_interface : public du_processor_srb_interface
 
   /// \brief Handle a UE Context Release Command
   /// \param[in] cmd The UE Context Release Command.
-  virtual void handle_ue_context_release_command(const cu_cp_ue_context_release_command& cmd) = 0;
+  virtual void handle_ue_context_release_command(const rrc_ue_context_release_command& cmd) = 0;
 
   /// \brief Handle a required reestablishment context modification.
   /// \param[in] ue_index The index of the UE that needs the context modification.
diff --git a/include/srsran/rrc/rrc_ue.h b/include/srsran/rrc/rrc_ue.h
@@ -169,6 +169,12 @@ class rrc_ue_reestablishment_proc_notifier
   virtual void on_ue_delete_request(const cause_t& cause) = 0;
 };
 
+struct rrc_ue_context_release_command {
+  ue_index_t  ue_index = ue_index_t::invalid;
+  cause_t     cause    = cause_t::nulltype;
+  byte_buffer rrc_release_pdu;
+};
+
 /// Interface to notify about RRC UE Context messages.
 class rrc_ue_du_processor_notifier
 {
@@ -181,7 +187,7 @@ class rrc_ue_du_processor_notifier
 
   /// \brief Notify about a UE Context Release Command.
   /// \param[in] cmd The UE Context Release Command.
-  virtual void on_ue_context_release_command(const cu_cp_ue_context_release_command& cmd) = 0;
+  virtual void on_ue_context_release_command(const rrc_ue_context_release_command& cmd) = 0;
 
   /// \brief Notify about a required reestablishment context modification.
   /// \param[in] ue_index The index of the UE that needs the context modification.
diff --git a/lib/cu_cp/adapters/rrc_ue_adapters.h b/lib/cu_cp/adapters/rrc_ue_adapters.h
@@ -57,7 +57,7 @@ class rrc_ue_du_processor_adapter : public rrc_ue_du_processor_notifier
 
   void on_create_srb(const srb_creation_message& msg) override { du_processor_rrc_ue_handler->create_srb(msg); }
 
-  void on_ue_context_release_command(const cu_cp_ue_context_release_command& cmd) override
+  void on_ue_context_release_command(const rrc_ue_context_release_command& cmd) override
   {
     srsran_assert(du_processor_rrc_ue_handler != nullptr, "DU processor handler must not be nullptr");
     du_processor_rrc_ue_handler->handle_ue_context_release_command(cmd);
diff --git a/lib/cu_cp/du_processor_impl.cpp b/lib/cu_cp/du_processor_impl.cpp
@@ -370,7 +370,7 @@ void du_processor_impl::create_srb(const srb_creation_message& msg)
   }
 }
 
-void du_processor_impl::handle_ue_context_release_command(const cu_cp_ue_context_release_command& cmd)
+void du_processor_impl::handle_ue_context_release_command(const rrc_ue_context_release_command& cmd)
 {
   rrc_ue_interface* rrc_ue = rrc->find_ue(cmd.ue_index);
   srsran_assert(rrc_ue != nullptr, "ue={} Could not find RRC UE", cmd.ue_index);
@@ -461,7 +461,7 @@ du_processor_impl::handle_new_ue_context_release_command(const cu_cp_ngap_ue_con
   release_complete.user_location_info    = release_context.user_location_info;
 
   // Create release command from NGAP UE context release command
-  cu_cp_ue_context_release_command release_command;
+  rrc_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();
diff --git a/lib/cu_cp/du_processor_impl.h b/lib/cu_cp/du_processor_impl.h
@@ -65,7 +65,7 @@ class du_processor_impl : public du_processor_interface
   // du_processor_rrc_ue_interface
   /// \brief Create SRB entry in bearer list and add adapter handle.
   void create_srb(const srb_creation_message& msg) override;
-  void handle_ue_context_release_command(const cu_cp_ue_context_release_command& cmd) override;
+  void handle_ue_context_release_command(const rrc_ue_context_release_command& cmd) override;
   void handle_rrc_reestablishment_context_modification_required(ue_index_t ue_index) override;
 
   // du_processor_ngap_interface
diff --git a/lib/cu_cp/routine_managers/du_processor_routine_manager.cpp b/lib/cu_cp/routine_managers/du_processor_routine_manager.cpp
@@ -70,7 +70,7 @@ du_processor_routine_manager::start_pdu_session_resource_release_routine(
 }
 
 async_task<void>
-du_processor_routine_manager::start_ue_context_release_routine(const cu_cp_ue_context_release_command& command,
+du_processor_routine_manager::start_ue_context_release_routine(const rrc_ue_context_release_command& command,
                                                                up_resource_manager& ue_up_resource_manager)
 {
   return launch_async<ue_context_release_routine>(
diff --git a/lib/cu_cp/routine_managers/du_processor_routine_manager.h b/lib/cu_cp/routine_managers/du_processor_routine_manager.h
@@ -44,8 +44,8 @@ class du_processor_routine_manager
                                                   du_processor_rrc_ue_control_message_notifier&    rrc_ue_ctrl_notifier,
                                                   up_resource_manager& rrc_ue_up_resource_manager);
 
-  async_task<void> start_ue_context_release_routine(const cu_cp_ue_context_release_command& command,
-                                                    up_resource_manager&                    rrc_ue_up_resource_manager);
+  async_task<void> start_ue_context_release_routine(const rrc_ue_context_release_command& command,
+                                                    up_resource_manager&                  rrc_ue_up_resource_manager);
 
   async_task<bool>
   start_reestablishment_context_modification_routine(ue_index_t                                    ue_index,
diff --git a/lib/cu_cp/routines/ue_context_release_routine.cpp b/lib/cu_cp/routines/ue_context_release_routine.cpp
@@ -14,13 +14,13 @@ using namespace srsran;
 using namespace srsran::srs_cu_cp;
 using namespace asn1::rrc_nr;
 
-ue_context_release_routine::ue_context_release_routine(const cu_cp_ue_context_release_command& command_,
-                                                       du_processor_e1ap_control_notifier&     e1ap_ctrl_notif_,
-                                                       du_processor_f1ap_ue_context_notifier&  f1ap_ue_ctxt_notif_,
-                                                       du_processor_rrc_du_ue_notifier&        rrc_du_notifier_,
-                                                       du_processor_ue_manager&                ue_manager_,
-                                                       up_resource_manager&                    ue_up_resource_manager_,
-                                                       srslog::basic_logger&                   logger_) :
+ue_context_release_routine::ue_context_release_routine(const rrc_ue_context_release_command&  command_,
+                                                       du_processor_e1ap_control_notifier&    e1ap_ctrl_notif_,
+                                                       du_processor_f1ap_ue_context_notifier& f1ap_ue_ctxt_notif_,
+                                                       du_processor_rrc_du_ue_notifier&       rrc_du_notifier_,
+                                                       du_processor_ue_manager&               ue_manager_,
+                                                       up_resource_manager&                   ue_up_resource_manager_,
+                                                       srslog::basic_logger&                  logger_) :
   command(command_),
   e1ap_ctrl_notifier(e1ap_ctrl_notif_),
   f1ap_ue_ctxt_notifier(f1ap_ue_ctxt_notif_),
diff --git a/lib/cu_cp/routines/ue_context_release_routine.h b/lib/cu_cp/routines/ue_context_release_routine.h
@@ -23,20 +23,20 @@ namespace srs_cu_cp {
 class ue_context_release_routine
 {
 public:
-  ue_context_release_routine(const cu_cp_ue_context_release_command& command_,
-                             du_processor_e1ap_control_notifier&     e1ap_ctrl_notif_,
-                             du_processor_f1ap_ue_context_notifier&  f1ap_ue_ctxt_notif_,
-                             du_processor_rrc_du_ue_notifier&        rrc_du_notifier_,
-                             du_processor_ue_manager&                ue_manager_,
-                             up_resource_manager&                    ue_up_resource_manager_,
-                             srslog::basic_logger&                   logger_);
+  ue_context_release_routine(const rrc_ue_context_release_command&  command_,
+                             du_processor_e1ap_control_notifier&    e1ap_ctrl_notif_,
+                             du_processor_f1ap_ue_context_notifier& f1ap_ue_ctxt_notif_,
+                             du_processor_rrc_du_ue_notifier&       rrc_du_notifier_,
+                             du_processor_ue_manager&               ue_manager_,
+                             up_resource_manager&                   ue_up_resource_manager_,
+                             srslog::basic_logger&                  logger_);
 
   void operator()(coro_context<async_task<void>>& ctx);
 
   static const char* name() { return "UE Context Release Routine"; }
 
 private:
-  const cu_cp_ue_context_release_command command;
+  const rrc_ue_context_release_command command;
 
   du_processor_e1ap_control_notifier&    e1ap_ctrl_notifier;     // to trigger bearer context setup at CU-UP
   du_processor_f1ap_ue_context_notifier& f1ap_ue_ctxt_notifier;  // to trigger UE context modification at DU
diff --git a/lib/rrc/ue/rrc_ue_helpers.cpp b/lib/rrc/ue/rrc_ue_helpers.cpp
@@ -17,8 +17,8 @@ using namespace srs_cu_cp;
 void rrc_ue_impl::on_ue_delete_request(const cause_t& cause)
 {
   // FIXME: this enqueues a new CORO on top of an existing one.
-  cu_cp_ue_context_release_command msg = {};
-  msg.ue_index                         = context.ue_index;
-  msg.cause                            = cause;
+  rrc_ue_context_release_command msg = {};
+  msg.ue_index                       = context.ue_index;
+  msg.cause                          = cause;
   du_processor_notifier.on_ue_context_release_command(msg);
 }
diff --git a/tests/unittests/cu_cp/du_processor/du_processor_test.cpp b/tests/unittests/cu_cp/du_processor/du_processor_test.cpp
@@ -234,8 +234,7 @@ TEST_F(du_processor_test, when_ue_context_release_command_received_then_ue_delet
   ASSERT_EQ(du_processor_obj->get_nof_ues(), 1);
 
   // Generate UE context release command message
-  cu_cp_ue_context_release_command ue_context_release_command =
-      generate_ue_context_release_command(uint_to_ue_index(0));
+  rrc_ue_context_release_command ue_context_release_command = generate_ue_context_release_command(uint_to_ue_index(0));
 
   // Pass message to DU processor
   du_processor_obj->handle_ue_context_release_command(ue_context_release_command);
@@ -277,8 +276,7 @@ TEST_F(du_processor_test, when_valid_ue_creation_request_received_after_ue_was_r
   ASSERT_EQ(du_processor_obj->get_nof_ues(), MAX_NOF_UES_PER_DU);
 
   // Generate UE context release command message
-  cu_cp_ue_context_release_command ue_context_release_command =
-      generate_ue_context_release_command(uint_to_ue_index(0));
+  rrc_ue_context_release_command ue_context_release_command = generate_ue_context_release_command(uint_to_ue_index(0));
 
   // Pass message to DU processor
   du_processor_obj->handle_ue_context_release_command(ue_context_release_command);
diff --git a/tests/unittests/cu_cp/du_processor_test_messages.cpp b/tests/unittests/cu_cp/du_processor_test_messages.cpp
@@ -68,11 +68,11 @@ ue_creation_message srsran::srs_cu_cp::generate_ue_creation_message(rnti_t c_rnt
   return ue_creation_msg;
 }
 
-cu_cp_ue_context_release_command srsran::srs_cu_cp::generate_ue_context_release_command(ue_index_t ue_index)
+rrc_ue_context_release_command srsran::srs_cu_cp::generate_ue_context_release_command(ue_index_t ue_index)
 {
-  cu_cp_ue_context_release_command ue_context_release_command = {};
-  ue_context_release_command.ue_index                         = ue_index;
-  ue_context_release_command.cause                            = cause_t::radio_network;
+  rrc_ue_context_release_command ue_context_release_command = {};
+  ue_context_release_command.ue_index                       = ue_index;
+  ue_context_release_command.cause                          = cause_t::radio_network;
   return ue_context_release_command;
 }
 
diff --git a/tests/unittests/cu_cp/du_processor_test_messages.h b/tests/unittests/cu_cp/du_processor_test_messages.h
@@ -35,7 +35,7 @@ ue_creation_message generate_ue_creation_message(rnti_t c_rnti, unsigned nrcell_
 /// \brief Generate a dummy UE Context Release Command.
 /// \param[in] ue_index The UE Index to use.
 /// \return The dummy UE Context Release Command.
-cu_cp_ue_context_release_command generate_ue_context_release_command(ue_index_t ue_index);
+rrc_ue_context_release_command generate_ue_context_release_command(ue_index_t ue_index);
 
 /// \brief Generate a dummy PDU Session Resource Setup request.
 cu_cp_pdu_session_resource_setup_request generate_pdu_session_resource_setup(unsigned num_pdu_sessions = 1,
diff --git a/tests/unittests/ngap/test_helpers.h b/tests/unittests/ngap/test_helpers.h
@@ -430,7 +430,7 @@ class dummy_ngap_du_processor_notifier : public ngap_du_processor_control_notifi
     return release_complete;
   }
 
-  cu_cp_ue_context_release_command           last_command;
+  rrc_ue_context_release_command             last_command;
   cu_cp_pdu_session_resource_setup_request   last_request;
   cu_cp_pdu_session_resource_modify_request  last_modify_request;
   cu_cp_pdu_session_resource_release_command last_release_command;
diff --git a/tests/unittests/rrc/rrc_ue_test_helpers.h b/tests/unittests/rrc/rrc_ue_test_helpers.h
@@ -196,12 +196,12 @@ class rrc_ue_test_helper
 
   void check_ue_release_not_requested()
   {
-    ASSERT_NE(rrc_ue_ev_notifier.last_cu_cp_ue_context_release_command.ue_index, ALLOCATED_UE_INDEX);
+    ASSERT_NE(rrc_ue_ev_notifier.last_rrc_ue_context_release_command.ue_index, ALLOCATED_UE_INDEX);
   }
 
   void check_ue_release_requested()
   {
-    ASSERT_EQ(rrc_ue_ev_notifier.last_cu_cp_ue_context_release_command.ue_index, ALLOCATED_UE_INDEX);
+    ASSERT_EQ(rrc_ue_ev_notifier.last_rrc_ue_context_release_command.ue_index, ALLOCATED_UE_INDEX);
   }
 
   void receive_smc_complete()
diff --git a/tests/unittests/rrc/test_helpers.h b/tests/unittests/rrc/test_helpers.h
@@ -81,23 +81,23 @@ class dummy_rrc_ue_du_processor_adapter : public rrc_ue_du_processor_notifier
     last_srb_creation_message = std::move(msg);
   }
 
-  void on_ue_context_release_command(const cu_cp_ue_context_release_command& msg) override
+  void on_ue_context_release_command(const rrc_ue_context_release_command& msg) override
   {
     logger.info("Received UE Context Release Command");
-    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();
+    last_rrc_ue_context_release_command.ue_index        = msg.ue_index;
+    last_rrc_ue_context_release_command.cause           = msg.cause;
+    last_rrc_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
   {
     logger.info("Received Reestablishment Context Modification Required for ue={}", ue_index);
   }
 
-  srb_creation_message             last_srb_creation_message;
-  bool                             srb1_created = false;
-  bool                             srb2_created = false;
-  cu_cp_ue_context_release_command last_cu_cp_ue_context_release_command;
+  srb_creation_message           last_srb_creation_message;
+  bool                           srb1_created = false;
+  bool                           srb2_created = false;
+  rrc_ue_context_release_command last_rrc_ue_context_release_command;
 
 private:
   srslog::basic_logger& logger = srslog::fetch_basic_logger("TEST");

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ class rrc_ue_du_processor_adapter : public rrc_ue_du_processor_notifier`
`57`	`57`
`58`	`58`	`void on_create_srb(const srb_creation_message& msg) override { du_processor_rrc_ue_handler->create_srb(msg); }`
`59`	`59`
`60`		`- void on_ue_context_release_command(const cu_cp_ue_context_release_command& cmd) override`
	`60`	`+ void on_ue_context_release_command(const rrc_ue_context_release_command& cmd) override`
`61`	`61`	`{`
`62`	`62`	`srsran_assert(du_processor_rrc_ue_handler != nullptr, "DU processor handler must not be nullptr");`
`63`	`63`	`du_processor_rrc_ue_handler->handle_ue_context_release_command(cmd);`
Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ void du_processor_impl::create_srb(const srb_creation_message& msg)`
`370`	`370`	`}`
`371`	`371`	`}`
`372`	`372`
`373`		`-void du_processor_impl::handle_ue_context_release_command(const cu_cp_ue_context_release_command& cmd)`
	`373`	`+void du_processor_impl::handle_ue_context_release_command(const rrc_ue_context_release_command& cmd)`
`374`	`374`	`{`
`375`	`375`	`rrc_ue_interface* rrc_ue = rrc->find_ue(cmd.ue_index);`
`376`	`376`	`srsran_assert(rrc_ue != nullptr, "ue={} Could not find RRC UE", cmd.ue_index);`
`@@ -461,7 +461,7 @@ du_processor_impl::handle_new_ue_context_release_command(const cu_cp_ngap_ue_con`
`461`	`461`	`release_complete.user_location_info = release_context.user_location_info;`
`462`	`462`
`463`	`463`	`// Create release command from NGAP UE context release command`
`464`		`- cu_cp_ue_context_release_command release_command;`
	`464`	`+ rrc_ue_context_release_command release_command;`
`465`	`465`	`release_command.ue_index = cmd.ue_index;`
`466`	`466`	`release_command.cause = cmd.cause;`
`467`	`467`	`release_command.rrc_release_pdu = release_context.rrc_release_pdu.copy();`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ du_processor_routine_manager::start_pdu_session_resource_release_routine(`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`async_task<void>`
`73`		`-du_processor_routine_manager::start_ue_context_release_routine(const cu_cp_ue_context_release_command& command,`
	`73`	`+du_processor_routine_manager::start_ue_context_release_routine(const rrc_ue_context_release_command& command,`
`74`	`74`	`up_resource_manager& ue_up_resource_manager)`
`75`	`75`	`{`
`76`	`76`	`return launch_async<ue_context_release_routine>(`