Update main

Author: codebot

.gitlab/ci/build.yml

@@ -1975,8 +1975,6 @@ basic avx512 dpdk:
   extends: .build_and_unit
   rules:
     - if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
-      when: delayed
-      start_in: 1 hours
   retry: 2
   interruptible: false
   variables:

.gitlab/ci/docker.yml

@@ -148,6 +148,7 @@ gnb docker compose:
         paths:
           - docker/docker-compose.yml
     - if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
+      interruptible: false
   script:
     - docker compose -f docker/docker-compose.yml build --build-arg NUM_CORES=${KUBERNETES_CPU_LIMIT} --build-arg LIB=${LIB} --build-arg LIB_VERSION=${LIB_VERSION} gnb
     - sh -c "docker compose -f docker/docker-compose.yml run --no-deps gnb ${TEST_CMD}"
@@ -169,6 +170,7 @@ gnb docker compose:
           - docker/open5gs/**/*
           - docker/docker-compose.yml
     - if: $CI_DESCRIPTION =~ /Weekly/
+      interruptible: false
   script:
     - docker compose -f docker/docker-compose.yml build --build-arg NUM_CORES=${KUBERNETES_CPU_LIMIT} 5gc
     - docker compose -f docker/docker-compose.yml run 5gc 5gc -v
@@ -183,6 +185,7 @@ grafana docker compose:
           - docker/grafana/**/*
           - docker/docker-compose.yml
     - if: $CI_DESCRIPTION =~ /Weekly/
+      interruptible: false
   script:
     - docker compose -f docker/docker-compose.yml run --no-deps grafana --version
 
@@ -195,6 +198,7 @@ influxdb docker compose:
           - docker/.env
           - docker/docker-compose.yml
     - if: $CI_DESCRIPTION =~ /Weekly/
+      interruptible: false
   script:
     - docker compose -f docker/docker-compose.yml run influxdb influx version
 
@@ -208,6 +212,7 @@ metrics-server docker compose:
           - docker/metrics_server/**/*
           - docker/docker-compose.yml
     - if: $CI_DESCRIPTION =~ /Weekly/
+      interruptible: false
   script:
     - docker compose -f docker/docker-compose.yml run metrics-server metrics-server --help
 
@@ -274,6 +279,7 @@ grafana server image latest:
       variables:
         MODE: build
     - if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
+      interruptible: false
       variables:
         MODE: publish
   variables:

.gitlab/ci/e2e/.env

@@ -2,7 +2,7 @@ GNB_REMOTE_PATH=/usr/local/bin/gnb
 GNB_IS_EXECUTABLE=true
 SRSGNB_REGISTRY_URI=registry.gitlab.com/softwareradiosystems/srsgnb
 RETINA_REGISTRY_PREFIX=registry.gitlab.com/softwareradiosystems/ci/retina
-RETINA_VERSION=0.50.9
+RETINA_VERSION=0.50.11
 UBUNTU_VERSION=24.04
 AMARISOFT_VERSION=2023-09-08
 SRSUE_VERSION=23.11

apps/cu/CMakeLists.txt

@@ -22,6 +22,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

@@ -72,8 +72,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>
@@ -137,12 +140,18 @@ static void register_app_logs(const logger_appconfig&         log_cfg,
                               const cu_up_unit_logger_config& cu_up_loggers)
 {
   // Set log-level of app and all non-layer specific components to app level.
-  for (const auto& id : {"CU", "ALL", "SCTP-GW", "IO-EPOLL", "UDP-GW", "PCAP"}) {
+  for (const auto& id : {"ALL", "SCTP-GW", "IO-EPOLL", "UDP-GW", "PCAP"}) {
     auto& logger = srslog::fetch_basic_logger(id, false);
     logger.set_level(log_cfg.lib_level);
     logger.set_hex_dump_max_size(log_cfg.hex_max_size);
   }
 
+  auto& app_logger = srslog::fetch_basic_logger("CU", false);
+  app_logger.set_level(srslog::basic_levels::info);
+  app_services::application_message_banners::log_build_info(app_logger);
+  app_logger.set_level(log_cfg.config_level);
+  app_logger.set_hex_dump_max_size(log_cfg.hex_max_size);
+
   auto& config_logger = srslog::fetch_basic_logger("CONFIG", false);
   config_logger.set_level(log_cfg.config_level);
   config_logger.set_hex_dump_max_size(log_cfg.hex_max_size);
@@ -225,7 +234,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));
   }
@@ -242,9 +255,6 @@ int main(int argc, char** argv)
   // Setup size of byte buffer pool.
   init_byte_buffer_segment_pool(cu_cfg.buffer_pool_config.nof_segments, cu_cfg.buffer_pool_config.segment_size);
 
-  // Log build info
-  cu_logger.info("Built in {} mode using {}", get_build_mode(), get_build_info());
-
   // Log CPU architecture.
   // TODO
 

apps/cu/cu_appconfig_yaml_writer.cpp

@@ -0,0 +1,56 @@
+/*
+ *
+ * Copyright 2021-2024 Software Radio Systems Limited
+ *
+ * This file is part of srsRAN.
+ *
+ * srsRAN is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsRAN is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+#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,34 @@
+/*
+ *
+ * Copyright 2021-2024 Software Radio Systems Limited
+ *
+ * This file is part of srsRAN.
+ *
+ * srsRAN is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsRAN is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+#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

@@ -23,6 +23,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

@@ -53,6 +53,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>
@@ -66,6 +68,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
@@ -123,12 +126,18 @@ static void initialize_log(const std::string& filename)
 static void register_app_logs(const logger_appconfig& log_cfg, const dynamic_du_unit_config& du_loggers)
 {
   // Set log-level of app and all non-layer specific components to app level.
-  for (const auto& id : {"GNB", "ALL", "SCTP-GW", "IO-EPOLL", "UDP-GW", "PCAP"}) {
+  for (const auto& id : {"ALL", "SCTP-GW", "IO-EPOLL", "UDP-GW", "PCAP"}) {
     auto& logger = srslog::fetch_basic_logger(id, false);
     logger.set_level(log_cfg.lib_level);
     logger.set_hex_dump_max_size(log_cfg.hex_max_size);
   }
 
+  auto& app_logger = srslog::fetch_basic_logger("GNB", false);
+  app_logger.set_level(srslog::basic_levels::info);
+  app_services::application_message_banners::log_build_info(app_logger);
+  app_logger.set_level(log_cfg.config_level);
+  app_logger.set_hex_dump_max_size(log_cfg.hex_max_size);
+
   auto& config_logger = srslog::fetch_basic_logger("CONFIG", false);
   config_logger.set_level(log_cfg.config_level);
   config_logger.set_hex_dump_max_size(log_cfg.hex_max_size);
@@ -200,7 +209,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));
   }
@@ -230,9 +242,6 @@ int main(int argc, char** argv)
   // Setup size of byte buffer pool.
   init_byte_buffer_segment_pool(du_cfg.buffer_pool_config.nof_segments, du_cfg.buffer_pool_config.segment_size);
 
-  // Log build info
-  du_logger.info("Built in {} mode using {}", get_build_mode(), get_build_info());
-
   // Log CPU architecture.
   cpu_architecture_info::get().print_cpu_info(du_logger);