Skip to content

Commit b7b09da

Browse files
FabianEckermannFabian Eckermann
FabianEckermann
authored and
Fabian Eckermann
committed
cu_cp,f1ap: remove unused notifier
1 parent 1a247f5 commit b7b09da

18 files changed

+5
-84
lines changed

‎include/srsran/f1ap/cu_cp/f1ap_cu.h‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -187,17 +187,6 @@ class f1ap_ue_context_removal_handler
187187
virtual void remove_ue_context(ue_index_t ue_index) = 0;
188188
};
189189

190-
/// Interface to notify about necessary UE removals.
191-
class f1ap_ue_removal_notifier
192-
{
193-
public:
194-
virtual ~f1ap_ue_removal_notifier() = default;
195-
196-
/// \brief Notify the CU-CP to completly remove a UE from the CU-CP.
197-
/// \param[in] ue_index The index of the UE to remove.
198-
virtual void on_ue_removal_required(ue_index_t ue_index) = 0;
199-
};
200-
201190
/// Combined entry point for F1AP handling.
202191
class f1ap_cu : public f1ap_message_handler,
203192
public f1ap_event_handler,

‎include/srsran/f1ap/cu_cp/f1ap_cu_factory.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ std::unique_ptr<f1ap_cu> create_f1ap(const f1ap_configuration& f1ap_cfg_,
2323
f1ap_message_notifier& f1ap_pdu_notifier_,
2424
f1ap_du_processor_notifier& f1ap_du_processor_notifier_,
2525
f1ap_du_management_notifier& f1ap_du_management_notifier_,
26-
f1ap_ue_removal_notifier& f1ap_cu_cp_notifier_,
2726
timer_manager& timers_,
2827
task_executor& ctrl_exec_);
2928

