Skip to content

Commit 2fb9fc4

Browse files
yagodacodebot
authored andcommitted
e2ap: minor comment adjustments
1 parent 5a2f72a commit 2fb9fc4

File tree

6 files changed

+12
-14
lines changed

6 files changed

+12
-14
lines changed

include/srsran/e2/e2sm/e2sm.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ class e2sm_handler
2727
virtual asn1::e2sm_kpm::e2_sm_kpm_event_trigger_definition_s
2828
handle_packed_event_trigger_definition(const srsran::byte_buffer& buf) = 0;
2929
/// @brief Pack the RAN function description.
30-
/// @param buf[in] The buffer to pack the RAN function description into.
3130
virtual asn1::unbounded_octstring<true> pack_ran_function_description() = 0;
3231
};
3332

include/srsran/e2/subscription/e2_subscription.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@
1818

1919
namespace srsran {
2020

21+
/// This defines the RIC action struct.
2122
struct ric_action_t {
2223
srsran::byte_buffer action_definition;
2324
uint16_t ric_action_id;
2425
asn1::e2ap::ri_caction_type_e ric_action_type;
2526
};
2627

27-
// here we define a subscription struct
28+
/// Here we define a subscription struct.
2829
struct e2_subscription_info_t {
2930
asn1::e2ap::ri_crequest_id_s request_id;
3031
std::vector<ric_action_t> action_list;
@@ -43,7 +44,7 @@ class e2_subscription_proc
4344
/// \brief Handle the incoming subscription message.
4445
virtual e2_subscribe_reponse_message handle_subscription_setup(const asn1::e2ap::ricsubscription_request_s& msg) = 0;
4546
/// \brief start the subscription request
46-
virtual int start_subscription(int ric_instance_id, e2_event_manager& ev_mng, uint16_t ran_func_id) = 0;
47+
virtual void start_subscription(int ric_instance_id, e2_event_manager& ev_mng, uint16_t ran_func_id) = 0;
4748
};
4849

4950
class e2_subscriber_mgmt

lib/e2/common/e2_subscription_manager_impl.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,16 @@ e2_subscription_manager_impl::handle_subscription_setup(const asn1::e2ap::ricsub
5959
return outcome;
6060
}
6161

62-
int e2_subscription_manager_impl::start_subscription(int ric_instance_id,
63-
e2_event_manager& ev_mng,
64-
uint16_t ran_func_id)
62+
void e2_subscription_manager_impl::start_subscription(int ric_instance_id,
63+
e2_event_manager& ev_mng,
64+
uint16_t ran_func_id)
6565
{
6666
subscriptions[ric_instance_id].indication_task =
6767
launch_async<e2_indication_procedure>(notif,
6868
*(e2sm_iface_list[supported_ran_functions[ran_func_id]]),
6969
ev_mng,
7070
subscriptions[ric_instance_id].subscription_info,
7171
logger);
72-
return 0;
7372
}
7473

7574
bool e2_subscription_manager_impl::action_supported(const ri_caction_to_be_setup_item_s& action,

lib/e2/common/e2_subscription_manager_impl.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ class e2_subscription_manager_impl : public e2_subscription_manager
3232
/// \brief Starts the subscription procedure associated with the given ric instance id.
3333
/// \param[in] ric_instance_id The ric instance id.
3434
/// \param[in] ev_mng The event manager that will be used to end the subscription procedure.
35-
/// \return true if the subscription procedure was started successfully, false otherwise.
36-
int start_subscription(int ric_instance_id, e2_event_manager& ev_mng, uint16_t ran_func_id) override;
35+
void start_subscription(int ric_instance_id, e2_event_manager& ev_mng, uint16_t ran_func_id) override;
3736

3837
/// \brief checks whether the given action is supported.
3938
/// \param[in] action The action to check.

lib/e2/procedures/e2_subscription_setup_procedure.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ class e2_subscription_setup_procedure
3636
void send_e2_subscription_setup_response(const e2_subscribe_reponse_message& response);
3737
void send_e2_subscription_setup_failure(const e2_subscribe_reponse_message& failure);
3838

39-
srslog::basic_logger& logger;
40-
e2_message_notifier& ric_notif;
41-
e2_subscription_proc& subscription_mngr;
42-
timer_factory timers;
39+
srslog::basic_logger& logger;
40+
e2_message_notifier& ric_notif;
41+
e2_subscription_proc& subscription_mngr;
42+
timer_factory timers;
4343
};
4444

4545
} // namespace srsran

tests/unittests/e2/common/e2_test_helpers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ class dummy_e2_subscription_mngr : public e2_subscription_manager
123123
get_subscription_result(msg);
124124
return msg;
125125
}
126-
int start_subscription(int ric_instance_id, e2_event_manager& ev_mng, uint16_t ran_func_id) override { return 0; }
126+
void start_subscription(int ric_instance_id, e2_event_manager& ev_mng, uint16_t ran_func_id) override {}
127127

128128
void add_e2sm_service(std::string oid, std::unique_ptr<e2sm_interface> e2sm_iface) override {}
129129

0 commit comments

Comments
 (0)