e2ap: removing getter function for e2sm interface

Author: yagoda

lib/e2/common/e2_subscription_manager_impl.cpp

@@ -32,7 +32,7 @@ e2_subscription_manager_impl::handle_subscription_setup(const asn1::e2ap::ricsub
 
   if (supported_ran_functions.count(msg->ra_nfunction_id.value)) {
     event_trigger_def =
-        get_e2sm_iface(msg->ra_nfunction_id.value)
+        e2sm_iface_list[supported_ran_functions[msg->ra_nfunction_id.value]]
             ->get_e2sm_packer()
             .handle_packed_event_trigger_definition(msg->ricsubscription_details->ric_event_trigger_definition);
     subscription.subscription_info.report_period =
@@ -63,18 +63,22 @@ int e2_subscription_manager_impl::start_subscription(int               ric_insta
                                                      e2_event_manager& ev_mng,
                                                      uint16_t          ran_func_id)
 {
-  subscriptions[ric_instance_id].indication_task = launch_async<e2_indication_procedure>(
-      notif, *(get_e2sm_iface(ran_func_id)), ev_mng, subscriptions[ric_instance_id].subscription_info, logger);
+  subscriptions[ric_instance_id].indication_task =
+      launch_async<e2_indication_procedure>(notif,
+                                            *(e2sm_iface_list[supported_ran_functions[ran_func_id]]),
+                                            ev_mng,
+                                            subscriptions[ric_instance_id].subscription_info,
+                                            logger);
   return 0;
 }
 
 bool e2_subscription_manager_impl::action_supported(const ri_caction_to_be_setup_item_s& action,
                                                     uint16_t                             ran_func_id,
                                                     uint32_t                             ric_instance_id)
 {
-  auto action_def = get_e2sm_iface(ran_func_id)
-                        ->get_e2sm_packer()
-                        .handle_packed_e2sm_kpm_action_definition(action.ric_action_definition);
+  auto action_def =
+      e2sm_iface_list[supported_ran_functions[ran_func_id]]->get_e2sm_packer().handle_packed_e2sm_kpm_action_definition(
+          action.ric_action_definition);
   auto action_type = action_def.action_definition_formats.type().value;
   if (action_type == e2_sm_kpm_action_definition_s::action_definition_formats_c_::types_opts::nulltype) {
     subscriptions[ric_instance_id].subscription_info.action_list.push_back(
@@ -136,8 +140,3 @@ void e2_subscription_manager_impl::add_ran_function_oid(uint16_t ran_func_id, st
     logger.error("OID not supported");
   }
 }
-
-std::unique_ptr<e2sm_interface>& e2_subscription_manager_impl::get_e2sm_iface(int ra_nfunction_id_value)
-{
-  return e2sm_iface_list[supported_ran_functions[ra_nfunction_id_value]];
-}

lib/e2/common/e2_subscription_manager_impl.h

@@ -70,7 +70,6 @@ class e2_subscription_manager_impl : public e2_subscription_manager
   void add_ran_function_oid(uint16_t ran_func_id, std::string oid) override;
 
 private:
-  std::unique_ptr<e2sm_interface>&                       get_e2sm_iface(int ra_nfunction_id_value);
   std::map<int, e2_subscription_t>                       subscriptions;
   std::map<std::string, std::unique_ptr<e2sm_interface>> e2sm_iface_list;
   std::map<uint16_t, std::string>                        supported_ran_functions;