config: added YAML writter to the CU and DU application configurations

Author: AlaiaL

apps/cu/CMakeLists.txt

@@ -10,6 +10,7 @@ add_executable(srscu
     cu.cpp
 	cu_appconfig_cli11_schema.cpp
 	cu_appconfig_validator.cpp
+	cu_appconfig_yaml_writer.cpp
 	cu_worker_manager.cpp
 )
 

apps/cu/cu.cpp

@@ -60,8 +60,11 @@
 #include "apps/services/application_message_banners.h"
 #include "apps/services/application_tracer.h"
 #include "apps/services/stdin_command_dispatcher.h"
+#include "apps/units/cu_cp/cu_cp_unit_config_yaml_writer.h"
+#include "apps/units/cu_up/cu_up_unit_config_yaml_writer.h"
 #include "cu_appconfig.h"
 #include "cu_appconfig_validator.h"
+#include "cu_appconfig_yaml_writer.h"
 
 #include <atomic>
 #include <thread>
@@ -213,7 +216,11 @@ int main(int argc, char** argv)
   // Log input configuration.
   srslog::basic_logger& config_logger = srslog::fetch_basic_logger("CONFIG");
   if (config_logger.debug.enabled()) {
-    config_logger.debug("Input configuration (all values): \n{}", app.config_to_str(true, false));
+    YAML::Node node;
+    fill_cu_appconfig_in_yaml_schema(node, cu_cfg);
+    fill_cu_up_config_in_yaml_schema(node, cu_up_config);
+    fill_cu_cp_config_in_yaml_schema(node, cu_cp_config);
+    config_logger.debug("Input configuration (all values): \n{}", YAML::Dump(node));
   } else {
     config_logger.info("Input configuration (only non-default values): \n{}", app.config_to_str(false, false));
   }

apps/cu/cu_appconfig_yaml_writer.cpp

@@ -0,0 +1,44 @@
+/*
+ *
+ * Copyright 2021-2024 Software Radio Systems Limited
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the distribution.
+ *
+ */
+
+#include "cu_appconfig_yaml_writer.h"
+#include "apps/services/logger/logger_appconfig_yaml_writer.h"
+#include "cu_appconfig.h"
+
+using namespace srsran;
+
+static void fill_cu_appconfig_buffer_pool_section(YAML::Node node, const buffer_pool_appconfig& config)
+{
+  node["nof_segments"] = config.nof_segments;
+  node["segment_size"] = config.segment_size;
+}
+
+static void fill_cu_appconfig_f1ap_section(YAML::Node node, const srs_cu::cu_f1ap_appconfig& config)
+{
+  YAML::Node cu_cp_node     = node["cu_cp"];
+  YAML::Node f1ap_node      = cu_cp_node["f1ap"];
+  f1ap_node["bind_address"] = config.bind_addr;
+}
+
+static void fill_cu_appconfig_nru_section(YAML::Node node, const srs_cu::cu_nru_appconfig& config)
+{
+  YAML::Node cu_up_node       = node["cu_up"];
+  YAML::Node nru_node         = cu_up_node["nru"];
+  nru_node["udp_max_rx_msgs"] = config.udp_rx_max_msgs;
+  nru_node["bind_addr"]       = config.bind_addr;
+}
+
+void srsran::fill_cu_appconfig_in_yaml_schema(YAML::Node& node, const cu_appconfig& config)
+{
+  fill_logger_appconfig_in_yaml_schema(node, config.log_cfg);
+  fill_cu_appconfig_buffer_pool_section(node["buffer_pool"], config.buffer_pool_config);
+  fill_cu_appconfig_f1ap_section(node, config.f1ap_cfg);
+  fill_cu_appconfig_nru_section(node, config.nru_cfg);
+}

apps/cu/cu_appconfig_yaml_writer.h

@@ -0,0 +1,22 @@
+/*
+ *
+ * Copyright 2021-2024 Software Radio Systems Limited
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the distribution.
+ *
+ */
+
+#pragma once
+
+#include <yaml-cpp/yaml.h>
+
+namespace srsran {
+
+struct cu_appconfig;
+
+/// Fills the given node with the CU application configuration values.
+void fill_cu_appconfig_in_yaml_schema(YAML::Node& node, const cu_appconfig& config);
+
+} // namespace srsran

apps/du/CMakeLists.txt

@@ -11,6 +11,7 @@ add_executable(srsdu
     du_appconfig_cli11_schema.cpp
     du_appconfig_validators.cpp
     du_appconfig_translators.cpp
+    du_appconfig_yaml_writer.cpp
     ../gnb/adapters/e2_gateway_remote_connector.cpp # TODO: Delete
 )
 

