Update main

# Conflicts: # apps/gnb/helpers/string_helpers.h # apps/gnb/radio_notifier_sample.h # include/srsran/asn1/e2ap/e2sm_kpm.h # lib/asn1/e2ap/e2sm_kpm.cpp
srsran · Apr 4, 2024 · 665f40b · 665f40b
2 parents 2f90c8b + fa81b06
commit 665f40b
Show file tree

Hide file tree

Showing 353 changed files with 177,582 additions and 177,138 deletions.
diff --git a/.gitlab/ci/e2e/.env b/.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.46.4
+RETINA_VERSION=0.46.5
 UBUNTU_VERSION=24.04
 AMARISOFT_VERSION=2023-09-08
 SRSUE_VERSION=23.11

diff --git a/.gitlab/ci/e2e/retina_request_zmq.yml b/.gitlab/ci/e2e/retina_request_zmq.yml
@@ -15,9 +15,11 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 1
+      requests: 5
+      limits: 5
     memory:
-      requests: "8G"
+      requests: "26G"
+      limits: "26G"
     ephemeral-storage:
       requests: "6G"
       limits: "6G"
@@ -38,9 +40,11 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 1
+      requests: 5
+      limits: 5
     memory:
-      requests: "8G"
+      requests: "26G"
+      limits: "26G"
     ephemeral-storage:
       requests: "15G"
       limits: "15G"
@@ -59,8 +63,10 @@
     arch: amd64
     cpu:
       requests: 1
+      limits: 1
     memory:
-      requests: "4G"
+      requests: "8G"
+      limits: "8G"
     ephemeral-storage:
       requests: "6G"
       limits: "6G"

diff --git a/.gitlab/ci/e2e/retina_request_zmq_4x4_mimo.yml b/.gitlab/ci/e2e/retina_request_zmq_4x4_mimo.yml
@@ -14,9 +14,11 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 1
+      requests: 5
+      limits: 5
     memory:
-      requests: "8G"
+      requests: "26G"
+      limits: "26G"
     ephemeral-storage:
       requests: "6G"
       limits: "6G"
@@ -39,9 +41,11 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 1
+      requests: 5
+      limits: 5
     memory:
-      requests: "8G"
+      requests: "26G"
+      limits: "26G"
     ephemeral-storage:
       requests: "6G"
       limits: "6G"
@@ -62,8 +66,10 @@
     arch: amd64
     cpu:
       requests: 1
+      limits: 1
     memory:
-      requests: "4G"
+      requests: "8G"
+      limits: "8G"
     ephemeral-storage:
       requests: "6G"
       limits: "6G"

diff --git a/.gitlab/ci/e2e/retina_request_zmq_deb.yml b/.gitlab/ci/e2e/retina_request_zmq_deb.yml
@@ -15,9 +15,11 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 1
+      requests: 5
+      limits: 5
     memory:
-      requests: "8G"
+      requests: "26G"
+      limits: "26G"
     ephemeral-storage:
       requests: "6G"
       limits: "6G"
@@ -38,10 +40,11 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 1
+      requests: 5
+      limits: 5
     memory:
-      requests: "8G"
-      limits: "8G"
+      requests: "26G"
+      limits: "26G"
     ephemeral-storage:
       requests: "6G"
       limits: "6G"
@@ -58,8 +61,10 @@
     arch: amd64
     cpu:
       requests: 1
+      limits: 1
     memory:
-      requests: "4G"
+      requests: "8G"
+      limits: "8G"
     ephemeral-storage:
       requests: "6G"
       limits: "6G"

diff --git a/.gitlab/ci/e2e/retina_request_zmq_single_ue.yml b/.gitlab/ci/e2e/retina_request_zmq_single_ue.yml
@@ -14,9 +14,11 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 1
+      requests: 5
+      limits: 5
     memory:
-      requests: "8G"
+      requests: "26G"
+      limits: "26G"
     ephemeral-storage:
       requests: "6G"
       limits: "6G"
@@ -37,10 +39,11 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 1
+      requests: 5
+      limits: 5
     memory:
-      requests: "8G"
-      limits: "8G"
+      requests: "26G"
+      limits: "26G"
     ephemeral-storage:
       requests: "6G"
       limits: "6G"
@@ -59,8 +62,10 @@
     arch: amd64
     cpu:
       requests: 1
