fapi_adaptor: reviewed errors notified from the adaptor.

app_units: removed the injection of the error notifier from the configuration adaptor to the slot adaptor

Author: AlaiaL

apps/units/flexible_o_du/split_6/o_du_low/split6_flexible_o_du_low_session_factory.cpp

@@ -55,11 +55,8 @@ split6_flexible_o_du_low_session_factory::create_o_du_low_session(const fapi::fa
   auto& fapi_sector_adaptor = odu_low.o_du_lo->get_phy_fapi_adaptor().get_sector_adaptor(split6_du_low::CELL_ID);
 
   // Create FAPI slot messages adaptor.
-  auto adaptor =
-      slot_messages_adaptor_factory->create_slot_messages_adaptor(config,
-                                                                  fapi_sector_adaptor.get_slot_message_gateway(),
-                                                                  fapi_sector_adaptor.get_slot_last_message_notifier(),
-                                                                  error_notifier);
+  auto adaptor = slot_messages_adaptor_factory->create_slot_messages_adaptor(
+      config, fapi_sector_adaptor.get_slot_message_gateway(), fapi_sector_adaptor.get_slot_last_message_notifier());
 
   if (!adaptor) {
     return nullptr;

apps/units/flexible_o_du/split_6/o_du_low/split6_flexible_o_du_low_session_factory.h

@@ -34,22 +34,19 @@ class split6_flexible_o_du_low_session_factory
   worker_manager&                                      workers;
   timer_manager&                                       timers;
   split6_flexible_o_du_low_metrics_notifier*           notifier;
-  fapi::error_message_notifier&                        error_notifier;
   std::unique_ptr<fapi::slot_messages_adaptor_factory> slot_messages_adaptor_factory;
 
 public:
   split6_flexible_o_du_low_session_factory(
       split6_o_du_low_unit_config                          unit_config_,
       worker_manager&                                      workers_,
       timer_manager&                                       timers_,
-      fapi::error_message_notifier&                        error_notifier_,
       split6_flexible_o_du_low_metrics_notifier*           notifier_,
       std::unique_ptr<fapi::slot_messages_adaptor_factory> slot_messages_adaptor_factory_) :
     unit_config(std::move(unit_config_)),
     workers(workers_),
     timers(timers_),
     notifier(notifier_),
-    error_notifier(error_notifier_),
     slot_messages_adaptor_factory(std::move(slot_messages_adaptor_factory_))
   {
     report_error_if_not(slot_messages_adaptor_factory, "Invalid FAPI slot messages adaptor factory");

apps/units/flexible_o_du/split_6/o_du_low/split6_o_du_low_application_unit_impl.cpp

@@ -127,7 +127,6 @@ split6_o_du_low_application_unit_impl::create_flexible_o_du_low(worker_manager&
       unit_cfg,
       workers,
       timers,
-      dependencies.config_adaptor->get_error_message_notifier(),
       notifier,
       plugin->create_slot_messages_adaptor_factory(*workers.split6_exec, *workers.split6_crtl_exec));
 

apps/units/flexible_o_du/split_6/o_du_low/split6_o_du_low_plugin_dummy.cpp

@@ -81,8 +81,7 @@ class slot_messages_adaptor_factory_dummy : public fapi::slot_messages_adaptor_f
   std::unique_ptr<fapi::slot_messages_adaptor>
   create_slot_messages_adaptor(const fapi::fapi_cell_config&     config,
                                fapi::slot_message_gateway&       gateway,
-                               fapi::slot_last_message_notifier& last_msg_notifier,
-                               fapi::error_message_notifier&     fapi_error_notifier) override
+                               fapi::slot_last_message_notifier& last_msg_notifier) override
   {
     return std::make_unique<split6_slot_messages_adaptor_dummy>();
   }

include/srsran/fapi_adaptor/fapi_slot_messages_adaptor_factory.h

@@ -30,8 +30,7 @@ class slot_messages_adaptor_factory
   virtual std::unique_ptr<slot_messages_adaptor>
   create_slot_messages_adaptor(const fapi_cell_config&     config,
                                slot_message_gateway&       gateway,
-                               slot_last_message_notifier& last_msg_notifier,
-                               error_message_notifier&     fapi_error_notifier) = 0;
+                               slot_last_message_notifier& last_msg_notifier) = 0;
 };
 
 } // namespace fapi

lib/fapi/config_message_gateway_impl.cpp