apps/du/du.cpp

@@ -41,6 +41,8 @@
 
 // Include ThreadSanitizer (TSAN) options if thread sanitization is enabled.
 // This include is not unused - it helps prevent false alarms from the thread sanitizer.
+#include "du_appconfig_yaml_writer.h"
+
 #include "srsran/support/tsan_options.h"
 
 #include <atomic>
@@ -54,6 +56,7 @@
 #include "apps/units/flexible_du/du_high/pcap_factory.h"
 #include "apps/units/flexible_du/split_dynamic/dynamic_du_unit_cli11_schema.h"
 #include "apps/units/flexible_du/split_dynamic/dynamic_du_unit_config_validator.h"
+#include "apps/units/flexible_du/split_dynamic/dynamic_du_unit_config_yaml_writer.h"
 #include "apps/units/flexible_du/split_dynamic/dynamic_du_unit_logger_registrator.h"
 
 #ifdef DPDK_FOUND
@@ -188,7 +191,10 @@ int main(int argc, char** argv)
   // Log input configuration.
   srslog::basic_logger& config_logger = srslog::fetch_basic_logger("CONFIG");
   if (config_logger.debug.enabled()) {
-    config_logger.debug("Input configuration (all values): \n{}", app.config_to_str(true, false));
+    YAML::Node node;
+    fill_du_appconfig_in_yaml_schema(node, du_cfg);
+    fill_dynamic_du_unit_config_in_yaml_schema(node, du_unit_cfg);
+    config_logger.debug("Input configuration (all values): \n{}", YAML::Dump(node));
   } else {
     config_logger.info("Input configuration (only non-default values): \n{}", app.config_to_str(false, false));
   }

apps/du/du_appconfig_yaml_writer.cpp

@@ -0,0 +1,102 @@
+/*
+ *
+ * Copyright 2021-2024 Software Radio Systems Limited
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the distribution.
+ *
+ */
+
+#include "du_appconfig_yaml_writer.h"
+#include "apps/services/logger/logger_appconfig_yaml_writer.h"
+#include "du_appconfig.h"
+
+using namespace srsran;
+
+static void fill_du_appconfig_metrics_section(YAML::Node node, const srs_du::metrics_appconfig& config)
+{
+  node["enable_json_metrics"]      = config.enable_json_metrics;
+  node["addr"]                     = config.addr;
+  node["port"]                     = config.port;
+  node["autostart_stdout_metrics"] = config.autostart_stdout_metrics;
+  node["stdout_metrics_period"]    = config.stdout_metrics_period;
+}
+
+static void fill_du_appconfig_e2_section(YAML::Node node, const e2_appconfig& config)
+{
+  node["enable_du_e2"]           = config.enable_du_e2;
+  node["addr"]                   = config.ip_addr;
+  node["port"]                   = config.port;
+  node["bind_addr"]              = config.bind_addr;
+  node["sctp_rto_initial"]       = config.sctp_rto_initial;
+  node["sctp_rto_min"]           = config.sctp_rto_min;
+  node["sctp_rto_max"]           = config.sctp_rto_max;
+  node["sctp_init_max_attempts"] = config.sctp_init_max_attempts;
+  node["sctp_max_init_timeo"]    = config.sctp_max_init_timeo;
+  node["e2sm_kpm_enabled"]       = config.e2sm_kpm_enabled;
+  node["e2sm_rc_enabled"]        = config.e2sm_rc_enabled;
+}
+
+static void fill_du_appconfig_hal_section(YAML::Node node, const std::optional<hal_appconfig>& config)
+{
+  if (!config.has_value()) {
+    return;
+  }
+  YAML::Node hal_node  = node["hal"];
+  hal_node["eal_args"] = config.value().eal_args;
+}
+
+static void fill_du_appconfig_expert_execution_section(YAML::Node node, const expert_execution_appconfig& config)
+{
+  {
+    YAML::Node affinities_node = node["affinities"];
+
+    if (config.affinities.isolated_cpus.has_value()) {
+      affinities_node["isolated_cpus"] =
+          fmt::format("{:,}", span<const size_t>(config.affinities.isolated_cpus.value().get_cpu_ids()));
+    }
+
+    if (config.affinities.low_priority_cpu_cfg.mask.any()) {
+      affinities_node["low_priority_cpus"] =
+          fmt::format("{:,}", span<const size_t>(config.affinities.low_priority_cpu_cfg.mask.get_cpu_ids()));
+    }
+    affinities_node["low_priority_pinning"] = to_string(config.affinities.low_priority_cpu_cfg.pinning_policy);
+  }
+
+  {
+    YAML::Node threads_node           = node["threads"];
+    YAML::Node non_rt_node            = threads_node["non_rt"];
+    non_rt_node["nof_non_rt_threads"] = config.threads.non_rt_threads.nof_non_rt_threads;
+  }
+}
+
+static void fill_du_appconfig_buffer_pool_section(YAML::Node node, const buffer_pool_appconfig& config)
+{
+  node["nof_segments"] = config.nof_segments;
+  node["segment_size"] = config.segment_size;
+}
+
+static void fill_du_appconfig_nru_section(YAML::Node node, const srs_du::nru_appconfig& config)
+{
+  node["queue_size"] = config.pdu_queue_size;
+  node["bind_addr"]  = config.bind_address;
+}
+
+static void fill_du_appconfig_f1ap_section(YAML::Node node, const srs_du::f1ap_appconfig& config)
+{
+  node["cu_cp_addr"] = config.cu_cp_address;
+  node["bind_addr"]  = config.bind_address;
+}
+
+void srsran::fill_du_appconfig_in_yaml_schema(YAML::Node& node, const du_appconfig& config)
+{
+  fill_logger_appconfig_in_yaml_schema(node, config.log_cfg);
+  fill_du_appconfig_metrics_section(node["metrics"], config.metrics_cfg);
+  fill_du_appconfig_e2_section(node["e2"], config.e2_cfg);
+  fill_du_appconfig_hal_section(node, config.hal_config);
+  fill_du_appconfig_expert_execution_section(node["expert_execution"], config.expert_execution_cfg);
+  fill_du_appconfig_buffer_pool_section(node["buffer_pool"], config.buffer_pool_config);
+  fill_du_appconfig_nru_section(node["nru"], config.nru_cfg);
+  fill_du_appconfig_f1ap_section(node["f1ap"], config.f1ap_cfg);
+}