‎lib/cu_cp/adapters/f1ap_adapters.h‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,6 @@
2121
namespace srsran {
2222
namespace srs_cu_cp {
2323

24-
/// Adapter between F1AP and CU-CP
25-
class f1ap_cu_cp_adapter : public f1ap_ue_removal_notifier
26-
{
27-
public:
28-
void connect_cu_cp(cu_cp_ue_removal_handler& ue_removal_handler_) { ue_removal_handler = &ue_removal_handler_; }
29-
30-
void on_ue_removal_required(ue_index_t ue_index) override
31-
{
32-
srsran_assert(ue_removal_handler != nullptr, "CU-CP UE removal handler must not be nullptr");
33-
return ue_removal_handler->handle_ue_removal_request(ue_index);
34-
}
35-
36-
private:
37-
cu_cp_ue_removal_handler* ue_removal_handler = nullptr;
38-
};
39-
4024
/// Adapter between F1AP and DU repository, to handle DU specific procedure outcomes (e.g. F1 Remove)
4125
class f1ap_du_repository_adapter : public f1ap_du_management_notifier
4226
{

‎lib/cu_cp/cu_cp_impl.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ cu_cp_impl::cu_cp_impl(const cu_cp_configuration& config_) :
4343
get_cu_cp_ue_context_handler(),
4444
du_processor_e1ap_notifier,
4545
du_processor_ngap_notifier,
46-
f1ap_cu_cp_notifier,
4746
rrc_ue_ngap_notifier,
4847
rrc_ue_ngap_notifier,
4948
du_processor_task_sched,
@@ -61,7 +60,6 @@ cu_cp_impl::cu_cp_impl(const cu_cp_configuration& config_) :
6160
// connect event notifiers to layers
6261
ngap_cu_cp_ev_notifier.connect_cu_cp(du_db, *this);
6362
e1ap_ev_notifier.connect_cu_cp(get_cu_cp_e1ap_handler());
64-
f1ap_cu_cp_notifier.connect_cu_cp(get_cu_cp_ue_removal_handler());
6563
cell_meas_ev_notifier.connect_mobility_manager(mobility_mng);
6664
rrc_du_cu_cp_notifier.connect_cu_cp(get_cu_cp_measurement_config_handler());
6765
conn_notifier.connect_node_connection_handler(controller);

‎lib/cu_cp/cu_cp_impl.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,6 @@ class cu_cp_impl final : public cu_cp, public cu_cp_impl_interface, public cu_cp
151151
ngap_to_cu_cp_task_scheduler ngap_task_sched;
152152
ngap_cu_cp_adapter ngap_cu_cp_ev_notifier;
153153

154-
// F1AP to CU-CP adapter
155-
f1ap_cu_cp_adapter f1ap_cu_cp_notifier;
156-
157154
// RRC DU to CU-CP adapters
158155
rrc_du_cu_cp_adapter rrc_du_cu_cp_notifier;
159156

‎lib/cu_cp/du_processor/du_processor_factory.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ srsran::srs_cu_cp::create_du_processor(const du_processor_config_t& du_pr
2323
f1ap_message_notifier& f1ap_notifier_,
2424
du_processor_e1ap_control_notifier& e1ap_ctrl_notifier_,
2525
du_processor_ngap_control_notifier& ngap_ctrl_notifier_,
26-
f1ap_ue_removal_notifier& f1ap_cu_cp_notifier_,
2726
rrc_ue_nas_notifier& rrc_ue_nas_pdu_notifier_,
2827
rrc_ue_control_notifier& rrc_ue_ngap_ctrl_notifier_,
2928
rrc_du_measurement_config_notifier& rrc_du_cu_cp_notifier,
@@ -37,7 +36,6 @@ srsran::srs_cu_cp::create_du_processor(const du_processor_config_t& du_pr
3736
f1ap_notifier_,
3837
e1ap_ctrl_notifier_,
3938
ngap_ctrl_notifier_,
40-
f1ap_cu_cp_notifier_,
4139
rrc_ue_nas_pdu_notifier_,
4240
rrc_ue_ngap_ctrl_notifier_,
4341
rrc_du_cu_cp_notifier,

‎lib/cu_cp/du_processor/du_processor_factory.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ create_du_processor(const du_processor_config_t& du_processor_config_,
2929
f1ap_message_notifier& f1ap_notifier_,
3030
du_processor_e1ap_control_notifier& e1ap_ctrl_notifier_,
3131
du_processor_ngap_control_notifier& ngap_ctrl_notifier_,
32-
f1ap_ue_removal_notifier& f1ap_cu_cp_notifier_,
3332
rrc_ue_nas_notifier& rrc_ue_nas_pdu_notifier_,
3433
rrc_ue_control_notifier& rrc_ue_ngap_ctrl_notifier_,
3534
rrc_du_measurement_config_notifier& rrc_du_cu_cp_notifier,

‎lib/cu_cp/du_processor/du_processor_impl.cpp‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ du_processor_impl::du_processor_impl(const du_processor_config_t& du_proc
2525
f1ap_message_notifier& f1ap_notifier_,
2626
du_processor_e1ap_control_notifier& e1ap_ctrl_notifier_,
2727
du_processor_ngap_control_notifier& ngap_ctrl_notifier_,
28-
f1ap_ue_removal_notifier& f1ap_cu_cp_notifier_,
2928
rrc_ue_nas_notifier& rrc_ue_nas_pdu_notifier_,
3029
rrc_ue_control_notifier& rrc_ue_ngap_ctrl_notifier_,
3130
rrc_du_measurement_config_notifier& rrc_du_cu_cp_notifier,
@@ -38,7 +37,6 @@ du_processor_impl::du_processor_impl(const du_processor_config_t& du_proc
3837
f1ap_notifier(f1ap_notifier_),
3938
e1ap_ctrl_notifier(e1ap_ctrl_notifier_),
4039
ngap_ctrl_notifier(ngap_ctrl_notifier_),
41-
f1ap_cu_cp_notifier(f1ap_cu_cp_notifier_),
4240
rrc_ue_nas_pdu_notifier(rrc_ue_nas_pdu_notifier_),
4341
rrc_ue_ngap_ctrl_notifier(rrc_ue_ngap_ctrl_notifier_),
4442
task_sched(task_sched_),
@@ -48,13 +46,8 @@ du_processor_impl::du_processor_impl(const du_processor_config_t& du_proc
4846
context.du_index = cfg.du_index;
4947

5048
// create f1ap
51-
f1ap = create_f1ap(cfg.f1ap_cfg,
52-
f1ap_notifier,
53-
f1ap_ev_notifier,
54-
f1ap_du_mgmt_notifier,
55-
f1ap_cu_cp_notifier,
56-
task_sched.get_timer_manager(),
57-
ctrl_exec_);
49+
f1ap = create_f1ap(
50+
cfg.f1ap_cfg, f1ap_notifier, f1ap_ev_notifier, f1ap_du_mgmt_notifier, task_sched.get_timer_manager(), ctrl_exec_);
5851

5952
f1ap_ev_notifier.connect_du_processor(get_du_processor_f1ap_interface());
6053
f1ap_ue_context_notifier.connect_f1(f1ap->get_f1ap_ue_context_manager());

‎lib/cu_cp/du_processor/du_processor_impl.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ class du_processor_impl : public du_processor_impl_interface, public du_setup_ha
3636
f1ap_message_notifier& f1ap_notifier_,
3737
du_processor_e1ap_control_notifier& e1ap_ctrl_notifier_,
3838
du_processor_ngap_control_notifier& ngap_ctrl_notifier_,
39-
f1ap_ue_removal_notifier& f1ap_cu_cp_notifier_,
4039
rrc_ue_nas_notifier& rrc_ue_nas_pdu_notifier_,
4140
rrc_ue_control_notifier& rrc_ue_ngap_ctrl_notifier_,
4241
rrc_du_measurement_config_notifier& rrc_du_cu_cp_notifier,
@@ -162,7 +161,6 @@ class du_processor_impl : public du_processor_impl_interface, public du_setup_ha
162161
f1ap_message_notifier& f1ap_notifier;
163162
du_processor_e1ap_control_notifier& e1ap_ctrl_notifier;
164163
du_processor_ngap_control_notifier& ngap_ctrl_notifier;
165-
f1ap_ue_removal_notifier& f1ap_cu_cp_notifier;
166164
rrc_ue_nas_notifier& rrc_ue_nas_pdu_notifier;
167165
rrc_ue_control_notifier& rrc_ue_ngap_ctrl_notifier;
168166
du_processor_ue_task_scheduler& task_sched;

‎lib/cu_cp/du_processor/du_processor_repository.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ du_index_t du_processor_repository::add_du(std::unique_ptr<f1ap_message_notifier
118118
*du_ctxt.f1ap_tx_pdu_notifier,
119119
cfg.e1ap_ctrl_notifier,
120120
cfg.ngap_ctrl_notifier,
121-
cfg.f1ap_cu_cp_notifier,
122121
cfg.ue_nas_pdu_notifier,
123122
cfg.ue_ngap_ctrl_notifier,
124123
cfg.meas_config_notifier,

0 commit comments

Comments
 (0)