@@ -111,6 +111,7 @@ void configuration_procedure::start_request(const fapi::start_request& msg)
   // Unexpected status, notify error.
   if (current_status != cell_status::CONFIGURED) {
     error_indication_message indication;
+    indication.message_id = message_type_id::start_request;
     indication.error_code = error_code_id::msg_invalid_state;
     error_notifier->on_error_indication(indication);
 
@@ -121,7 +122,8 @@ void configuration_procedure::start_request(const fapi::start_request& msg)
   if (!cell_operation_notifier->on_start_request(cell_cfg)) {
     logger.error("Failed to start cell id '{}'", cell_cfg.cell_cfg.phy_cell_id);
     error_indication_message indication;
-    indication.error_code = error_code_id::msg_invalid_state;
+    indication.message_id = message_type_id::start_request;
+    indication.error_code = error_code_id::msg_invalid_config;
     error_notifier->on_error_indication(indication);
 
     return;
@@ -138,6 +140,7 @@ void configuration_procedure::stop_request(const fapi::stop_request& msg)
   // Unexpected status, notify error.
   if (current_status != cell_status::RUNNING) {
     error_indication_message indication;
+    indication.message_id = message_type_id::stop_request;
     indication.error_code = error_code_id::msg_invalid_state;
     error_notifier->on_error_indication(indication);
 

lib/fapi_adaptor/phy/fapi_to_phy_translator.cpp

@@ -328,8 +328,8 @@ void fapi_to_phy_translator::dl_tti_request(const fapi::dl_tti_request_message&
   if (!controller.is_initialized()) {
     logger.warning("Sector#{}: Could not acquire downlink processor for slot {}.{}", sector_id, msg.sfn, msg.slot);
     // Raise out of sync error.
-    error_notifier.get().on_error_indication(fapi::build_error_indication(
-        msg.sfn, msg.slot, fapi::message_type_id::dl_tti_request, fapi::error_code_id::msg_slot_err));
+    error_notifier.get().on_error_indication(
+        fapi::build_msg_error_indication(msg.sfn, msg.slot, fapi::message_type_id::dl_tti_request));
 
     return;
   }
@@ -573,7 +573,8 @@ void fapi_to_phy_translator::ul_tti_request(const fapi::ul_tti_request_message&
                    msg.sfn,
                    msg.slot);
     // Raise out of message transmit error.
-    error_notifier.get().on_error_indication(fapi::build_msg_tx_error_indication(msg.sfn, msg.slot));
+    error_notifier.get().on_error_indication(
+        fapi::build_msg_error_indication(msg.sfn, msg.slot, fapi::message_type_id::ul_tti_request));
     l1_ul_tracer << instant_trace_event{"ul_tti_failed_grid", instant_trace_event::cpu_scope::global};
     return;
   }
@@ -629,8 +630,7 @@ void fapi_to_phy_translator::ul_dci_request(const fapi::ul_dci_request_message&
   if (!controller.is_initialized()) {
     logger.warning("Sector#{}: Could not acquire downlink processor for slot {}.{}", sector_id, msg.sfn, msg.slot);
     // Raise out of sync error.
-    error_notifier.get().on_error_indication(fapi::build_error_indication(
-        msg.sfn, msg.slot, fapi::message_type_id::ul_dci_request, fapi::error_code_id::msg_invalid_sfn));
+    error_notifier.get().on_error_indication(fapi::build_msg_ul_dci_error_indication(msg.sfn, msg.slot));
 
     return;
   }
@@ -717,8 +717,7 @@ void fapi_to_phy_translator::tx_data_request(const fapi::tx_data_request_message
   if (!controller.is_initialized()) {
     logger.warning("Sector#{}: Could not acquire downlink processor for slot {}.{}", sector_id, msg.sfn, msg.slot);
     // Raise out of sync error.
-    error_notifier.get().on_error_indication(fapi::build_error_indication(
-        msg.sfn, msg.slot, fapi::message_type_id::tx_data_request, fapi::error_code_id::msg_invalid_sfn));
+    error_notifier.get().on_error_indication(fapi::build_msg_tx_error_indication(msg.sfn, msg.slot));
 
     return;
   }

lib/fapi_adaptor/phy/phy_to_fapi_error_event_translator.cpp

@@ -29,18 +29,14 @@ phy_to_fapi_error_event_translator::phy_to_fapi_error_event_translator() : error
 
 void phy_to_fapi_error_event_translator::on_late_downlink_message(srsran::slot_point dl_frame_slot)
 {
-  error_notifier.get().on_error_indication(fapi::build_error_indication(dl_frame_slot.sfn(),
-                                                                        dl_frame_slot.slot_index(),
-                                                                        fapi::message_type_id::dl_tti_request,
-                                                                        fapi::error_code_id::out_of_sync));
+  error_notifier.get().on_error_indication(fapi::build_msg_error_indication(
+      dl_frame_slot.sfn(), dl_frame_slot.slot_index(), fapi::message_type_id::dl_tti_request));
 }
 
 void phy_to_fapi_error_event_translator::on_late_uplink_message(srsran::slot_point ul_frame_slot)
 {
-  error_notifier.get().on_error_indication(fapi::build_error_indication(ul_frame_slot.sfn(),
-                                                                        ul_frame_slot.slot_index(),
-                                                                        fapi::message_type_id::ul_tti_request,
-                                                                        fapi::error_code_id::out_of_sync));
+  error_notifier.get().on_error_indication(fapi::build_msg_error_indication(
+      ul_frame_slot.sfn(), ul_frame_slot.slot_index(), fapi::message_type_id::ul_tti_request));
 }
 
 void phy_to_fapi_error_event_translator::on_late_prach_message(slot_point prach_msg_slot)