update du_high split6 fapi adaptor interface

Author: sauka

apps/units/flexible_o_du/split_6/o_du_high/split6_o_du_application_unit_impl.cpp

@@ -17,6 +17,7 @@
 #include "split6_o_du_unit_cli11_schema.h"
 #include "split6_o_du_unit_config_validator.h"
 #include "split6_o_du_unit_logger_registrator.h"
+#include "srsran/du/du_high/du_high_configuration.h"
 
 using namespace srsran;
 
@@ -66,11 +67,12 @@ void split6_o_du_application_unit_impl::on_parsing_configuration_registration(CL
 
 o_du_unit split6_o_du_application_unit_impl::create_flexible_o_du_unit(const o_du_unit_dependencies& dependencies)
 {
-  // Get the cells config.
-  std::vector<srs_du::du_cell_config> du_cells_cfg = generate_du_cell_config(unit_cfg.odu_high_cfg.du_high_cfg.config);
+  // Get the du_high configuration.
+  srs_du::du_high_configuration du_hi_cfg;
+  generate_du_high_config(du_hi_cfg, unit_cfg.odu_high_cfg.du_high_cfg.config);
 
   // Create the adaptors.
-  auto fapi_ctrl = plugin->create_fapi_adaptor(du_cells_cfg, dependencies);
+  auto fapi_ctrl = plugin->create_fapi_adaptor(du_hi_cfg, dependencies);
   report_error_if_not(!fapi_ctrl.empty(), "Could not create FAPI adaptor");
   auto du_impl = create_o_du_split6(unit_cfg, dependencies, std::move(fapi_ctrl));
   report_error_if_not(du_impl.unit, "Could not create split 6 DU");

apps/units/flexible_o_du/split_6/o_du_high/split6_plugin.h

@@ -25,7 +25,7 @@ struct o_du_unit_dependencies;
 struct worker_manager_config;
 
 namespace srs_du {
-struct du_cell_config;
+struct du_high_configuration;
 }
 
 /// \brief Split 6 plugin interface.
@@ -47,7 +47,7 @@ class split6_plugin
 
   /// Creates and returns a vector of fapi adaptors, each of them representing a cell.
   virtual std::vector<std::unique_ptr<fapi::fapi_adaptor>>
-  create_fapi_adaptor(span<const srs_du::du_cell_config> du_cell_cfg, const o_du_unit_dependencies& dependencies) = 0;
+  create_fapi_adaptor(const srs_du::du_high_configuration& du_high_cfg, const o_du_unit_dependencies& dependencies) = 0;
 
   /// Fills the given worker manager split 6 configuration.
   virtual void fill_worker_manager_config(worker_manager_config& config) = 0;

apps/units/flexible_o_du/split_6/o_du_high/split6_plugin_dummy.cpp

@@ -9,6 +9,7 @@
  */
 
 #include "split6_plugin_dummy.h"
+#include "srsran/du/du_high/du_high_configuration.h"
 #include "srsran/fapi/slot_last_message_notifier.h"
 #include "srsran/fapi/slot_message_gateway.h"
 #include "srsran/fapi_adaptor/fapi_operation_controller.h"
@@ -85,10 +86,10 @@ class fapi_adaptor_dummy : public fapi::fapi_adaptor,
 } // namespace
 
 std::vector<std::unique_ptr<fapi::fapi_adaptor>>
-split6_plugin_dummy::create_fapi_adaptor(span<const srs_du::du_cell_config> du_cell_cfg,
-                                         const o_du_unit_dependencies&      dependencies)
+split6_plugin_dummy::create_fapi_adaptor(const srs_du::du_high_configuration& du_high_cfg,
+                                         const o_du_unit_dependencies&        dependencies)
 {
-  std::vector<std::unique_ptr<fapi::fapi_adaptor>> output(du_cell_cfg.size());
+  std::vector<std::unique_ptr<fapi::fapi_adaptor>> output(du_high_cfg.ran.cells.size());
   for (auto& cell : output) {
     cell = std::make_unique<fapi_adaptor_dummy>();
   }

apps/units/flexible_o_du/split_6/o_du_high/split6_plugin_dummy.h

@@ -34,8 +34,8 @@ class split6_plugin_dummy : public split6_plugin
 
   // See interface for documentation.
   std::vector<std::unique_ptr<fapi::fapi_adaptor>>
-  create_fapi_adaptor(span<const srs_du::du_cell_config> du_cell_cfg,
-                      const o_du_unit_dependencies&      dependencies) override;
+  create_fapi_adaptor(const srs_du::du_high_configuration& du_high_cfg,
+                      const o_du_unit_dependencies&        dependencies) override;
 };
 
 } // namespace srsran