cu-cp: remove unused method

Author: frankist

include/srsran/ngap/ngap.h

@@ -178,9 +178,6 @@ class ngap_du_processor_control_notifier
 public:
   virtual ~ngap_du_processor_control_notifier() = default;
 
-  /// \brief Request allocation of a new UE index.
-  virtual ue_index_t on_new_ue_index_required() = 0;
-
   /// \brief Notify about the reception of a new PDU Session Resource Setup Request.
   virtual async_task<cu_cp_pdu_session_resource_setup_response>
   on_new_pdu_session_resource_setup_request(cu_cp_pdu_session_resource_setup_request& request) = 0;

lib/cu_cp/adapters/ngap_adapters.h

@@ -157,12 +157,6 @@ class ngap_du_processor_adapter : public ngap_du_processor_control_notifier
     du_processor_ngap_handler = du_processor_ngap_handler_;
   }
 
-  ue_index_t on_new_ue_index_required() override
-  {
-    srsran_assert(du_processor_ngap_handler != nullptr, "DU Processor handler must not be nullptr");
-    return du_processor_ngap_handler->get_new_ue_index();
-  }
-
   async_task<cu_cp_pdu_session_resource_setup_response>
   on_new_pdu_session_resource_setup_request(cu_cp_pdu_session_resource_setup_request& request) override
   {

lib/cu_cp/du_processor/du_processor_impl.cpp

@@ -172,7 +172,7 @@ du_setup_result du_processor_impl::handle_du_setup_request(const du_setup_reques
   return res;
 }
 
-ue_index_t du_processor_impl::get_new_ue_index()
+ue_index_t du_processor_impl::allocate_new_ue_index()
 {
   return ue_manager.allocate_new_ue_index(context.du_index);
 }
@@ -262,7 +262,7 @@ cu_cp_ue_creation_response du_processor_impl::handle_ue_creation_request(const c
   ue_index_t ue_index = msg.ue_index;
   if (ue_index == ue_index_t::invalid) {
     // It's a new UE. Allocate new UE index.
-    ue_index = get_new_ue_index();
+    ue_index = allocate_new_ue_index();
     if (ue_index == ue_index_t::invalid) {
       logger.warning("ue={}: Could not create UE context", ue_index);
       return {};

lib/cu_cp/du_processor/du_processor_impl.h

@@ -56,7 +56,7 @@ class du_processor_impl : public du_processor_impl_interface, public du_setup_ha
 
   // du_processor_f1ap_interface
   du_setup_result            handle_du_setup_request(const du_setup_request& req) override;
-  ue_index_t                 get_new_ue_index() override;
+  ue_index_t                 allocate_new_ue_index() override;
   cu_cp_ue_creation_response handle_ue_creation_request(const cu_cp_ue_creation_request& msg) 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;

lib/cu_cp/du_processor/du_processor_impl_interface.h

@@ -41,7 +41,7 @@ class du_processor_f1ap_interface
   virtual du_index_t get_du_index() = 0;
 
   /// \brief Allocate a new UE index.
-  virtual ue_index_t get_new_ue_index() = 0;
+  virtual ue_index_t allocate_new_ue_index() = 0;
 
   /// \brief Create a new UE context.
   /// \param[in] msg The UE creation message.
@@ -261,7 +261,7 @@ class du_processor_ngap_interface : public du_processor_ue_context_notifier
   virtual ~du_processor_ngap_interface() = default;
 
   /// \brief Allocate a new UE index.
-  virtual ue_index_t get_new_ue_index() = 0;
+  virtual ue_index_t allocate_new_ue_index() = 0;
 
   /// \brief Handle the reception of a new PDU Session Resource Setup Request.
   virtual async_task<cu_cp_pdu_session_resource_setup_response>

lib/cu_cp/du_processor/du_processor_repository.cpp

@@ -224,7 +224,7 @@ ue_index_t du_processor_repository::handle_ue_index_allocation_request(const nr_
 {
   for (auto& du : du_db) {
     if (du.second.du_processor->has_cell(cgi)) {
-      return du.second.du_processor->get_du_processor_ngap_interface().get_new_ue_index();
+      return du.second.du_processor->get_du_processor_ngap_interface().allocate_new_ue_index();
     }
   }
   logger.debug("No DU with plmn={} and cell_id={} found.", cgi.plmn, cgi.nci);

tests/unittests/cu_cp/du_processor/du_processor_test.cpp

@@ -95,7 +95,7 @@ TEST_F(du_processor_test, when_ue_creation_msg_valid_then_ue_added)
       generate_f1_setup_request());
 
   // Generate ue_creation message
-  ue_index_t                ue_index        = du_processor_obj->get_du_processor_f1ap_interface().get_new_ue_index();
+  ue_index_t                ue_index = du_processor_obj->get_du_processor_f1ap_interface().allocate_new_ue_index();
   cu_cp_ue_creation_request ue_creation_msg = generate_ue_creation_message(ue_index, rnti_t::MIN_CRNTI, 6576);
 
   // Pass message to DU processor
@@ -112,7 +112,7 @@ TEST_F(du_processor_test, when_cell_id_invalid_then_ue_creation_fails)
       generate_f1_setup_request());
 
   // Generate ue_creation message
-  ue_index_t                ue_index        = du_processor_obj->get_du_processor_f1ap_interface().get_new_ue_index();
+  ue_index_t                ue_index = du_processor_obj->get_du_processor_f1ap_interface().allocate_new_ue_index();
   cu_cp_ue_creation_request ue_creation_msg = generate_ue_creation_message(ue_index, rnti_t::MIN_CRNTI, 1);
 
   // Pass message to DU processor
@@ -131,7 +131,7 @@ TEST_F(du_processor_test, when_ue_exists_then_ue_not_added)
       generate_f1_setup_request());
 
   // Generate ue_creation message
-  ue_index_t                ue_index        = du_processor_obj->get_du_processor_f1ap_interface().get_new_ue_index();
+  ue_index_t                ue_index = du_processor_obj->get_du_processor_f1ap_interface().allocate_new_ue_index();
   cu_cp_ue_creation_request ue_creation_msg = generate_ue_creation_message(ue_index, rnti_t::MIN_CRNTI, 6576);
 
   // Pass message to DU processor
@@ -161,8 +161,8 @@ TEST_F(du_processor_test, when_max_nof_ues_exceeded_then_ue_not_added)
   // Add the maximum number of UEs
   for (unsigned it = 0; it < MAX_NOF_UES_PER_DU; it++) {
     // Generate ue_creation message
-    rnti_t                    c_rnti          = to_rnti(it + 1); // 0 is not a valid RNTI
-    ue_index_t                ue_index        = du_processor_obj->get_du_processor_f1ap_interface().get_new_ue_index();
+    rnti_t                    c_rnti   = to_rnti(it + 1); // 0 is not a valid RNTI
+    ue_index_t                ue_index = du_processor_obj->get_du_processor_f1ap_interface().allocate_new_ue_index();
     cu_cp_ue_creation_request ue_creation_msg = generate_ue_creation_message(ue_index, c_rnti, 6576);
 
     // Pass message to DU processor
@@ -178,7 +178,7 @@ TEST_F(du_processor_test, when_max_nof_ues_exceeded_then_ue_not_added)
   ASSERT_EQ(du_processor_obj->get_nof_ues(), MAX_NOF_UES_PER_DU);
 
   // Try to allocate additional UE index
-  ue_index_t ue_index = du_processor_obj->get_du_processor_f1ap_interface().get_new_ue_index();
+  ue_index_t ue_index = du_processor_obj->get_du_processor_f1ap_interface().allocate_new_ue_index();
   ASSERT_EQ(ue_index, ue_index_t::invalid);
 
   ASSERT_EQ(du_processor_obj->get_nof_ues(), MAX_NOF_UES_PER_DU);
@@ -194,7 +194,7 @@ TEST_F(du_processor_test, when_ue_context_release_command_received_then_ue_delet
       generate_f1_setup_request());
 
   // Generate ue_creation message
-  ue_index_t                ue_index        = du_processor_obj->get_du_processor_f1ap_interface().get_new_ue_index();
+  ue_index_t                ue_index = du_processor_obj->get_du_processor_f1ap_interface().allocate_new_ue_index();
   cu_cp_ue_creation_request ue_creation_msg = generate_ue_creation_message(ue_index, rnti_t::MIN_CRNTI, 6576);
 
   // Pass message to DU processor
@@ -233,8 +233,8 @@ TEST_F(du_processor_test, when_valid_ue_creation_request_received_after_ue_was_r
   // Add the maximum number of UEs
   for (unsigned it = 0; it < MAX_NOF_UES_PER_DU; it++) {
     // Generate ue_creation message
-    rnti_t                    c_rnti          = to_rnti(it + 1); // 0 is not a valid RNTI
-    ue_index_t                ue_index        = du_processor_obj->get_du_processor_f1ap_interface().get_new_ue_index();
+    rnti_t                    c_rnti   = to_rnti(it + 1); // 0 is not a valid RNTI
+    ue_index_t                ue_index = du_processor_obj->get_du_processor_f1ap_interface().allocate_new_ue_index();
     cu_cp_ue_creation_request ue_creation_msg = generate_ue_creation_message(ue_index, c_rnti, 6576);
 
     // Pass message to DU processor
@@ -272,8 +272,8 @@ TEST_F(du_processor_test, when_valid_ue_creation_request_received_after_ue_was_r
 
   // Add one more UE to DU processor
   // Generate ue_creation message
-  rnti_t                    c_rnti          = to_rnti(MAX_NOF_UES_PER_DU + 1);
-  ue_index_t                ue_index        = du_processor_obj->get_du_processor_f1ap_interface().get_new_ue_index();
+  rnti_t                    c_rnti   = to_rnti(MAX_NOF_UES_PER_DU + 1);
+  ue_index_t                ue_index = du_processor_obj->get_du_processor_f1ap_interface().allocate_new_ue_index();
   cu_cp_ue_creation_request ue_creation_msg = generate_ue_creation_message(ue_index, c_rnti, 6576);
 
   // Pass message to DU processor

tests/unittests/ngap/test_helpers.h

@@ -183,12 +183,6 @@ class dummy_ngap_du_processor_notifier : public ngap_du_processor_control_notifi
   dummy_ngap_du_processor_notifier(ngap_ue_context_removal_handler& ngap_handler_) :
     logger(srslog::fetch_basic_logger("TEST")), ngap_handler(ngap_handler_){};
 
-  ue_index_t on_new_ue_index_required() override
-  {
-    logger.info("Requested to allocate a new ue index.");
-    return allocate_ue_index();
-  }
-
   async_task<cu_cp_pdu_session_resource_setup_response>
   on_new_pdu_session_resource_setup_request(cu_cp_pdu_session_resource_setup_request& request) override
   {