Update main

# Conflicts:
#	apps/gnb/adapters/f1c_gateway_local_connector.cpp
#	apps/gnb/adapters/f1c_gateway_local_connector.h
#	apps/gnb/adapters/f1c_gateway_remote_connector.cpp
#	apps/gnb/adapters/f1c_gateway_remote_connector.h
#	include/srsran/du/du_config.h
#	include/srsran/f1u/local_connector/f1u_local_bearer_adapter.h
#	lib/cu_cp/cu_cp_controller/cu_cp_controller_factory.cpp
#	lib/cu_cp/cu_cp_controller/cu_cp_controller_factory.h
#	lib/du/du_factory.cpp
#	lib/du/du_impl.cpp
#	lib/du/du_impl.h
#	lib/du/du_low_impl.h
#	tests/unittests/phy/upper/channel_processors/pdsch_processor_test_data.tar.gz
#	tests/unittests/phy/upper/channel_processors/pusch/pusch_processor_test_data.tar.gz
#	tests/unittests/phy/upper/signal_processors/port_channel_estimator_test_data.tar.gz
#	tests/unittests/rlc/rlc_test_helpers.h

Author: codebot

.gitlab/ci/build.yml

@@ -553,13 +553,11 @@ smoke dpdk cached:
         - lib/phy/**/*
         - tests/unittests/phy/**/*
 
-smoke avx512 cached:
+smoke avx512:
   extends: .smoke avx512
   stage: manual
   timeout: 45 min
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
-      when: never
     - if: $ON_MR == "true" && $CI_MERGE_REQUEST_APPROVED == "true"
       changes:
         <<: *instruction_set_changes
@@ -568,9 +566,6 @@ smoke avx512 cached:
         <<: *instruction_set_changes
       when: manual
       allow_failure: false
-  cache:
-    - !reference [.fetch_src_cache, cache]
-    - *cache_build_get
 
 smoke arm cached:
   extends: .smoke arm
@@ -637,13 +632,6 @@ smoke dpdk clean:
   rules:
     - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
 
-smoke avx512 clean:
-  extends: .smoke avx512
-  rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
-      changes:
-        <<: *instruction_set_changes
-
 smoke arm clean:
   extends: .smoke arm
   rules:
@@ -838,18 +826,6 @@ smoke valgrind update cache:
     <<: *build_artifacts
     expire_in: 3 day
 
-smoke avx512 update cache:
-  extends: .smoke avx512
-  rules:
-    - if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
-      when: delayed
-      start_in: 30 minutes
-  retry: 2
-  interruptible: false
-  cache:
-    - !reference [.fetch_src_cache, cache]
-    - *cache_build_set
-
 smoke arm update cache:
   extends: .smoke arm
   rules:
@@ -1297,7 +1273,7 @@ debian 11 amd64 avx512:
         SANITIZER: tsan
         COMPILER: [gcc, clang]
         ENABLE_TSAN: "True"
-        TEST_MODE: tsan
+        TEST_MODE: default
       - OS: [ubuntu-22.04, ubuntu-20.04]
         SANITIZER: asan
         COMPILER: [gcc, clang]
@@ -1338,7 +1314,7 @@ sanitizers amd64 avx512:
         SANITIZER: tsan
         COMPILER: [gcc, clang]
         ENABLE_TSAN: "True"
-        TEST_MODE: tsan
+        TEST_MODE: default
       - OS: [ubuntu-22.04, ubuntu-20.04]
         SANITIZER: asan
         COMPILER: [gcc, clang]

.gitlab/ci/e2e/.env

@@ -1,6 +1,6 @@
 SRSGNB_REGISTRY_URI=registry.gitlab.com/softwareradiosystems/srsgnb
 RETINA_REGISTRY_PREFIX=registry.gitlab.com/softwareradiosystems/ci/retina
-RETINA_VERSION=0.48.14
+RETINA_VERSION=0.49.3
 UBUNTU_VERSION=24.04
 AMARISOFT_VERSION=2023-09-08
 SRSUE_VERSION=23.11

.gitlab/configuration.json

@@ -63,6 +63,7 @@
             "allow_force_push": false,
             "allowed_to_merge": [
                 {
+                    "id": 112801326,
                     "access_level": 30,
                     "access_level_description": "Developers + Maintainers",
                     "group_id": null,
@@ -71,10 +72,12 @@
             ],
             "allowed_to_push": [
                 {
+                    "id": 125247413,
                     "access_level": 0,
                     "access_level_description": "No one",
                     "group_id": null,
-                    "user_id": null
+                    "user_id": null,
+                    "deploy_key_id": null
                 }
             ],
             "code_owner_approval_required": false,
@@ -84,6 +87,7 @@
             "allow_force_push": false,
             "allowed_to_merge": [
                 {
+                    "id": 112801343,
                     "access_level": 0,
                     "access_level_description": "No one",
                     "group_id": null,
@@ -92,10 +96,12 @@
             ],
             "allowed_to_push": [
                 {
+                    "id": 125247430,
                     "access_level": 40,
                     "access_level_description": "$CODEBOT_USERNAME",
                     "group_id": null,
-                    "user_id": $CODEBOT_USER_ID
+                    "user_id": $CODEBOT_USER_ID,
+                    "deploy_key_id": null
                 }
             ],
             "code_owner_approval_required": false,
@@ -105,6 +111,7 @@
             "allow_force_push": false,
             "allowed_to_merge": [
                 {
+                    "id": 112801340,
                     "access_level": 40,
                     "access_level_description": "Maintainers",
                     "group_id": null,
@@ -113,10 +120,12 @@
             ],
             "allowed_to_push": [
                 {
+                    "id": 125247427,
                     "access_level": 40,
                     "access_level_description": "Maintainers",
                     "group_id": null,
-                    "user_id": null
+                    "user_id": null,
+                    "deploy_key_id": null
                 }
             ],
             "code_owner_approval_required": false,
@@ -131,7 +140,8 @@
                     "access_level": 40,
                     "access_level_description": "Maintainers",
                     "group_id": null,
-                    "user_id": null
+                    "user_id": null,
+                    "deploy_key_id": null
                 }
             ]
         }

