cu_cp,f1ap: small naming changes

FabianEckermann · Fabian Eckermann · commit 48cd0b5015c4 · 2024-06-28T15:50:40.000Z
diff --git a/include/srsran/f1ap/cu_cp/f1ap_cu_factory.h b/include/srsran/f1ap/cu_cp/f1ap_cu_factory.h
@@ -21,7 +21,7 @@ namespace srs_cu_cp {
 /// Creates an instance of an F1AP interface, notifying outgoing packets on the specified listener object.
 std::unique_ptr<f1ap_cu> create_f1ap(const f1ap_configuration&   f1ap_cfg_,
                                      f1ap_message_notifier&      f1ap_pdu_notifier_,
-                                     f1ap_du_processor_notifier& f1ap_du_processor_notifier_,
+                                     f1ap_du_processor_notifier& du_processor_notifier_,
                                      timer_manager&              timers_,
                                      task_executor&              ctrl_exec_);
 
diff --git a/lib/cu_cp/du_processor/du_processor_factory.cpp b/lib/cu_cp/du_processor/du_processor_factory.cpp
@@ -20,7 +20,7 @@ using namespace srs_cu_cp;
 std::unique_ptr<du_processor>
 srsran::srs_cu_cp::create_du_processor(du_processor_config_t               du_processor_config,
                                        du_processor_cu_cp_notifier&        cu_cp_notifier_,
-                                       f1ap_message_notifier&              f1ap_notifier_,
+                                       f1ap_message_notifier&              f1ap_pdu_notifier_,
                                        rrc_ue_nas_notifier&                rrc_ue_nas_pdu_notifier_,
                                        rrc_ue_control_notifier&            rrc_ue_ngap_ctrl_notifier_,
                                        rrc_du_measurement_config_notifier& rrc_du_cu_cp_notifier,
@@ -31,7 +31,7 @@ srsran::srs_cu_cp::create_du_processor(du_processor_config_t               du_pr
 {
   auto du_processor = std::make_unique<du_processor_impl>(std::move(du_processor_config),
                                                           cu_cp_notifier_,
-                                                          f1ap_notifier_,
+                                                          f1ap_pdu_notifier_,
                                                           rrc_ue_nas_pdu_notifier_,
                                                           rrc_ue_ngap_ctrl_notifier_,
                                                           rrc_du_cu_cp_notifier,
diff --git a/lib/cu_cp/du_processor/du_processor_factory.h b/lib/cu_cp/du_processor/du_processor_factory.h
@@ -26,7 +26,7 @@ class common_task_scheduler;
 /// Creates an instance of an DU processor interface
 std::unique_ptr<du_processor> create_du_processor(du_processor_config_t               du_processor_config_,
                                                   du_processor_cu_cp_notifier&        cu_cp_notifier_,
-                                                  f1ap_message_notifier&              f1ap_notifier_,
+                                                  f1ap_message_notifier&              f1ap_pdu_notifier_,
                                                   rrc_ue_nas_notifier&                rrc_ue_nas_pdu_notifier_,
                                                   rrc_ue_control_notifier&            rrc_ue_ngap_ctrl_notifier_,
                                                   rrc_du_measurement_config_notifier& rrc_du_cu_cp_notifier,
diff --git a/lib/cu_cp/du_processor/du_processor_impl.h b/lib/cu_cp/du_processor/du_processor_impl.h
@@ -39,7 +39,7 @@ class du_processor_impl : public du_processor,
 public:
   du_processor_impl(du_processor_config_t               du_processor_config_,
                     du_processor_cu_cp_notifier&        cu_cp_notifier_,
-                    f1ap_message_notifier&              f1ap_notifier_,
+                    f1ap_message_notifier&              f1ap_pdu_notifier_,
                     rrc_ue_nas_notifier&                rrc_ue_nas_pdu_notifier_,
                     rrc_ue_control_notifier&            rrc_ue_ngap_ctrl_notifier_,
                     rrc_du_measurement_config_notifier& rrc_du_cu_cp_notifier,
diff --git a/lib/f1ap/cu_cp/f1ap_cu_factory.cpp b/lib/f1ap/cu_cp/f1ap_cu_factory.cpp
@@ -18,11 +18,11 @@ using namespace srs_cu_cp;
 
 std::unique_ptr<f1ap_cu> srsran::srs_cu_cp::create_f1ap(const f1ap_configuration&   f1ap_cfg_,
                                                         f1ap_message_notifier&      f1ap_pdu_notifier_,
-                                                        f1ap_du_processor_notifier& f1ap_du_processor_notifier_,
+                                                        f1ap_du_processor_notifier& du_processor_notifier_,
                                                         timer_manager&              timers_,
                                                         task_executor&              ctrl_exec_)
 {
   auto f1ap_cu =
-      std::make_unique<f1ap_cu_impl>(f1ap_cfg_, f1ap_pdu_notifier_, f1ap_du_processor_notifier_, timers_, ctrl_exec_);
+      std::make_unique<f1ap_cu_impl>(f1ap_cfg_, f1ap_pdu_notifier_, du_processor_notifier_, timers_, ctrl_exec_);
   return f1ap_cu;
 }

Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,11 @@ using namespace srs_cu_cp;`
`18`	`18`
`19`	`19`	`std::unique_ptr<f1ap_cu> srsran::srs_cu_cp::create_f1ap(const f1ap_configuration& f1ap_cfg_,`
`20`	`20`	`f1ap_message_notifier& f1ap_pdu_notifier_,`
`21`		`- f1ap_du_processor_notifier& f1ap_du_processor_notifier_,`
	`21`	`+ f1ap_du_processor_notifier& du_processor_notifier_,`
`22`	`22`	`timer_manager& timers_,`
`23`	`23`	`task_executor& ctrl_exec_)`
`24`	`24`	`{`
`25`	`25`	`auto f1ap_cu =`
`26`		`- std::make_unique<f1ap_cu_impl>(f1ap_cfg_, f1ap_pdu_notifier_, f1ap_du_processor_notifier_, timers_, ctrl_exec_);`
	`26`	`+ std::make_unique<f1ap_cu_impl>(f1ap_cfg_, f1ap_pdu_notifier_, du_processor_notifier_, timers_, ctrl_exec_);`
`27`	`27`	`return f1ap_cu;`
`28`	`28`	`}`