apps/du/du_appconfig_yaml_writer.h

@@ -0,0 +1,22 @@
+/*
+ *
+ * Copyright 2021-2024 Software Radio Systems Limited
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the distribution.
+ *
+ */
+
+#pragma once
+
+#include <yaml-cpp/yaml.h>
+
+namespace srsran {
+
+struct du_appconfig;
+
+/// Fills the given node with the DU application configuration values.
+void fill_du_appconfig_in_yaml_schema(YAML::Node& node, const du_appconfig& config);
+
+} // namespace srsran

apps/gnb/gnb.cpp

@@ -245,18 +245,12 @@ int main(int argc, char** argv)
   // Log input configuration.
   srslog::basic_logger& config_logger = srslog::fetch_basic_logger("CONFIG");
   if (config_logger.debug.enabled()) {
-    // Refesh defaults in case some parameters may have changed after the autoderivation process.
-    refresh_defaults(app);
-    config_logger.debug("Input configuration (all values): \n{}", app.config_to_str(true, false));
-
-    config_logger.debug("NOW IT GOES THE MANUAL CONFIG");
     YAML::Node node;
     fill_gnb_appconfig_in_yaml_schema(node, gnb_cfg);
     fill_cu_up_config_in_yaml_schema(node, cu_up_config);
     fill_cu_cp_config_in_yaml_schema(node, cu_cp_config);
     fill_dynamic_du_unit_config_in_yaml_schema(node, du_unit_cfg);
-    config_logger.debug("CU-UP config values: \n{}", YAML::Dump(node));
-
+    config_logger.debug("Input configuration (all values): \n{}", YAML::Dump(node));
   } else {
     config_logger.info("Input configuration (only non-default values): \n{}", app.config_to_str(false, false));
   }

apps/gnb/gnb_appconfig_yaml_writer.cpp

@@ -59,7 +59,7 @@ static void fill_gnb_appconfig_expert_execution_section(YAML::Node node, const e
     }
 
     if (config.affinities.low_priority_cpu_cfg.mask.any()) {
-      affinities_node["l2_cell_cpus"] =
+      affinities_node["low_priority_cpus"] =
           fmt::format("{:,}", span<const size_t>(config.affinities.low_priority_cpu_cfg.mask.get_cpu_ids()));
     }
     affinities_node["low_priority_pinning"] = to_string(config.affinities.low_priority_cpu_cfg.pinning_policy);
@@ -90,4 +90,4 @@ void srsran::fill_gnb_appconfig_in_yaml_schema(YAML::Node& node, const gnb_appco
   fill_gnb_appconfig_hal_section(node, config.hal_config);
   fill_gnb_appconfig_expert_execution_section(node["expert_execution"], config.expert_execution_cfg);
   fill_gnb_appconfig_buffer_pool_section(node["buffer_pool"], config.buffer_pool_config);
-}
+}