apps/examples/du/phy_factory.cpp

@@ -95,7 +95,7 @@ std::unique_ptr<upper_phy> srsran::create_upper_phy(const upper_phy_params&
   upper_config.rx_buffer_config.expire_timeout_slots = 100 * nof_slots_per_subframe;
   upper_config.rx_buffer_config.external_soft_bits   = false;
 
-  upper_config.dl_executors               = dl_executors;
+  upper_config.dl_executors               = std::vector<task_executor*>(dl_executors.begin(), dl_executors.end());
   upper_config.rg_gateway                 = rg_gateway;
   upper_config.pucch_executor             = ul_executor;
   upper_config.pusch_executor             = ul_executor;

apps/gnb/CMakeLists.txt

@@ -24,8 +24,6 @@ add_executable(gnb
         gnb_appconfig_validators.cpp
         gnb_appconfig_translators.cpp
         adapters/e1ap_gateway_local_connector.cpp
-        adapters/f1c_gateway_local_connector.cpp
-        adapters/f1c_gateway_remote_connector.cpp
         adapters/e2_gateway_remote_connector.cpp
         adapters/ngap_adapter.cpp
         )
@@ -36,7 +34,6 @@ install(TARGETS gnb
 target_link_libraries(gnb
         srsran_app_services
         srsgnb_app_f1u_connector
-        srsran_cu_up
         srsran_cu_cp
         srsran_network
         srsran_ngap
@@ -49,6 +46,7 @@ target_link_libraries(gnb
         srsran_version
         srsran_build_info
         srsran_flexible_du_ru_dynamic
+        srsran_f1c_gateway
         srsran_cu_cp_app_unit
         srsran_cu_up_app_unit
         )

apps/gnb/adapters/e2_gateway_remote_connector.cpp

@@ -28,9 +28,9 @@
 
 namespace srsran {
 
-e2_gateway_remote_connector::e2_gateway_remote_connector(io_broker&                   broker_,
-                                                         sctp_network_gateway_config& net_gw_config_,
-                                                         dlt_pcap&                    e2ap_pcap_writer_) :
+e2_gateway_remote_connector::e2_gateway_remote_connector(io_broker&                     broker_,
+                                                         sctp_network_connector_config& net_gw_config_,
+                                                         dlt_pcap&                      e2ap_pcap_writer_) :
   logger(srslog::fetch_basic_logger("E2AP")),
   broker(broker_),
   net_gw_config(net_gw_config_),

apps/gnb/adapters/e2_gateway_remote_connector.h

@@ -34,9 +34,9 @@ class dlt_pcap;
 class e2_gateway_remote_connector final : public e2_connection_client
 {
 public:
-  explicit e2_gateway_remote_connector(io_broker&                   broker_,
-                                       sctp_network_gateway_config& net_gw_config_,
-                                       dlt_pcap&                    e2ap_pcap_writer_);
+  explicit e2_gateway_remote_connector(io_broker&                     broker_,
+                                       sctp_network_connector_config& net_gw_config_,
+                                       dlt_pcap&                      e2ap_pcap_writer_);
 
   // E2 Agent interface.
   std::unique_ptr<e2_message_notifier> handle_connection_request() override;
@@ -50,7 +50,7 @@ class e2_gateway_remote_connector final : public e2_connection_client
 private:
   srslog::basic_logger&             logger;
   io_broker&                        broker;
-  sctp_network_gateway_config&      net_gw_config;
+  sctp_network_connector_config&    net_gw_config;
   dlt_pcap&                         e2ap_pcap_writer;
   std::vector<e2_message_notifier*> e2ap_notifiers;
 };

apps/gnb/adapters/e2ap_adapter.h

@@ -78,7 +78,7 @@ class e2ap_network_adapter : public e2_message_notifier,
   ///
   /// In case the gateway was configured to listen on port 0, i.e. the operating system shall pick a random free port,
   /// this function can be used to get the actual port number.
-  optional<uint16_t> get_listen_port()
+  std::optional<uint16_t> get_listen_port()
   {
     if (gateway == nullptr) {
       return {};