+      limits: 1
     memory:
-      requests: "4G"
+      requests: "8G"
+      limits: "8G"
     ephemeral-storage:
       requests: "6G"
       limits: "6G"

diff --git a/.gitlab/ci/e2e/retina_request_zmq_srsue.yml b/.gitlab/ci/e2e/retina_request_zmq_srsue.yml
@@ -14,9 +14,11 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 1
+      requests: 5
+      limits: 5
     memory:
-      requests: "8G"
+      requests: "26G"
+      limits: "26G"
     ephemeral-storage:
       requests: "6G"
       limits: "6G"
@@ -29,10 +31,11 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 1
+      requests: 5
+      limits: 5
     memory:
-      requests: "8G"
-      limits: "8G"
+      requests: "26G"
+      limits: "26G"
     ephemeral-storage:
       requests: "6G"
       limits: "6G"
@@ -51,8 +54,10 @@
     arch: amd64
     cpu:
       requests: 1
+      limits: 1
     memory:
-      requests: "4G"
+      requests: "8G"
+      limits: "8G"
     ephemeral-storage:
       requests: "6G"
       limits: "6G"

diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
@@ -20,3 +20,5 @@
 
 add_subdirectory(examples)
 add_subdirectory(gnb)
+add_subdirectory(modules)
+add_subdirectory(services)
diff --git a/apps/examples/phy/radio_ssb.cpp b/apps/examples/phy/radio_ssb.cpp
@@ -34,6 +34,7 @@
 #include "lower_phy_example_factory.h"
 #include "rx_symbol_handler_example.h"
 #include "upper_phy_ssb_example.h"
+#include "srsran/adt/spsc_queue.h"
 #include "srsran/phy/adapters/phy_error_adapter.h"
 #include "srsran/phy/adapters/phy_rg_gateway_adapter.h"
 #include "srsran/phy/adapters/phy_rx_symbol_adapter.h"

diff --git a/apps/examples/radio/radio_util_sample.cpp b/apps/examples/radio/radio_util_sample.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "radio_notifier_sample.h"
+#include "srsran/adt/spsc_queue.h"
 #include "srsran/gateways/baseband/baseband_gateway_receiver.h"
 #include "srsran/gateways/baseband/baseband_gateway_transmitter.h"
 #include "srsran/gateways/baseband/buffer/baseband_gateway_buffer_dynamic.h"

diff --git a/apps/gnb/CMakeLists.txt b/apps/gnb/CMakeLists.txt
@@ -23,14 +23,6 @@ add_executable(gnb
         gnb_appconfig_cli11_schema.cpp
         gnb_appconfig_validators.cpp
         gnb_appconfig_translators.cpp
-        gnb_worker_manager.cpp
-        gnb_e2_metric_connector_manager.cpp
-        gnb_du_factory.cpp
-        helpers/metrics_plotter_stdout.cpp
-        helpers/metrics_plotter_json.cpp
-        helpers/rlc_metrics_plotter_json.cpp
-        helpers/gnb_console_helper.cpp
-        helpers/metrics_hub.cpp
         adapters/e1ap_gateway_local_connector.cpp
         adapters/f1c_gateway_local_connector.cpp
         adapters/e2_gateway_remote_connector.cpp
@@ -41,6 +33,7 @@ install(TARGETS gnb
         RUNTIME)
 
 target_link_libraries(gnb
+        srsran_app_services
         srsgnb_app_f1u_connector
         srsran_cu_up
         srsran_cu_cp
@@ -49,26 +42,12 @@ target_link_libraries(gnb
         ngap_asn1
         srsran_e2
         e2ap_asn1
-        srsran_du_high
-        srsran_du
         srsran_gateway
-        mac_fapi_adaptor_factory
-        phy_fapi_adaptor_factory
-        srsran_fapi
-        srsran_phy_support
-        srsran_lower_phy
-        srsran_upper_phy
-        srsran_signal_processors
-        srsran_channel_processors
-        srsran_channel_equalizer
-        srsran_channel_precoder
-        srsran_ru_dummy
-        srsran_ru_generic
-        srsran_ru_ofh
         srsran_pcap
         srsran_support
         srsran_version
         srsran_build_info
+        srsran_flexible_du_ru_dynamic
         )
 
 if (DPDK_FOUND)