cu-cp: remove unused f1ap interfaces

Author: frankist

include/srsran/f1ap/cu_cp/f1ap_cu.h

@@ -153,15 +153,6 @@ class f1ap_du_processor_notifier : public du_setup_notifier
   virtual du_index_t get_du_index() = 0;
 };
 
-class f1ap_task_scheduler
-{
-public:
-  virtual ~f1ap_task_scheduler() = default;
-
-  /// \brief Schedule Async task for a given UE.
-  virtual void schedule_async_task(ue_index_t ue_index, async_task<void>&& task) = 0;
-};
-
 /// Methods used by F1AP to notify about DU specific events.
 class f1ap_du_management_notifier
 {

lib/cu_cp/adapters/du_processor_adapters.h

@@ -31,7 +31,7 @@ class du_processor_to_cu_cp_task_scheduler : public du_processor_ue_task_schedul
 
   void connect_cu_cp(ue_task_scheduler_manager& cu_cp_task_sched_) { cu_cp_task_sched = &cu_cp_task_sched_; }
 
-  void schedule_async_task(ue_index_t ue_index, async_task<void>&& task) override
+  void schedule_async_task(ue_index_t ue_index, async_task<void> task) override
   {
     srsran_assert(cu_cp_task_sched != nullptr, "CU-CP task scheduler handler must not be nullptr");
     cu_cp_task_sched->handle_ue_async_task(ue_index, std::move(task));

lib/cu_cp/adapters/f1ap_adapters.h

@@ -43,7 +43,7 @@ class f1ap_du_repository_adapter : public f1ap_du_management_notifier
 public:
   void connect_du_repository(cu_cp_f1c_handler& du_handler_) { du_handler = &du_handler_; }
 
-  void on_du_remove_request_received(const du_index_t du_index) override
+  void on_du_remove_request_received(du_index_t du_index) override
   {
     srsran_assert(du_handler != nullptr, "DU handler must not be nullptr");
     du_handler->handle_du_remove_request(du_index);

lib/cu_cp/du_processor/du_processor_impl.cpp

@@ -288,33 +288,6 @@ du_processor_impl::handle_ue_rrc_context_creation_request(const ue_rrc_context_c
   return response;
 }
 
-ue_update_complete_message du_processor_impl::handle_ue_update_request(const ue_update_message& msg)
-{
-  du_ue* ue = ue_manager.find_du_ue(msg.ue_index);
-  srsran_assert(ue != nullptr, "ue={}: Could not find DU UE", msg.ue_index);
-
-  ue_update_complete_message ue_update_complete_msg = {};
-
-  // Create RRC object if it doesn't already exist.
-  if (rrc_ue_adapters.find(ue->get_ue_index()) != rrc_ue_adapters.end()) {
-    if (!msg.cell_group_cfg.empty() && msg.c_rnti != rnti_t::INVALID_RNTI) {
-      if (!create_rrc_ue(*ue, msg.c_rnti, msg.cgi, msg.cell_group_cfg.copy(), {} /* no previous context */)) {
-        logger.warning("ue={}: Could not create RRC UE object", msg.ue_index);
-        return ue_update_complete_msg;
-      }
-
-      rrc_ue_interface* rrc_ue = rrc->find_ue(msg.ue_index);
-      f1ap_rrc_ue_adapters.at(msg.ue_index)
-          .connect_rrc_ue(rrc_ue->get_ul_ccch_pdu_handler(), rrc_ue->get_ul_dcch_pdu_handler());
-      ue_update_complete_msg.f1ap_rrc_notifier = &f1ap_rrc_ue_adapters.at(msg.ue_index);
-    }
-  }
-
-  ue_update_complete_msg.ue_index = ue->get_ue_index();
-
-  return ue_update_complete_msg;
-}
-
 void du_processor_impl::handle_du_initiated_ue_context_release_request(const f1ap_ue_context_release_request& request)
 {
   srsran_assert(request.ue_index != ue_index_t::invalid, "Invalid UE index", request.ue_index);

lib/cu_cp/du_processor/du_processor_impl.h

@@ -60,7 +60,6 @@ class du_processor_impl : public du_processor_impl_interface, public du_setup_ha
   ue_rrc_context_creation_response
        handle_ue_rrc_context_creation_request(const ue_rrc_context_creation_request& req) override;
   void handle_du_initiated_ue_context_release_request(const f1ap_ue_context_release_request& request) override;
-  ue_update_complete_message handle_ue_update_request(const ue_update_message& msg) override;
 
   // du_processor_ue_context_notifier
   async_task<cu_cp_ue_context_release_complete>

lib/cu_cp/du_processor/du_processor_impl_interface.h

@@ -51,9 +51,6 @@ class du_processor_f1ap_interface
   virtual ue_rrc_context_creation_response
   handle_ue_rrc_context_creation_request(const ue_rrc_context_creation_request& req) = 0;
 
-  /// \brief Update existing UE object.
-  virtual ue_update_complete_message handle_ue_update_request(const ue_update_message& msg) = 0;
-
   /// \brief Handle the reception of a F1AP UE Context Release Request and notify NGAP.
   /// \param[in] req The F1AP UE Context Release Request.
   virtual void handle_du_initiated_ue_context_release_request(const f1ap_ue_context_release_request& request) = 0;
@@ -324,13 +321,14 @@ class du_processor_f1ap_control_notifier
 };
 
 /// \brief Schedules asynchronous tasks associated with an UE.
-class du_processor_ue_task_scheduler : public f1ap_task_scheduler
+class du_processor_ue_task_scheduler
 {
 public:
-  virtual ~du_processor_ue_task_scheduler()                       = default;
-  virtual void           clear_pending_tasks(ue_index_t ue_index) = 0;
-  virtual unique_timer   make_unique_timer()                      = 0;
-  virtual timer_manager& get_timer_manager()                      = 0;
+  virtual ~du_processor_ue_task_scheduler()                                              = default;
+  virtual void           schedule_async_task(ue_index_t ue_index, async_task<void> task) = 0;
+  virtual void           clear_pending_tasks(ue_index_t ue_index)                        = 0;
+  virtual unique_timer   make_unique_timer()                                             = 0;
+  virtual timer_manager& get_timer_manager()                                             = 0;
 };
 
 /// \brief Handles incoming task scheduling requests associated with an UE.

tests/unittests/cu_cp/test_helpers.h

@@ -41,10 +41,7 @@ struct dummy_du_processor_ue_task_scheduler : public du_processor_ue_task_schedu
 public:
   dummy_du_processor_ue_task_scheduler(timer_manager& timers_, task_executor& exec_) : timer_db(timers_), exec(exec_) {}
 
-  void schedule_async_task(ue_index_t ue_index, async_task<void>&& task) override
-  {
-    ctrl_loop.schedule(std::move(task));
-  }
+  void schedule_async_task(ue_index_t ue_index, async_task<void> task) override { ctrl_loop.schedule(std::move(task)); }
 
   void clear_pending_tasks(ue_index_t ue_index) override { ctrl_loop.clear_pending_tasks(); }
 

tests/unittests/f1ap/cu_cp/f1ap_cu_test_helpers.h

@@ -209,21 +209,6 @@ class dummy_f1ap_du_management_notifier : public f1ap_du_management_notifier
   cu_cp_f1c_handler*    handler = nullptr;
 };
 
-class dummy_f1ap_task_scheduler : public f1ap_task_scheduler
-{
-public:
-  void schedule_async_task(ue_index_t ue_index, async_task<void>&& task) override
-  {
-    if (task_loop.count(ue_index) == 0) {
-      task_loop.insert(std::make_pair(ue_index, std::make_unique<fifo_async_task_scheduler>(128)));
-    }
-    task_loop.at(ue_index)->schedule(std::move(task));
-  }
-
-private:
-  std::unordered_map<ue_index_t, std::unique_ptr<fifo_async_task_scheduler>> task_loop;
-};
-
 /// \brief Creates a dummy UE CONTEXT SETUP REQUEST.
 f1ap_ue_context_setup_request create_ue_context_setup_request(const std::initializer_list<drb_id_t>& drbs_to_add);
 
@@ -256,7 +241,6 @@ class f1ap_cu_test : public ::testing::Test
   dummy_f1ap_du_management_notifier f1ap_du_mgmt_notifier;
   dummy_f1ap_ue_removal_notifier    f1ap_cu_cp_notifier;
   timer_manager                     timers;
-  dummy_f1ap_task_scheduler         task_sched;
   manual_task_worker                ctrl_worker{128};
   std::unique_ptr<f1ap_cu>          f1ap;
 };