Add RAN-Channel-Simulation into parent CI pipeline

For now, test in the following configuration:
- 16 parallel channels
- channel length of 32
- with 61440 and 122880 samples
- 15 trials per each test (due to CUDA kernel loading delay in first iterations)
- multiple MIMO configurations: 2TX - 2/4/8/32 RX, 2/4/8/32 TX - 2RX

To be added:
- test with greater channel length
- test with more parallel channels

.gitignore

@@ -20,14 +20,6 @@ GRTAGS
 GTAGS
 tags
 
-# Package conffiles
-
-tools/packages/oai-lte/conffiles
-tools/packages/oai-nr/conffiles
-tools/packages/liboai-common/conffiles
-tools/packages/liboai-usrp/conffiles
-
-
 # others
 nfapi_nr_interface_scf
 *.log

CMakeLists.txt

@@ -22,7 +22,6 @@
 cmake_minimum_required (VERSION 3.16)
 project (OpenAirInterface LANGUAGES C CXX)
 set(CMAKE_CXX_STANDARD 17)
-set(OAI_VERSION 2.4.0)
 
 option(CUDA_ENABLE "Enable CUDA accelerated channel simulation" OFF)
 if(CUDA_ENABLE)
@@ -94,15 +93,6 @@ endif()
 ###################################
 include(FindPkgConfig)
 
-
-option(PACKAGING_RPM "By default will create debian packages, with this option willl create rpm packages" OFF)
-option(PACKAGING_NR "Will produce a package containing nr target, configuration files and docs" OFF)
-option(PACKAGING_LTE "Will produce a package containing lte target, configuration files and docs" OFF)
-option(PACKAGING_COMMON "Will produce a package containing common target, configuration files and docs" OFF)
-option(PACKAGING_USRP "Will produce a package containing usrp target, configuration files and docs" OFF)
-option(PACKAGING_PHYSIM "Will produce a package containing physim target, configuration files and docs" OFF)
-
-
 # Check if asn1c is installed, and check if it supports all options we need
 # a user can provide ASN1C_EXEC to override an asn1c to use (e.g., parallel
 # installation)
@@ -129,6 +119,8 @@ set (NFAPI_USER_DIR  ${OPENAIR_DIR}/nfapi/oai_integration)
 set (OPENAIR1_DIR    ${OPENAIR_DIR}/openair1)
 set (OPENAIR2_DIR    ${OPENAIR_DIR}/openair2)
 set (OPENAIR3_DIR    ${OPENAIR_DIR}/openair3)
+set (OPENAIR3_DIR    ${OPENAIR_DIR}/openair3)
+set (OPENAIR_CMAKE   ${OPENAIR_DIR}/cmake_targets)
 
 project (OpenAirInterface)
 
@@ -198,8 +190,6 @@ elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
     set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -gdwarf-2 -mcpu=neoverse-n1  -lgcc -lrt")
   elseif (CPUPART MATCHES "0xd49") # Neoverse-N2
     set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -gdwarf-2 -mcpu=neoverse-n2 -ftree-vectorize -lgcc -lrt")
-  elseif (CPUPART MATCHES "0xd03") # Cortex-A53
-    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -gdwarf-2 -mcpu=cortex-a53 -lgcc -lrt")
   else ()
     set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -gdwarf-2 -mcpu=native -lgcc -lrt")
   endif()
@@ -208,12 +198,7 @@ else()
 endif()
 
 if (NOT CROSS_COMPILE)
-  if (CPUPART MATCHES "0xd03")
-    # Cortex-A53 does not support ARMv8.2-A extensions
-    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -march=armv8-a+simd")
-  else()
-    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -march=native")
-  endif()
+  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -march=native")
 else ()
   set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -march=armv8.2-a")
 endif()
@@ -269,16 +254,9 @@ endif()
 
 add_definitions("-DASN_DISABLE_OER_SUPPORT -DHAVE_CONFIG_H -DHAVE_CONFIG_H_")
 
-set(CMAKE_SKIP_BUILD_RPATH FALSE)
-set(CMAKE_BUILD_RPATH ${CMAKE_CURRENT_BINARY_DIR})
-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-set(CMAKE_INSTALL_RPATH "")
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
-
-if(PACKAGING_LTE OR PACKAGING_NR OR PACKAGING_COMMON OR PACKAGING_USRP OR PACKAGING_PHYSIM)
-  set(CMAKE_SKIP_INSTALL_RPATH TRUE)
-endif()
-
+#########################
+set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -ggdb2 -Wl,-rpath -Wl,${CMAKE_CURRENT_BINARY_DIR}")
+#########################
 # set a flag for changes in the source code
 # these changes are related to hardcoded path to include .h files
 set(debugOpt "-ggdb2 -DMALLOC_CHECK_=3 -fno-delete-null-pointer-checks")
@@ -352,7 +330,7 @@ add_boolean_option(TRACY_ENABLE OFF "Enable tracy instrumentation" ON)
 if (TRACY_ENABLE)
   # the tracy version here should match the tracy server version
   # below is latest release as of this commit
-  CPMAddPackage("gh:wolfpld/tracy#v0.13.1")
+  CPMAddPackage("gh:wolfpld/tracy#0.12.2")
 endif()
 
 set (OCP_ITTI ${OPENAIR_DIR}/common/utils/ocp_itti)
@@ -397,7 +375,7 @@ target_link_libraries(lte_rrc PRIVATE nr_rrc)
 #NR RRC
 #######
 add_library(nr_rrc ${OPENAIR2_DIR}/RRC/NR/MESSAGES/asn1_msg.c)
-target_link_libraries(nr_rrc PUBLIC asn1_nr_rrc asn1_lte_rrc rrc_cell_management)
+target_link_libraries(nr_rrc PUBLIC asn1_nr_rrc asn1_lte_rrc)
 
 # S1AP
 ##############
@@ -434,9 +412,7 @@ add_library(ngap
   ${NGAP_DIR}/ngap_gNB_handlers.c
   ${NGAP_DIR}/ngap_gNB_itti_messaging.c
   ${NGAP_DIR}/ngap_gNB_management_procedures.c
-  ${NGAP_DIR}/ngap_gNB_paging.c
   ${NGAP_DIR}/ngap_gNB_nas_procedures.c
-  ${NGAP_DIR}/ngap_gNB_pdu_session_management.c
   ${NGAP_DIR}/ngap_gNB_nnsf.c
   ${NGAP_DIR}/ngap_gNB_overload.c
   ${NGAP_DIR}/ngap_gNB_trace.c
@@ -444,9 +420,6 @@ add_library(ngap
   )
 target_link_libraries(ngap PUBLIC asn1_ngap)
 target_link_libraries(ngap PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
-if(ENABLE_TESTS)
-  target_compile_definitions(ngap PRIVATE ENABLE_TESTS)
-endif()
 
 #M2AP
 ##############
@@ -537,7 +510,7 @@ add_library(f1ap
             ${F1AP_DIR}/f1ap_itti_messaging.c)
 target_include_directories(f1ap PUBLIC F1AP_DIR)
 target_link_libraries(f1ap PUBLIC asn1_f1ap GTPV1U)
-target_link_libraries(f1ap PRIVATE ngap nr_rrc ds f1ap_lib)
+target_link_libraries(f1ap PRIVATE ngap nr_rrc HASHTABLE f1ap_lib)
 target_include_directories(f1ap PRIVATE ${F1AP_DIR}/lib)
 if(E2_AGENT)
   target_compile_definitions(f1ap PRIVATE E2_AGENT)
@@ -575,6 +548,8 @@ target_link_libraries(params_libconfig PRIVATE config_internals ${libconfig_LIBR
 add_library(shlib_loader OBJECT common/utils/load_module_shlib.c)
 target_link_libraries(shlib_loader PRIVATE CONFIG_LIB)
 
+include_directories ("${OPENAIR_DIR}/radio/COMMON")
+
 ##############################################################
 #    ???!!! TO BE DOCUMENTED OPTIONS !!!???
 ##############################################################
@@ -653,6 +628,7 @@ include_directories("${OPENAIR3_DIR}/S1AP")
 include_directories("${OPENAIR2_DIR}/X2AP")
 include_directories("${OPENAIR2_DIR}/M2AP")
 include_directories("${OPENAIR2_DIR}/F1AP")
+include_directories("${OPENAIR3_DIR}/ocp-gtpu")
 include_directories("${OPENAIR3_DIR}/M3AP")
 include_directories("${OPENAIR3_DIR}/MME_APP")
 include_directories("${OPENAIR_DIR}/radio/COMMON")
@@ -674,6 +650,12 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/common/utils/T
 # set the T_LIB name to T if the target exists, otherwise leave empty
 set(T_LIB $<TARGET_NAME_IF_EXISTS:T>)
 
+add_library(HASHTABLE
+  ${OPENAIR_DIR}/common/utils/hashtable/hashtable.c
+  ${OPENAIR_DIR}/common/utils/hashtable/obj_hashtable.c
+)
+include_directories(${OPENAIR_DIR}/common/utils/hashtable)
+
 add_library(UTIL
   ${OPENAIR_DIR}/common/utils/LOG/vcd_signal_dumper.c
   ${OPENAIR2_DIR}/UTIL/OPT/probe.c
@@ -831,6 +813,24 @@ include_directories(${NFAPI_USER_DIR})
 
 # Layer 1
 #############################
+set(PHY_POLARSRC
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_init.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_bitwise_operations.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_crc_byte.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_interleaving_pattern.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_kernal_operation.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_kronecker_power_matrices.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_matrix_and_array.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_procedures.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_sequence_pattern.c
+)
+set(PHY_SMALLBLOCKSRC
+  ${OPENAIR1_DIR}/PHY/CODING/nrSmallBlock/encodeSmallBlock.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrSmallBlock/decodeSmallBlock.c
+)
 set(PHY_TURBOIF
   ${OPENAIR1_DIR}/PHY/CODING/coding_load.c
 )
@@ -841,6 +841,8 @@ set(PHY_NRLDPC_CODINGIF
 
 add_library(dfts MODULE ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts.c ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts_neon.c)
 
+add_library(crc_byte OBJECT ${OPENAIR1_DIR}/PHY/CODING/crc_byte.c)
+
 set(PHY_SRC_COMMON
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools_common.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/lte_mcs.c
@@ -930,6 +932,7 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/sss_gen.c
   ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
   ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/linear_preprocessing_rec.c
   ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_decoding.c
   ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c
   ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/uci_tools_ue.c
@@ -1008,6 +1011,8 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/TOOLS/dB_routines.c
   ${OPENAIR1_DIR}/PHY/TOOLS/sqrt.c
   ${OPENAIR1_DIR}/PHY/TOOLS/oai_arith_operations.c
+  ${PHY_POLARSRC}
+  ${PHY_SMALLBLOCKSRC}
   ${PHY_NRLDPC_CODINGIF}
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/pucch_rx.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/srs_rx.c
@@ -1057,6 +1062,8 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/TOOLS/sqrt.c
   ${OPENAIR1_DIR}/PHY/TOOLS/oai_arith_operations.c
   ${OPENAIR1_DIR}/PHY/INIT/nr_init_ue.c
+  ${PHY_POLARSRC}
+  ${PHY_SMALLBLOCKSRC}
   ${PHY_NRLDPC_CODINGIF}
   )
 
@@ -1075,21 +1082,29 @@ add_dependencies(PHY_COMMON dfts)
 add_library(PHY ${PHY_SRC})
 target_link_libraries(PHY PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
+pkg_check_modules(blas REQUIRED blas)
+pkg_check_modules(lapacke REQUIRED lapacke)
+
 add_library(PHY_UE ${PHY_SRC_UE})
 target_link_libraries(PHY_UE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)
+# RHEL needs also cblas, but Ubuntu does not have it. So `cblas_LIBRARIES` and
+# `cblas_INCLUDE_DIRS` will be empty for Ubuntu, a no-op
+pkg_check_modules(cblas cblas)
+target_link_libraries(PHY_UE PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES})
+target_include_directories(PHY_UE PRIVATE ${blas_INCLUDE_DIRS} ${cblas_INCLUDE_DIRS} ${lapacke_INCLUDE_DIRS})
 
 add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})
 target_link_libraries(PHY_NR_COMMON PUBLIC UTIL)
 
 add_library(PHY_NR ${PHY_NR_SRC})
-target_link_libraries(PHY_NR nr_phy_common nr_common nr_fapi_p5 polar smallblock)
+target_link_libraries(PHY_NR nr_phy_common nr_common nr_fapi_p5)
 
 add_library(PHY_NR_NO_AVX_256 ${PHY_NR_SRC})
 target_link_libraries(PHY_NR_NO_AVX_256 nr_phy_common nr_common)
 target_compile_definitions(PHY_NR_NO_AVX_256 PUBLIC USE_128BIT)
 
 add_library(PHY_NR_UE ${PHY_NR_UE_SRC})
-target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs nr_phy_common nr_common UTIL polar smallblock)
+target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs nr_phy_common nr_common UTIL)
 
 add_library(PHY_RU ${PHY_SRC_RU})
 target_link_libraries(PHY_RU PRIVATE asn1_lte_rrc_hdrs UTIL)
@@ -1153,7 +1168,7 @@ set(L2_SRC
   ${RRC_DIR}/rrc_eNB_S1AP.c
   ${RRC_DIR}/rrc_eNB_M2AP.c
   ${RRC_DIR}/rrc_eNB_UE_context.c
-  ${RRC_DIR}/rrc_eNB_GTPV1U.c
+  ${NR_RRC_DIR}/rrc_gNB_UE_context.c
   ${RRC_DIR}/rrc_common.c
   ${RRC_DIR}/L2_interface.c
   ${RRC_DIR}/L2_interface_common.c
@@ -1219,7 +1234,6 @@ set(NR_L2_SRC_UE
   ${NR_UE_RRC_DIR}/L2_interface_ue.c
   ${NR_UE_RRC_DIR}/main_ue.c
   ${NR_UE_RRC_DIR}/rrc_UE.c
-  ${NR_UE_RRC_DIR}/verify_RRC.c
   ${NR_UE_RRC_DIR}/rrc_timers_and_constants.c
   ${NR_UE_RRC_DIR}/rrc_sl_preconfig.c
   )
@@ -1400,6 +1414,15 @@ include_directories("${OPENAIR1_DIR}/SCHED_NR_UE")
 # CN libs
 ##########################
 
+add_library (GTPV1U
+  ${RRC_DIR}/rrc_eNB_GTPV1U.c
+  ${OPENAIR3_DIR}/ocp-gtpu/gtp_itf.cpp
+  ${OPENAIR3_DIR}/ocp-gtpu/gtpu_extensions.c
+  )
+target_link_libraries(GTPV1U PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+target_link_libraries(GTPV1U PRIVATE SIMU ds)
+include_directories(${OPENAIR3_DIR}/ocp-gtp)
+
 set (MME_APP_SRC
   ${OPENAIR3_DIR}/MME_APP/mme_app.c
   ${OPENAIR3_DIR}/MME_APP/mme_config.c
@@ -1738,9 +1761,12 @@ add_executable(lte-softmodem
   ${OPENAIR_DIR}/executables/lte-ru.c
   ${OPENAIR_DIR}/executables/ru_control.c
   ${OPENAIR_DIR}/executables/lte-softmodem.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
   ${OPENAIR2_DIR}/ENB_APP/NB_IoT_interface.c
   ${OPENAIR_DIR}/executables/create_tasks.c
   ${OPENAIR_DIR}/executables/create_tasks_mbms.c
+  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
+  ${OPENAIR_DIR}/radio/COMMON/record_player.c
   ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
   ${PHY_INTERFACE_DIR}/queue_t.c
   ${OPENAIR_DIR}/common/utils/lte/ue_power.c
@@ -1751,14 +1777,15 @@ add_dependencies(lte-softmodem oai_iqplayer)
 
 target_link_libraries(lte-softmodem PRIVATE
   -Wl,--start-group
-  lte_rrc nr_rrc s1ap m2ap x2ap m3ap GTPV1U SECURITY UTIL SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
+  lte_rrc nr_rrc s1ap m2ap x2ap m3ap GTPV1U SECURITY UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
   PHY_COMMON PHY PHY_RU  L2 L2_LTE NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
-  ${NAS_UE_LIB} ITTI SIMU radio_common softmodem_common
+  ${NAS_UE_LIB} ITTI SIMU shlib_loader
   -Wl,--end-group z dl)
 
 target_link_libraries(lte-softmodem PRIVATE pthread m CONFIG_LIB rt)
 target_link_libraries(lte-softmodem PRIVATE ${T_LIB})
 target_link_libraries(lte-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+target_link_libraries(lte-softmodem PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES} ${lapack_LIBRARIES})
 
 if(E2_AGENT)
   target_link_libraries(lte-softmodem PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
@@ -1768,13 +1795,16 @@ endif()
 add_executable(oairu
   ${OPENAIR_DIR}/executables/lte-ru.c
   ${OPENAIR_DIR}/executables/ru_control.c
+  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
+  ${OPENAIR_DIR}/radio/COMMON/record_player.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
   ${OPENAIR_DIR}/openair1/SCHED/phy_procedures_lte_common.c
   ${OPENAIR_DIR}/executables/main_ru.c
   ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
 )
 target_link_libraries(oairu PRIVATE
   -Wl,--start-group
-  SCHED_RU_LIB PHY_COMMON PHY_RU UTIL radio_common softmodem_common
+  SCHED_RU_LIB PHY_COMMON PHY_RU UTIL shlib_loader
   -Wl,--end-group z dl)
 
 target_link_libraries(oairu PRIVATE pthread m CONFIG_LIB rt ${T_LIB})
@@ -1791,7 +1821,10 @@ target_link_libraries(lte-softmodem PRIVATE
 add_executable(lte-uesoftmodem
   ${OPENAIR_DIR}/executables/lte-ue.c
   ${OPENAIR_DIR}/executables/lte-uesoftmodem.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
   ${OPENAIR_DIR}/executables/create_tasks_ue.c
+  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
+  ${OPENAIR_DIR}/radio/COMMON/record_player.c
   ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
   ${OPENAIR_DIR}/common/utils/lte/ue_power.c
   ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
@@ -1801,35 +1834,20 @@ add_executable(lte-uesoftmodem
 target_link_libraries(lte-uesoftmodem PRIVATE
   -Wl,--start-group
   lte_rrc nr_rrc s1ap x2ap m2ap m3ap
-  SECURITY UTIL SCTP_CLIENT MME_APP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON
+  SECURITY UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON
   PHY_UE PHY_RU L2_UE L2_LTE SIMU NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
-  ${NAS_UE_LIB} ITTI radio_common softmodem_common
+  ${NAS_UE_LIB} ITTI shlib_loader
   -Wl,--end-group z dl)
 
 target_link_libraries(lte-uesoftmodem PRIVATE pthread m CONFIG_LIB rt)
 target_link_libraries(lte-uesoftmodem PRIVATE ${T_LIB})
 target_link_libraries(lte-uesoftmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+target_link_libraries(lte-uesoftmodem PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES} ${lapack_LIBRARIES})
 
 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(lte-uesoftmodem PRIVATE
                       asn1_lte_rrc asn1_s1ap asn1_m2ap asn1_m3ap asn1_x2ap)
 
-# nr RRU
-add_executable(nr-oru
-  ${OPENAIR_DIR}/executables/nr-ru.c
-  ${OPENAIR_DIR}/openair1/PHY/INIT/nr_parms.c
-  ${OPENAIR_DIR}/openair1/SCHED_NR/phy_frame_config_nr.c
-  ${OPENAIR_DIR}/openair1/SCHED_NR/nr_prach_procedures.c
-  ${OPENAIR_DIR}/openair1/SCHED/phy_procedures_lte_common.c
-  ${OPENAIR_DIR}/executables/main_nr_ru.c
-)
-target_link_libraries(nr-oru PRIVATE
-  UTIL SCHED_RU_LIB PHY_COMMON PHY_RU PHY_NR shlib_loader z dl
-  radio_common softmodem_common)
-target_link_libraries(nr-oru PRIVATE pthread m CONFIG_LIB rt ${T_LIB} utils
-  barrier actor)
-target_link_libraries(nr-oru PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs nr_phy_common time_management)
-
 # nr-softmodem
 ###################################################
 
@@ -1840,6 +1858,9 @@ add_executable(nr-softmodem
   ${OPENAIR_DIR}/executables/nr-gnb.c
   ${OPENAIR_DIR}/executables/nr-ru.c
   ${OPENAIR_DIR}/executables/nr-softmodem.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
+  ${OPENAIR_DIR}/radio/COMMON/record_player.c
   ${OPENAIR_DIR}/common/utils/lte/ue_power.c
   ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
   ${PHY_INTERFACE_DIR}/queue_t.c
@@ -1848,11 +1869,11 @@ add_executable(nr-softmodem
 
 target_link_libraries(nr-softmodem PRIVATE
   -Wl,--start-group
-  UTIL SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU GTPV1U SECURITY
+  UTIL HASHTABLE SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU GTPV1U SECURITY
   ITTI ${NAS_UE_LIB} lte_rrc nr_rrc
   ngap s1ap L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB SIMU
-  x2ap f1ap m2ap m3ap e1ap radio_common
-  time_management softmodem_common
+  x2ap f1ap m2ap m3ap e1ap shlib_loader
+  time_management
   -Wl,--end-group z dl)
 
 target_link_libraries(nr-softmodem PRIVATE pthread m CONFIG_LIB rt)
@@ -1882,6 +1903,7 @@ target_link_libraries(nr-softmodem PRIVATE
 
 add_executable(nr-cuup
   executables/nr-cuup.c
+  executables/softmodem-common.c
   ${NR_RRC_DIR}/rrc_gNB_UE_context.c
   ${OPENAIR2_DIR}/E1AP/e1ap_setup.c
   ${NR_PDCP_SRC}
@@ -1891,9 +1913,9 @@ add_executable(nr-cuup
 target_link_libraries(nr-cuup PRIVATE
                       CONFIG_LIB ITTI SCTP_CLIENT
                       GTPV1U e1ap f1ap
-                      time_management softmodem_common
+                      time_management
                       alg
-                      z dl pthread ${T_LIB})
+                      z dl pthread shlib_loader ${T_LIB})
 target_link_libraries(nr-cuup PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 if(E2_AGENT)
   target_link_libraries(nr-cuup PRIVATE e2_agent e2_agent_arg e2_ran_func_cuup)
@@ -1909,7 +1931,11 @@ add_executable(nr-uesoftmodem
   ${OPENAIR_DIR}/executables/nr-uesoftmodem.c
   ${OPENAIR_DIR}/executables/position_interface.c
   ${OPENAIR_DIR}/executables/nr-ue.c
-  ${OPENAIR_DIR}/executables/nr-ue-ru.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
+  ${OPENAIR_DIR}/radio/COMMON/record_player.c
+  ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+  ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common_tdd.c
   ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c
   ${NFAPI_USER_DIR}/nfapi.c
   ${PHY_INTERFACE_DIR}/queue_t.c
@@ -1917,10 +1943,10 @@ add_executable(nr-uesoftmodem
 
 target_link_libraries(nr-uesoftmodem PRIVATE
   -Wl,--start-group
-  nr_rrc SECURITY UTIL SCHED_RU_LIB SCHED_NR_UE_LIB
+  nr_rrc SECURITY UTIL HASHTABLE SCHED_RU_LIB SCHED_NR_UE_LIB
   PHY_COMMON PHY_NR_COMMON PHY_NR_UE NR_L2_UE MAC_NR_COMMON NFAPI_LIB
-  ITTI SIMU radio_common
-  time_management softmodem_common
+  ITTI SIMU shlib_loader
+  time_management
   -Wl,--end-group z dl)
 
 target_link_libraries(nr-uesoftmodem PRIVATE pthread m CONFIG_LIB rt nr_ue_phy_meas)
@@ -1953,10 +1979,10 @@ target_link_libraries(nr-uesoftmodem PRIVATE
 add_executable(rftest
   ${OPENAIR_DIR}/openair1/PHY/TOOLS/calibration_test.c
   ${OPENAIR_DIR}/openair1/PHY/TOOLS/calibration_scope.c
+  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
 )
-target_link_libraries(rftest PRIVATE
-  minimal_lib PHY_NR_COMMON UTIL forms pthread dl m ${T_LIB}
-  radio_common softmodem_common)
+target_link_libraries(rftest PRIVATE minimal_lib PHY_NR_COMMON UTIL forms pthread dl m ${T_LIB} shlib_loader)
 target_link_libraries(rftest PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
 add_executable(polartest
@@ -1973,7 +1999,7 @@ add_executable(smallblocktest
 
 target_link_libraries(smallblocktest PRIVATE
   -Wl,--start-group UTIL SIMU PHY_NR PHY_COMMON PHY_NR_COMMON -Wl,--end-group
-  m pthread dl ${T_LIB}
+  m pthread dl shlib_loader ${T_LIB}
 )
 
 
@@ -1983,7 +2009,7 @@ add_executable(ldpctest
 )
 target_link_libraries(ldpctest PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON -Wl,--end-group
-  m pthread dl ${T_LIB}
+  m pthread dl shlib_loader ${T_LIB}
   # link 'check_crc' to make it resolved in the LDPC coding libraries
   # 'check_crc' is not used in ldpctest so it is not linked in the executable by default
   # --whole-archive links 'check_crc' in the executable even though it is note used, see 'man ld'
@@ -1996,53 +2022,54 @@ target_link_libraries(physim_common PRIVATE UTIL)
 add_executable(nr_dlschsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c)
 target_link_libraries(nr_dlschsim PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl physim_common
+  m pthread ${T_LIB} ITTI dl shlib_loader physim_common
   )
 target_link_libraries(nr_dlschsim PRIVATE asn1_nr_rrc_hdrs)
 
 add_executable(nr_pbchsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c)
 target_link_libraries(nr_pbchsim PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl physim_common
+  m pthread ${T_LIB} ITTI dl shlib_loader physim_common
 )
 target_link_libraries(nr_pbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 add_executable(nr_psbchsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/psbchsim.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
   ${NFAPI_USER_DIR}/nfapi.c
   ${NFAPI_USER_DIR}/gnb_ind_vars.c
   ${PHY_INTERFACE_DIR}/queue_t.c
   )
 target_link_libraries(nr_psbchsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON CONFIG_LIB L2_NR -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl physim_common softmodem_common
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON CONFIG_LIB L2_NR -lz -Wl,--end-group
+  m pthread ${T_LIB} ITTI dl shlib_loader physim_common
   )
 target_link_libraries(nr_psbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 add_executable(nr_pucchsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pucchsim.c)
 target_link_libraries(nr_pucchsim PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl physim_common
+  m pthread ${T_LIB} ITTI dl shlib_loader physim_common
 )
 target_link_libraries(nr_pucchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 add_executable(nr_dlsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlsim.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
   ${NFAPI_USER_DIR}/nfapi.c
   ${NFAPI_USER_DIR}/gnb_ind_vars.c
   ${PHY_INTERFACE_DIR}/queue_t.c
   )
 target_link_libraries(nr_dlsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR x2ap SECURITY ngap -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl nr_ue_phy_meas physim_common
-  softmodem_common
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
+  m pthread ${T_LIB} ITTI dl shlib_loader nr_ue_phy_meas physim_common
   )
 target_link_libraries(nr_dlsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 add_executable(nr_prachsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/prachsim.c)
 target_link_libraries(nr_prachsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_RU PHY_NR_UE MAC_NR_COMMON SCHED_NR_LIB CONFIG_LIB -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl physim_common)
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_RU PHY_NR_UE MAC_NR_COMMON SCHED_NR_LIB CONFIG_LIB -lz -Wl,--end-group
+  m pthread ${T_LIB} ITTI dl shlib_loader physim_common)
 target_link_libraries(nr_prachsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 add_executable(nr_ulschsim
@@ -2051,33 +2078,35 @@ add_executable(nr_ulschsim
   )
 target_link_libraries(nr_ulschsim PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl physim_common
+  m pthread ${T_LIB} ITTI dl shlib_loader physim_common
 )
 target_link_libraries(nr_ulschsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 add_executable(nr_ulsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulsim.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
   ${NFAPI_USER_DIR}/nfapi.c
   ${NFAPI_USER_DIR}/gnb_ind_vars.c
   ${PHY_INTERFACE_DIR}/queue_t.c
   )
 
 target_link_libraries(nr_ulsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR x2ap SECURITY ngap -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl nr_ue_phy_meas physim_common softmodem_common
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
+  m pthread ${T_LIB} ITTI dl shlib_loader nr_ue_phy_meas physim_common
   )
 target_link_libraries(nr_ulsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 add_executable(nr_srssim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/srssim.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
   ${NFAPI_USER_DIR}/nfapi.c
   ${NFAPI_USER_DIR}/gnb_ind_vars.c
   ${PHY_INTERFACE_DIR}/queue_t.c
   )
 
 target_link_libraries(nr_srssim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON -Wl,--end-group
-  m pthread ITTI dl nr_ue_phy_meas physim_common softmodem_common
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc L2_NR -lz -Wl,--end-group
+  m pthread ITTI dl nr_ue_phy_meas physim_common
   )
 
 if(CUDA_ENABLE)
@@ -2093,6 +2122,7 @@ endif()
 # these simulators do not compile:
 # dlsim_tm7 pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim
 foreach(myExe dlsim ulsim)
+
   add_executable(${myExe}
     ${OPENAIR1_DIR}/SIMULATION/LTE_PHY/${myExe}.c
     ${OPENAIR_DIR}/common/utils/lte/ue_power.c
@@ -2102,7 +2132,7 @@ foreach(myExe dlsim ulsim)
     )
   target_link_libraries (${myExe} PRIVATE
     -Wl,--start-group SIMU UTIL SCHED_LIB SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_NR_COMMON PHY PHY_UE PHY_RU ITTI -Wl,--end-group
-    pthread m rt CONFIG_LIB ${T_LIB} dl
+    pthread m rt CONFIG_LIB ${T_LIB} dl shlib_loader
     )
   target_link_libraries(${myExe} PRIVATE asn1_lte_rrc_hdrs)
   add_dependencies(${myExe} coding)
@@ -2141,7 +2171,7 @@ if (${T_TRACER})
         #all "add_library" definitions
         ITTI lte_rrc nr_rrc s1ap x2ap m2ap m3ap f1ap
         params_libconfig
-        oai_eth_transpro UTIL
+        oai_eth_transpro HASHTABLE UTIL
         SECURITY SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB
         NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
         MISC_NFAPI_LTE_LIB
@@ -2194,7 +2224,6 @@ if(ENABLE_TESTS)
 endif()
 
 add_subdirectory(common)
-add_subdirectory(executables)
 add_subdirectory(doc)
 add_subdirectory(nfapi)
 add_subdirectory(openair1)
@@ -2208,7 +2237,3 @@ if(TARGET oai_cuda_lib)
     target_link_libraries(nr_dlsim PRIVATE oai_cuda_lib)
     target_link_libraries(nr_ulsim PRIVATE oai_cuda_lib)
 endif()
-
-if(PACKAGING_LTE OR PACKAGING_NR OR PACKAGING_COMMON OR PACKAGING_USRP OR PACKAGING_PHYSIM)
-  include("tools/packages/packages.cmake")
-endif()

ci-scripts/Jenkinsfile-GitLab-Container

@@ -726,11 +726,11 @@ pipeline {
             }
           }
         }
-        stage ("SA-Multi-Antenna-CN5G") {
+        stage ("SA-2x2-Module-CN5G") {
           when { expression {do5Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-SA-Multi-Antenna-CN5G', 'SA-Multi-Antenna-CN5G')
+              triggerSlaveJob ('RAN-SA-2x2-Module-CN5G', 'SA-2x2-Module-CN5G')
             }
           }
           post {
@@ -738,13 +738,13 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                saMultiAntennaStatus = finalizeSlaveJob('RAN-SA-Multi-Antenna-CN5G')
+                saTDD2x2Status = finalizeSlaveJob('RAN-SA-2x2-Module-CN5G')
               }
             }
             failure {
               script {
                 currentBuild.result = 'FAILURE'
-                failingStages += saMultiAntennaStatus
+                failingStages += saTDD2x2Status
               }
             }
           }

ci-scripts/cls_containerize.py

@@ -304,7 +304,7 @@ class Containerize():
 		result = re.search('gNB', self.imageKind)
 		if result is not None:
 			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
-		result = re.search('x86', self.imageKind)
+		result = re.search('all', self.imageKind)
 		if result is not None:
 			imageNames.append(('oai-enb', 'eNB', 'oai-enb', ''))
 			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
@@ -315,6 +315,7 @@ class Containerize():
 				imageNames.append(('oai-physim', 'phySim', 'oai-physim', ''))
 			if self.host == 'Ubuntu':
 				imageNames.append(('oai-lte-ru', 'lteRU', 'oai-lte-ru', ''))
+				imageNames.append(('oai-gnb-aerial', 'gNB.aerial', 'oai-gnb-aerial', ''))
 				# Building again the 5G images with Address Sanitizer
 				imageNames.append(('ran-build', 'build', 'ran-build-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('oai-enb', 'eNB', 'oai-enb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
@@ -324,7 +325,6 @@ class Containerize():
 				imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('ran-build-fhi72', 'build.fhi72', 'ran-build-fhi72', ''))
 				imageNames.append(('oai-gnb', 'gNB.fhi72', 'oai-gnb-fhi72', ''))
-				imageNames.append(('oai-nr-oru', 'nrORU.fhi72', 'oai-nr-oru', ''))
 		result = re.search('build_cross_arm64', self.imageKind)
 		if result is not None:
 			self.dockerfileprefix = '.ubuntu.cross-arm64'
@@ -413,18 +413,18 @@ class Containerize():
 			# target images should use the proper ran-build image
 			if image != 'ran-build' and "-asan" in name:
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build-asan:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
-			elif "fhi72" in name or name == "oai-nr-oru":
+			elif "fhi72" in name:
 				cmd.run(f'sed -i -e "s#ran-build-fhi72:latest#ran-build-fhi72:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			elif image != 'ran-build':
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			if image == 'oai-gnb-aerial':
-				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2026.01.07.tar.gz .')
+				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2025.10.09.tar.gz .')
 			logfile = f'{lSourcePath}/cmake_targets/log/{name}.docker.log'
 			ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} {option} . > {logfile} 2>&1', timeout=1200)
 			t = (name, archiveArtifact(cmd, ctx, logfile))
 			log_files.append(t)
 			if image == 'oai-gnb-aerial':
-				cmd.run('rm -f nvipc_src.2026.01.07.tar.gz')
+				cmd.run('rm -f nvipc_src.2025.10.09.tar.gz')
 			# check the status of the build
 			ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {name}:{imageTag}")
 			if ret.returncode != 0:
@@ -582,7 +582,7 @@ class Containerize():
 		ret = cmd.run(f"docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}")
 		if ret.returncode != 0:
 			logging.error(f'No {baseImage} image present, cannot build tests')
-			HTML.CreateHtmlTestRow("Unit test build failed", 'KO', CONST.ALL_PROCESSES_OK)
+			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
 			return False
 
 		# build ran-unittests image

ci-scripts/conf_files/enb.band38.25prb.rfsim.conf

@@ -200,11 +200,9 @@ RUs = (
     }
 );  
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 THREAD_STRUCT = (
   {

ci-scripts/conf_files/enb.band7.100prb.rfsim.conf

@@ -233,11 +233,9 @@ RUs =
   }
 );
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 THREAD_STRUCT =
 (

ci-scripts/conf_files/enb.band7.25prb.rfsim.conf

@@ -233,11 +233,9 @@ RUs =
   }
 );
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 THREAD_STRUCT =
 (

ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf

@@ -233,11 +233,9 @@ RUs =
   }
 );
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 THREAD_STRUCT =
 (

ci-scripts/conf_files/enb.band7.50prb.rfsim.conf

@@ -233,11 +233,9 @@ RUs =
   }
 );
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 THREAD_STRUCT =
 (

ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf

@@ -362,11 +362,9 @@ RUs = (
     }
 );
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 THREAD_STRUCT = (
   {

ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf

@@ -197,15 +197,13 @@ RUs = (
     }
 );  
 
-rfsimulator = (
-  {
-    serveraddr = "server";
+rfsimulator: {
+serveraddr = "server";
     serverport = 4043;
     options = (); #("saviq"); or/and "chanmod"
     modelname = "AWGN";
-    IQfile = "/tmp/rfsimulator.iqs";
-  }
-);
+    IQfile = "/tmp/rfsimulator.iqs"
+}
 
 log_config: {
   global_log_level = "info";

ci-scripts/conf_files/gnb-pnf.band66.rfsim.conf

@@ -27,15 +27,14 @@ RUs = ({
   eNB_instances  = [0];
 });
 
-rfsimulator = (
+rfsimulator :
 {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs";
-}
-);
+};
 
 log_config: {
   global_log_level = "info";

ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf

@@ -13,7 +13,16 @@ gNBs =
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1; }) });
+    plmn_list = ({
+                  mcc = 208;
+                  mnc = 97;
+                  mnc_length = 2;
+                  snssaiList = (
+                    {
+                      sst = 1;
+                    }
+                  );
+                  });
 
     nr_cellid = 12345678L;
 
@@ -177,19 +186,19 @@ gNBs =
 
 MACRLCs = (
 {
-  num_cc             = 1;
-  remote_s_address   = "127.0.0.1"; // pnf addr [!]
-  local_s_address    = "127.0.0.2"; // vnf addr
-  local_s_portc      = 50001; // vnf p5 port
-  remote_s_portc     = 50000; // pnf p5 port [!]
-  local_s_portd      = 50011; // vnf p7 port [!]
-  remote_s_portd     = 50010; // pnf p7 port [!]
-  tr_s_preference    = "aerial";
-  tr_n_preference    = "local_RRC";
-  pusch_TargetSNRx10 = 280; # 150;
-  pucch_TargetSNRx10 = 200; #200;
-  dl_max_mcs         = 28;
-  ul_max_mcs         = 28;
+  num_cc           = 1;
+  remote_s_address = "127.0.0.1"; // pnf addr [!]
+  local_s_address  = "127.0.0.2"; // vnf addr
+  local_s_portc    = 50001; // vnf p5 port
+  remote_s_portc   = 50000; // pnf p5 port [!]
+  local_s_portd    = 50011; // vnf p7 port [!]
+  remote_s_portd   = 50010; // pnf p7 port [!]
+  tr_s_preference             = "aerial";
+  tr_n_preference             = "local_RRC";
+  pusch_TargetSNRx10          = 280; # 150;
+  pucch_TargetSNRx10          = 200; #200;
+  dl_max_mcs = 28;
+  ul_max_mcs = 28;
 }
 );
 
@@ -213,13 +222,13 @@ security = {
 
 log_config :
 {
-  global_log_level ="info";
-  hw_log_level     ="info";
-  phy_log_level    ="info";
-  mac_log_level    ="info";
-  rlc_log_level    ="info";
-  pdcp_log_level   ="info";
-  rrc_log_level    ="info";
-  ngap_log_level   ="debug";
-  f1ap_log_level   ="debug";
+  global_log_level                      ="info";
+  hw_log_level                          ="info";
+  phy_log_level                         ="info";
+  mac_log_level                         ="info";
+  rlc_log_level                         ="info";
+  pdcp_log_level                        ="info";
+  rrc_log_level                         ="info";
+  ngap_log_level                        ="debug";
+  f1ap_log_level                        ="debug";
 };

ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf

@@ -191,11 +191,10 @@ RUs = (
     }
 );
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
+
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf

@@ -200,11 +200,10 @@ RUs = (
     }
 );  
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
+
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn-leo.conf

@@ -234,15 +234,14 @@ RUs = (
     }
 );
 
-rfsimulator = (
+rfsimulator :
 {
   serveraddr = "server";
   serverport = 4043;
   options = ("chanmod"); #("saviq"); or/and "chanmod"
   prop_delay = 20;
   IQfile = "/tmp/rfsimulator.iqs";
-}
-);
+};
 
 channelmod = {
   max_chan=10;

ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf

@@ -242,15 +242,14 @@ RUs = (
     }
 );
 
-rfsimulator = (
+rfsimulator :
 {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   prop_delay = 238.74;
   IQfile = "/tmp/rfsimulator.iqs";
-}
-);
+};
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/gnb.sa.band261.u3.32prb.rfsim.conf

@@ -29,40 +29,40 @@ gNBs =
 #  downlinkConfigCommon
     #frequencyInfoDL
       # this is pointA + 16 PRBs@120kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                             = 2078299;
-      dl_frequencyBand                                                 = 257;
+      absoluteFrequencySSB                                             = 2071387;
+      dl_frequencyBand                                                 = 261;
       # this is 27.900 GHz
-      dl_absoluteFrequencyPointA                                       = 2077963;
+      dl_absoluteFrequencyPointA                                       = 2071001;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         dl_subcarrierSpacing                                           = 3;
-        dl_carrierBandwidth                                            = 66;
+        dl_carrierBandwidth                                            = 32;
      #initialDownlinkBWP
       #genericParameters
         # this is RBstart=0,L=32 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6349;
+        initialDLBWPlocationAndBandwidth                                        = 8525;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 3;
       #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 4;
+        initialDLBWPcontrolResourceSetZero                                      = 1;
         initialDLBWPsearchSpaceZero                                             = 0;
 
   #uplinkConfigCommon 
      #frequencyInfoUL
-      ul_frequencyBand                                                 = 257;
+      ul_frequencyBand                                                 = 261;
       #scs-SpecificCarrierList
       ul_offstToCarrier                                              = 0;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
       ul_subcarrierSpacing                                           = 3;
-      ul_carrierBandwidth                                            = 66;
+      ul_carrierBandwidth                                            = 32;
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6349;
+        initialULBWPlocationAndBandwidth                                        = 8525;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialULBWPsubcarrierSpacing                                           = 3;
@@ -143,11 +143,6 @@ gNBs =
 
   );
 
-    first_active_bwp = 1;
-    bwp_list = (
-      { scs = 3; bwpStart = 0; bwpSize = 66;}
-    );
-
     # ------- SCTP definitions
     SCTP :
     {
@@ -175,7 +170,7 @@ MACRLCs = ({
   tr_n_preference             = "local_RRC";
   pusch_TargetSNRx10          = 200;
   pucch_TargetSNRx10          = 200;
-  set_analog_beamforming      = "lophy";
+  set_analog_beamforming      = 2;
   beam_duration               = 1;
   beams_per_period            = 1;
   beam_weights = [0]; // single SSB -> one analog beam
@@ -202,11 +197,9 @@ RUs = ({
   eNB_instances  = [0];
 });
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf

@@ -18,7 +18,7 @@ gNBs =
     ////////// Physical parameters:
 
     min_rxtxtime                                              = 6;
-    enable_sdap = 0;
+    enable_sdap = 1;
 
     servingCellConfigCommon = (
     {
@@ -205,15 +205,14 @@ RUs = (
 );
 
 
-rfsimulator = (
-  {
+rfsimulator :
+{
     serveraddr = "server";
     serverport = 4043;
     options = (); #("saviq"); or/and "chanmod"
     modelname = "AWGN";
     IQfile = "/tmp/rfsimulator.iqs";
-  }
-);
+};
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf

@@ -251,7 +251,7 @@ fhi_72 = {
   io_core = 1;
   worker_cores = (2);
   ru_addr = ("98:ae:71:04:83:e3", "98:ae:71:04:83:e3");
-  mtu = 9216;
+  mtu = 9600;
   fh_config = ({
     T1a_cp_dl = (285, 470);
     T1a_cp_ul = (285, 429);

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf

@@ -208,11 +208,9 @@ RUs = (
 );
 
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf

@@ -197,11 +197,9 @@ RUs = (
     }
 );
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf

@@ -204,15 +204,13 @@ RUs = ({
 });
 
 
-rfsimulator = (
-{
+rfsimulator: {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs"
 }
-);
 
 security = {
 # preferred ciphering algorithms

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.prs.conf

@@ -155,8 +155,8 @@ gNBs =
         NETWORK_INTERFACES :
         {
 
-           GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140";
-           GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140";
+           GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CI_GNB_IP_ADDR";
+           GNB_IPV4_ADDRESS_FOR_NGU                 = "CI_GNB_IP_ADDR";
            GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
         };
 
@@ -217,15 +217,14 @@ RUs = (
 );
 
 
-rfsimulator = (
+rfsimulator :
 {
   serveraddr = "server";
   serverport = 4043;
   options    = (); #("saviq"); or/and "chanmod"
   modelname  = "AWGN";
   IQfile     = "/tmp/rfsimulator.iqs";
-}
-);
+};
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml

@@ -63,7 +63,7 @@ gNBs:
         prach_ConfigurationIndex: 98
         #prach_msg1_FDM
         #0 = one, 1=two, 2=four, 3=eight
-        prach_msg1_FDM: 1
+        prach_msg1_FDM: 0
         prach_msg1_FrequencyStart: 0
         zeroCorrelationZoneConfig: 12
         preambleReceivedTargetPower: -104
@@ -99,7 +99,7 @@ gNBs:
         pucchGroupHopping: 0
         hoppingId: 40
         p0_nominal: -90
-        ssb_PositionsInBurst_Bitmap: 2
+        ssb_PositionsInBurst_Bitmap: 1
         # ssb_periodicityServingCell
         # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
         ssb_periodicityServingCell: 2
@@ -168,7 +168,7 @@ RUs:
     sdr_addrs: serial=XXXXXXX
 
 rfsimulator:
-  - serveraddr: server
+  serveraddr: server
 
 security:
   # preferred ciphering algorithms

ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf

@@ -203,11 +203,10 @@ RUs = (
 }
 );
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
+
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf

@@ -258,7 +258,7 @@ fhi_72 = {
   io_core = 1;
   worker_cores = (2);
   ru_addr = ("70:b3:d5:e1:5b:81", "70:b3:d5:e1:5b:81");
-  mtu = 9216;
+  mtu = 9600;
   fh_config = ({
     T1a_cp_dl = (419, 470);
     T1a_cp_ul = (285, 336);

ci-scripts/conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf

@@ -203,15 +203,14 @@ RUs = (
 );
 
 
-rfsimulator = (
+rfsimulator :
 {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs";
-}
-);
+};
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/lteue.rfsim.conf

@@ -1,5 +0,0 @@
-rfsimulator = (
-  {
-    serveraddr = "127.0.0.1";
-  }
-);

ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf

@@ -12,7 +12,8 @@ uicc0 = {
 imsi = "208990100001100";
 key = "fec86ba6eb707ed08905757b1bb44b8f";
 opc= "C42449363BBAD02B66D16BC975D77CC1";
-pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+dnn= "oai";
+nssai_sst=1;
 }
 
 MACRLCs = (

ci-scripts/conf_files/nrue.band78.106prb.prs.conf

@@ -87,9 +87,3 @@ PRSs =
     );
   }
 );
-
-rfsimulator = (
-  {
-    serveraddr = "127.0.0.1";
-  }
-);

ci-scripts/conf_files/nrue.uicc.2pdu.conf

@@ -1,17 +0,0 @@
-uicc0 = {
-  imsi = "208990100001100";
-  key = "fec86ba6eb707ed08905757b1bb44b8f";
-  opc= "C42449363BBAD02B66D16BC975D77CC1";
-  pdu_sessions = (
-    { id = 1; dnn = "oai"; nssai_sst = 1; },
-    { id = 2; dnn = "oai"; nssai_sst = 1; }
-  )
-}
-
-thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
-
-rfsimulator = (
-  {
-    serveraddr = "127.0.0.1";
-  }
-);

ci-scripts/conf_files/nrue.uicc.conf

@@ -2,7 +2,8 @@ uicc0 = {
   imsi = "208990100001100";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+  dnn= "oai";
+  nssai_sst=1;
 }
 
 position0 = {
@@ -13,12 +14,6 @@ position0 = {
 
 thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
 
-rfsimulator = (
-  {
-    serveraddr = "127.0.0.1";
-  }
-);
-
 #/* configuration for channel modelisation */
 #/* To be included in main config file when */
 #/* channel modelisation is used (rfsimulator with chanmod options enabled) */
@@ -45,4 +40,4 @@ channelmod = {
       ds_tdl         = 0;
     }
   );
-};
+};

ci-scripts/conf_files/nrue.uicc.ntn-leo.conf

@@ -2,7 +2,8 @@ uicc0 = {
   imsi = "208990100001100";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+  dnn= "oai";
+  nssai_sst=1;
 }
 
 position0 = {
@@ -13,40 +14,6 @@ position0 = {
 
 thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
 
-rfsimulator = (
-    {
-        prop_delay = 20;
-        options = ("chanmod");
-    }
-);
-
-RUs = (
-    {
-        nb_tx      = 1;
-        nb_rx      = 1;
-        att_tx     = 0;
-        att_rx     = 0;
-        max_rxgain = 114;
-        sdr_addrs  = "type=x300";
-        clock_src  = "internal";
-        time_src   = "internal";
-        # if_freq    = 3700000000L;
-        # if_offset  = 1000000;
-    }
-);
-
-cells = (
-    {
-        ru_id      = 0;
-        band       = 254;
-        rf_freq    = 2488400000L;
-        rf_offset  = -873500000L;
-        numerology = 0;
-        N_RB_DL    = 25;
-        ssb_start  = 60;
-    }
-);
-
 #/* configuration for channel modelisation */
 #/* To be included in main config file when */
 #/* channel modelisation is used (rfsimulator with chanmod options enabled) */

ci-scripts/conf_files/nrue.uicc.yaml

@@ -2,15 +2,11 @@ uicc0:
   imsi: 208990100001100
   key: fec86ba6eb707ed08905757b1bb44b8f
   opc: C42449363BBAD02B66D16BC975D77CC1
-  pdu_sessions:
-    - dnn: oai
-      nssai_sst: 1
+  dnn: oai
+  nssai_sst: 1
 
 thread-pool: "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
 
-rfsimulator:
-  - serveraddr: "127.0.0.1"
-
 #/* configuration for channel modelisation */
 #/* To be included in main config file when */
 #/* channel modelisation is used (rfsimulator with chanmod options enabled) */

ci-scripts/conf_files/nrue.vrtsim.chanmod.yaml

@@ -2,9 +2,8 @@ uicc0:
   imsi: 208990100001100
   key: fec86ba6eb707ed08905757b1bb44b8f
   opc: C42449363BBAD02B66D16BC975D77CC1
-  pdu_sessions:
-    - dnn: oai
-      nssai_sst: 1
+  dnn: oai
+  nssai_sst: 1
 
 thread-pool: "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
 

ci-scripts/conf_files/ue.sa.conf

@@ -2,7 +2,8 @@ uicc0 = {
   imsi = "208970100001127";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "c42449363bbad02b66d16bc975d77cc1";
-  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+  dnn= "oai";
+  nssai_sst=1;
 }
 
 thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"

ci-scripts/conf_files/untested/episci/episci_nr-ue.nfapi.conf

@@ -12,7 +12,9 @@ uicc0 = {
 imsi = "208950000000031";
 key = "0c0a34601d4f07677303652c0462535b";
 opc= "63bfa50ee6523365ff14c1f45f88737d";
-pdu_sessions = ({ dnn = "oai"; nssai_sst = 222; nssai_sd = 123; });
+dnn= "oai";
+nssai_sst=222;
+nssai_sd=123;
 }
 
 MACRLCs = (

ci-scripts/conf_files/untested/episci/proxy_nr-ue.nfapi.conf

@@ -12,7 +12,9 @@ uicc0 = {
 imsi = "2089900007487";
 key = "fec86ba6eb707ed08905757b1bb44b8f";
 opc= "C42449363BBAD02B66D16BC975D77CC1";
-pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; nssai_sd = 1; });
+dnn= "oai";
+nssai_sst=1;
+nssai_sd=1;
 }
 
 MACRLCs = (

ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf

@@ -18,7 +18,7 @@ gNBs =
     ////////// Physical parameters:
 
     min_rxtxtime                                              = 6;
-    enable_sdap = 0;
+    enable_sdap = 1;
 
     servingCellConfigCommon = (
     {
@@ -205,15 +205,14 @@ RUs = (
 );
 
 
-rfsimulator = (
-  {
+rfsimulator :
+{
     serveraddr = "server";
     serverport = 4043;
     options = (); #("saviq"); or/and "chanmod"
     modelname = "AWGN";
     IQfile = "/tmp/rfsimulator.iqs";
-  }
-);
+};
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf

@@ -200,15 +200,14 @@ RUs = (
 );
 
 
-rfsimulator = (
+rfsimulator :
 {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs";
-}
-);
+};
 
 security = {
   # preferred ciphering algorithms

ci-scripts/docker/Dockerfile.channelsim.ubuntu

@@ -1,52 +0,0 @@
-#/*
-# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# * contributor license agreements.  See the NOTICE file distributed with
-# * this work for additional information regarding copyright ownership.
-# * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# * except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# *      http://www.openairinterface.org/?page_id=698
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# *-------------------------------------------------------------------------------
-# * For more information about the OpenAirInterface (OAI) Software Alliance:
-# *      contact@openairinterface.org
-# */
-#---------------------------------------------------------------------
-#
-# Dockerfile for the Open-Air-Interface BUILD service
-#   Valid for Ubuntu 24.04
-#
-#---------------------------------------------------------------------
-FROM nvidia/cuda:12.9.1-devel-ubuntu22.04 AS cuda-image
-FROM ran-base:develop AS ran-tests
-
-RUN rm -Rf /oai-ran
-COPY --from=cuda-image /usr/local/cuda/ /usr/local/cuda/
-
-# Set the LD_LIBRARY_PATH to ensure the system can find the copied libraries.
-# This is crucial for applications that use CUDA.
-ENV LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda/targets/sbsa-linux/lib
-ENV PATH=/usr/local/cuda/bin:$PATH
-ENV C_INCLUDE_PATH=/usr/local/cuda/include
-
-WORKDIR /oai-ran
-COPY . .
-
-WORKDIR /oai-ran/build
-RUN cmake -GNinja -DENABLE_PHYSIM_TESTS=ON -DENABLE_TESTS=ON \
-        -DSANITIZE_UNDEFINED=OFF -DSANITIZE_ADDRESS=OFF \
-        -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror \
-        -DPHYSIM_CHECK_FILES="ThresholdsCuda.cmake" \
-        -DCUDA_ENABLE=ON \
-        -DUSE_UNIFIED_MEMORY=ON \
-        -DUSE_ATS_MEMORY=OFF \
-        -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=/oai-ran/cmake_targets/ran_build/build \
-        .. && \
-        ninja test_channel_scalability test_multipath test_noise

ci-scripts/docker/Dockerfile.physim.ubuntu

@@ -24,24 +24,29 @@
 #   Valid for Ubuntu 24.04
 #
 #---------------------------------------------------------------------
-
+FROM nvidia/cuda:12.9.1-devel-ubuntu22.04 AS cuda-image
 FROM ran-base:develop AS ran-tests
 
-#RUN apt-get update && \
-#    DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
-#    DEBIAN_FRONTEND=noninteractive apt-get install --yes \
-#        libgtest-dev \
-#        libyaml-cpp-dev
-
 RUN rm -Rf /oai-ran
+COPY --from=cuda-image /usr/local/cuda/ /usr/local/cuda/
+
+# Set the LD_LIBRARY_PATH to ensure the system can find the copied libraries.
+# This is crucial for applications that use CUDA.
+ENV LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda/targets/sbsa-linux/lib
+ENV PATH=/usr/local/cuda/bin:$PATH
+ENV C_INCLUDE_PATH=/usr/local/cuda/include
+
 WORKDIR /oai-ran
 COPY . .
 
 WORKDIR /oai-ran/build
-# TODO should SANITIZE be ON? it makes it compile much longer
-RUN cmake -GNinja -DENABLE_PHYSIM_TESTS=ON \
+RUN cmake -GNinja -DENABLE_PHYSIM_TESTS=ON -DENABLE_TESTS=ON \
         -DSANITIZE_UNDEFINED=OFF -DSANITIZE_ADDRESS=OFF \
         -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror \
-        -DPHYSIM_CHECK_FILES="ThresholdsGracehopper.cmake" \
+        -DPHYSIM_CHECK_FILES="ThresholdsGracehopper.cmake;ThresholdsCuda.cmake" \
+        -DCUDA_ENABLE=ON \
+        -DUSE_UNIFIED_MEMORY=ON \
+        -DUSE_ATS_MEMORY=OFF \
+        -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=/oai-ran/cmake_targets/ran_build/build \
         .. && \
-    ninja ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim nr_psbchsim nr_srssim
+    ninja ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim nr_psbchsim nr_srssim test_channel_scalability

ci-scripts/main.py

@@ -202,9 +202,9 @@ def ExecuteActionWithParam(action, ctx, node):
 		workdir = CLUSTER.eNBSourceCodePath
 		success = cls_oaicitest.Deploy_Physim(ctx, HTML, node, workdir, script, options)
 
-	elif action == 'Build_Deploy_PhySim':
+	elif action == 'Build_Deploy_Docker_PhySim' or action == 'Build_Deploy_Source_PhySim':
 		ctest_opt = test.findtext('ctest-opt') or ''
-		script = test.findtext('script')
+		script = "scripts/docker-build-and-deploy-physims.sh" if action == 'Build_Deploy_Docker_PhySim' else 'scripts/source-deploy-physims.sh'
 		options = f"{CONTAINERS.eNBSourceCodePath} {ctest_opt}"
 		workdir = CONTAINERS.eNBSourceCodePath
 		success = cls_oaicitest.Deploy_Physim(ctx, HTML, node, workdir, script, options)

ci-scripts/scripts/docker-build-and-deploy-chansim.sh

@@ -1,46 +0,0 @@
-#!/bin/bash
-
-function die() { echo $@; exit 1; }
-[ $# -ge 1 ] || die "usage: $0 <directory> [ctest-options]"
-
-IMAGE=ran-channelsim:ci-temp
-CONTAINER=ran-channelsim
-function cleanup-docker() {
-  docker stop ${CONTAINER}
-  docker rm ${CONTAINER}
-  docker rmi ${IMAGE}
-  docker volume prune --force
-}
-trap cleanup-docker EXIT
-
-set -x
-DIR=$1
-RESULT_DIR=${DIR}/
-shift
-CTEST_OPT=$@
-
-# build channel simulator
-docker build --progress=plain --tag ${IMAGE} --file ${DIR}/ci-scripts/docker/Dockerfile.channelsim.ubuntu ${DIR} &>> ${RESULT_DIR}/channelsim_build_log.txt
-if [ $? -ne 0 ]; then
-  echo "build of channel simulator failed"
-  exit 1
-fi
-
-# get a JSON description of all tests to run
-docker run -a STDOUT --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --rm --name ${CONTAINER} ${IMAGE} ctest ${CTEST_OPT} --show-only=json-v1 &> ${RESULT_DIR}/desc-tests.json
-JSON_RES=$?
-
-# run the actual tests: we don't suppy --rm as we have to copy the files
-# similar to unit tests, we can't mount the file where we write physims-5g-run.xml to
-# as it would write a file as root, but this script is run as a normal user
-docker run -a STDOUT --gpus all --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --name ${CONTAINER} ${IMAGE} ctest ${CTEST_OPT} --output-junit results-run.xml --test-output-size-passed 100000 --test-output-size-failed 100000 &>> ${RESULT_DIR}/channelsim_log.txt
-RUN_RES=$?
-docker cp ${CONTAINER}:/oai-ran/build/results-run.xml ${RESULT_DIR}/
-docker cp ${CONTAINER}:/oai-ran/build/Testing/Temporary/LastTestsFailed.log ${RESULT_DIR}/
-docker cp ${CONTAINER}:/oai-ran/build/Testing/Temporary/LastTest.log ${RESULT_DIR}/
-
-# if both were successful, return 0
-# TODO not sure
-#[[ $JSON_RES -eq 0 && $RUN_RES -eq 0 ]] && exit 0
-
-exit 0

ci-scripts/scripts/docker-build-and-deploy-physims.sh

@@ -33,7 +33,7 @@ JSON_RES=$?
 # run the actual tests: we don't suppy --rm as we have to copy the files
 # similar to unit tests, we can't mount the file where we write physims-5g-run.xml to
 # as it would write a file as root, but this script is run as a normal user
-docker run -a STDOUT --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --name ${CONTAINER} ${IMAGE} ctest ${CTEST_OPT} --output-junit results-run.xml --test-output-size-passed 100000 --test-output-size-failed 100000 &>> ${RESULT_DIR}/physim_log.txt
+docker run -a STDOUT --gpus all --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --name ${CONTAINER} ${IMAGE} ctest ${CTEST_OPT} --output-junit results-run.xml --test-output-size-passed 100000 --test-output-size-failed 100000 &>> ${RESULT_DIR}/physim_log.txt
 RUN_RES=$?
 docker cp ${CONTAINER}:/oai-ran/build/results-run.xml ${RESULT_DIR}/
 docker cp ${CONTAINER}:/oai-ran/build/Testing/Temporary/LastTestsFailed.log ${RESULT_DIR}/

ci-scripts/tests/nr_physim_gpu_benchmark/gpu_performance_baselines.yaml

@@ -0,0 +1,183 @@
+# --- Test Suite 1: Scalability vs. Channel Count ---
+Channels_16_Batch:
+  'Total GPU Time (us)': 5265.72
+  'Avg Time per Channel - GPU (us)': 329.11
+  'Threshold': 100.00
+
+Channels_16_Stream:
+  'Total GPU Time (us)': 5265.72
+  'Avg Time per Channel - GPU (us)': 329.11
+  'Threshold': 100.00
+
+Channels_16_Serial:
+  'Total GPU Time (us)': 5265.72
+  'Avg Time per Channel - GPU (us)': 329.11
+  'Threshold': 100.00
+
+Channels_256_Batch:
+  'Total GPU Time (us)': 85696.71
+  'Avg Time per Channel - GPU (us)': 334.75
+  'Threshold': 100.00
+
+Channels_256_Stream:
+  'Total GPU Time (us)': 85696.71
+  'Avg Time per Channel - GPU (us)': 334.75
+  'Threshold': 100.00
+
+Channels_256_Serial:
+  'Total GPU Time (us)': 85696.71
+  'Avg Time per Channel - GPU (us)': 334.75
+  'Threshold': 100.00
+
+Channels_1024_Batch:
+  'Total GPU Time (us)': 337217.10
+  'Avg Time per Channel - GPU (us)': 329.31
+  'Threshold': 100.00
+
+Channels_1024_Stream:
+  'Total GPU Time (us)': 337217.10
+  'Avg Time per Channel - GPU (us)': 329.31
+  'Threshold': 100.00 
+
+Channels_1024_Serial:
+  'Total GPU Time (us)': 337217.10
+  'Avg Time per Channel - GPU (us)': 329.31
+  'Threshold': 100.00
+
+# --- Test Suite 2: Performance vs. Channel Complexity ---
+Length_16_Batch:
+  'Total GPU Time (us)': 319082.56
+  'Avg Time per Channel - GPU (us)': 311.60
+  'Threshold': 100.00
+
+Length_16_Stream:
+  'Total GPU Time (us)': 319082.56
+  'Avg Time per Channel - GPU (us)': 311.60
+  'Threshold': 100.00
+
+Length_16_Serial:
+  'Total GPU Time (us)': 319082.56
+  'Avg Time per Channel - GPU (us)': 311.60
+  'Threshold': 100.00
+
+Length_64_Batch:
+  'Total GPU Time (us)': 366564.52
+  'Avg Time per Channel - GPU (us)': 357.97
+  'Threshold': 100.00
+
+Length_64_Stream:
+  'Total GPU Time (us)': 366564.52
+  'Avg Time per Channel - GPU (us)': 357.97
+  'Threshold': 100.00
+
+Length_64_Serial:
+  'Total GPU Time (us)': 366564.52
+  'Avg Time per Channel - GPU (us)': 357.97
+  'Threshold': 100.00
+
+Length_128_Batch:
+  'Total GPU Time (us)': 425883.51
+  'Avg Time per Channel - GPU (us)': 415.90
+  'Threshold': 100.00
+
+Length_128_Stream:
+  'Total GPU Time (us)': 425883.51
+  'Avg Time per Channel - GPU (us)': 415.90
+  'Threshold': 100.00 
+
+Length_128_Serial:
+  'Total GPU Time (us)': 425883.51
+  'Avg Time per Channel - GPU (us)': 415.90
+  'Threshold': 100.00
+
+# --- Test Suite 3: Performance vs. MIMO Configuration ---
+MIMO_2x2_Batch:
+  'Total GPU Time (us)': 158999.06
+  'Avg Time per Channel - GPU (us)': 155.27
+  'Threshold': 100.00
+
+MIMO_2x2_Stream:
+  'Total GPU Time (us)': 158999.06
+  'Avg Time per Channel - GPU (us)': 155.27
+  'Threshold': 100.00
+
+MIMO_2x2_Serial:
+  'Total GPU Time (us)': 158999.06
+  'Avg Time per Channel - GPU (us)': 155.27
+  'Threshold': 100.00
+
+MIMO_4x4_Batch:
+  'Total GPU Time (us)': 336377.55
+  'Avg Time per Channel - GPU (us)': 328.49
+  'Threshold': 100.00
+
+MIMO_4x4_Stream:
+  'Total GPU Time (us)': 336377.55
+  'Avg Time per Channel - GPU (us)': 328.49
+  'Threshold': 100.00
+
+MIMO_4x4_Serial:
+  'Total GPU Time (us)': 336377.55
+  'Avg Time per Channel - GPU (us)': 328.49
+  'Threshold': 100.00
+
+MIMO_8x8_Batch:
+  'Total GPU Time (us)': 718312.46
+  'Avg Time per Channel - GPU (us)': 701.48
+  'Threshold': 100.00
+
+MIMO_8x8_Stream:
+  'Total GPU Time (us)': 718312.46
+  'Avg Time per Channel - GPU (us)': 701.48
+  'Threshold': 100.00
+
+MIMO_8x8_Serial:
+  'Total GPU Time (us)': 718312.46
+  'Avg Time per Channel - GPU (us)': 701.48
+  'Threshold': 100.00
+
+# --- Test Suite 4: Performance vs. Signal Samples ---
+Samples_30720_Batch:
+  'Total GPU Time (us)': 84702.49
+  'Avg Time per Channel - GPU (us)': 82.72
+  'Threshold': 100.00
+
+Samples_30720_Stream:
+  'Total GPU Time (us)': 84702.49
+  'Avg Time per Channel - GPU (us)': 82.72
+  'Threshold': 100.00
+
+Samples_30720_Serial:
+  'Total GPU Time (us)': 84702.49
+  'Avg Time per Channel - GPU (us)': 82.72
+  'Threshold': 100.00
+
+Samples_61440_Batch:
+  'Total GPU Time (us)': 168761.94
+  'Avg Time per Channel - GPU (us)': 164.81
+  'Threshold': 100.00
+
+Samples_61440_Stream:
+  'Total GPU Time (us)': 168761.94
+  'Avg Time per Channel - GPU (us)': 164.81
+  'Threshold': 100.00
+
+Samples_61440_Serial:
+  'Total GPU Time (us)': 168761.94
+  'Avg Time per Channel - GPU (us)': 164.81
+  'Threshold': 100.00
+
+Samples_122880_Batch:
+  'Total GPU Time (us)': 336500.40
+  'Avg Time per Channel - GPU (us)': 328.61
+  'Threshold': 100.00
+
+Samples_122880_Stream:
+  'Total GPU Time (us)': 336500.40
+  'Avg Time per Channel - GPU (us)': 328.61
+  'Threshold': 100.00
+
+Samples_122880_Serial:
+  'Total GPU Time (us)': 336500.40
+  'Avg Time per Channel - GPU (us)': 328.61
+  'Threshold': 100.00

ci-scripts/tests/nr_physim_gpu_benchmark/gpu_test_driver.py

@@ -0,0 +1,65 @@
+import argparse
+import os
+import subprocess
+import sys
+import yaml
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Test driver for the GPU benchmark suite.")
+    parser.add_argument("--executable", required=True, help="Path to the test_channel_scalability executable")
+    cli_args = parser.parse_args()
+
+    script_dir = os.path.dirname(os.path.realpath(__file__))
+    matrix_file_path = os.path.join(script_dir, "gpu_test_matrix.yaml")
+
+    try:
+        with open(matrix_file_path) as f:
+            test_matrix = yaml.safe_load(f)
+    except FileNotFoundError:
+        print(f"ERROR: Test matrix file not found at {matrix_file_path}")
+        sys.exit(1)
+
+    failed_tests = []
+
+    for test_case in test_matrix["tests"]:
+        name = test_case["name"]
+        args = test_case["args"]
+
+        print(f"\n{'='*80}")
+        print(f"--- Running Test Case: {name} ---")
+        print(f"{'='*80}\n")
+
+        command = [
+            "python3",
+            os.path.join(script_dir, "run_gpu_benchmark.py"),
+            "--executable",
+            cli_args.executable,
+            "--args",
+            args,
+            "--test-case-name",
+            name,
+        ]
+
+        result = subprocess.run(command)
+
+        if result.returncode != 0:
+            print(f"\n--- !!! Test Case FAILED: {name} !!! ---\n")
+            failed_tests.append(name)
+        else:
+            print(f"\n--- Test Case PASSED: {name} ---\n")
+
+    print(f"\n{'='*80}")
+    print("--- Test Suite Summary ---")
+    if not failed_tests:
+        print("\033[92mAll test cases PASSED.\033[0m")
+        sys.exit(0)
+    else:
+        print(f"\033[91mThe following {len(failed_tests)} test case(s) FAILED:\033[0m")
+        for test_name in failed_tests:
+            print(f"  - {test_name}")
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

ci-scripts/tests/nr_physim_gpu_benchmark/gpu_test_matrix.yaml

@@ -0,0 +1,76 @@
+tests:
+  # --- Test Suite 1: Scalability vs. Channel Count ---
+  - name: "Channels_16_Batch"
+    args: "-c 16 -t 4 -r 4 -s 122880 -l 32 -m batch -n 25"
+  - name: "Channels_16_Stream"
+    args: "-c 16 -t 4 -r 4 -s 122880 -l 32 -m stream -n 25"
+  - name: "Channels_16_Serial"
+    args: "-c 16 -t 4 -r 4 -s 122880 -l 32 -m serial -n 25"
+  - name: "Channels_256_Batch"
+    args: "-c 256 -t 4 -r 4 -s 122880 -l 32 -m batch -n 25"
+  - name: "Channels_256_Stream"
+    args: "-c 256 -t 4 -r 4 -s 122880 -l 32 -m stream -n 25"
+  - name: "Channels_256_Serial"
+    args: "-c 256 -t 4 -r 4 -s 122880 -l 32 -m serial -n 25"
+  - name: "Channels_1024_Batch"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m batch -n 25"
+  - name: "Channels_1024_Stream"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m stream -n 25"
+  - name: "Channels_1024_Serial"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m serial -n 25"
+
+  # --- Test Suite 2: Performance vs. Channel Complexity ---
+  - name: "Length_16_Batch"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 16 -m batch -n 25"
+  - name: "Length_64_Batch"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 64 -m batch -n 25"
+  - name: "Length_64_Stream"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 64 -m stream -n 25"
+  - name: "Length_64_Serial"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 64 -m serial -n 25"
+  - name: "Length_128_Batch"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 128 -m batch -n 25"
+  - name: "Length_128_Stream"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 128 -m stream -n 25"
+  - name: "Length_128_Serial"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 128 -m serial -n 25"
+
+  # --- Test Suite 3: Performance vs. MIMO Configuration ---
+  - name: "MIMO_2x2_Batch"
+    args: "-c 1024 -t 2 -r 2 -s 122880 -l 32 -m batch -n 25"
+  - name: "MIMO_2x2_Stream"
+    args: "-c 1024 -t 2 -r 2 -s 122880 -l 32 -m stream -n 25"
+  - name: "MIMO_2x2_Serial"
+    args: "-c 1024 -t 2 -r 2 -s 122880 -l 32 -m serial -n 25"
+  - name: "MIMO_4x4_Batch"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m batch -n 25"
+  - name: "MIMO_4x4_Stream"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m stream -n 25"
+  - name: "MIMO_4x4_Serial"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m serial -n 25"
+  - name: "MIMO_8x8_Batch"
+    args: "-c 1024 -t 8 -r 8 -s 122880 -l 32 -m batch -n 25"
+  - name: "MIMO_8x8_Stream"
+    args: "-c 1024 -t 8 -r 8 -s 122880 -l 32 -m stream -n 25"
+  - name: "MIMO_8x8_Serial"
+    args: "-c 1024 -t 8 -r 8 -s 122880 -l 32 -m serial -n 25"
+
+  # --- Test Suite 4: Performance vs. Signal Samples ---
+  - name: "Samples_30720_Batch"
+    args: "-c 1024 -t 4 -r 4 -s 30720 -l 32 -m batch -n 25"
+  - name: "Samples_30720_Stream"
+    args: "-c 1024 -t 4 -r 4 -s 30720 -l 32 -m stream -n 25"
+  - name: "Samples_30720_Serial"
+    args: "-c 1024 -t 4 -r 4 -s 30720 -l 32 -m serial -n 25"
+  - name: "Samples_61440_Batch"
+    args: "-c 1024 -t 4 -r 4 -s 61440 -l 32 -m batch -n 25"
+  - name: "Samples_61440_Stream"
+    args: "-c 1024 -t 4 -r 4 -s 61440 -l 32 -m stream -n 25"
+  - name: "Samples_61440_Serial"
+    args: "-c 1024 -t 4 -r 4 -s 61440 -l 32 -m serial -n 25"
+  - name: "Samples_122880_Batch"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m batch -n 25"
+  - name: "Samples_122880_Stream"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m stream -n 25"
+  - name: "Samples_122880_Serial"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m serial -n 25"

ci-scripts/tests/nr_physim_gpu_benchmark/run_gpu_benchmark.py

@@ -0,0 +1,130 @@
+import argparse
+import json
+import os
+import re
+import subprocess
+import sys
+import time
+import yaml
+
+
+def parse_benchmark_output(log_text):
+    metrics = {}
+    pattern = re.compile(r"\|\s*(?P<key>[\w\s\(\)\-]+?)\s*\|\s*(?P<value>[\d\.]+)x?\s*\|")
+    for line in log_text.splitlines():
+        match = pattern.search(line)
+        if match:
+            key = match.group("key").strip()
+            value = float(match.group("value"))
+            metrics[key] = value
+    return metrics
+
+
+def analyze_gpu_log(log_file):
+    util_vals, power_vals = [], []
+    try:
+        with open(log_file, "r") as f:
+            for line in f:
+                if "utilization.gpu" in line:
+                    continue
+                parts = line.strip().split(",")
+                if len(parts) >= 2:
+                    try:
+                        util_vals.append(float(parts[0].strip()))
+                        power_vals.append(float(parts[1].strip()))
+                    except (ValueError, IndexError):
+                        continue
+    except FileNotFoundError:
+        return "N/A", "N/A"
+    if not util_vals or not power_vals:
+        return "N/A", "N/A"
+    avg_util = sum(util_vals) / len(util_vals)
+    max_util = max(util_vals)
+    avg_power = sum(power_vals) / len(power_vals)
+    max_power = max(power_vals)
+    return (f"Avg: {avg_util:.1f}%, Max: {max_util:.1f}%", f"Avg: {avg_power:.1f}W, Max: {max_power:.1f}W")
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Run a single GPU benchmark and compare against a baseline.")
+    parser.add_argument("--executable", required=True, help="Path to the test_channel_scalability executable")
+    parser.add_argument("--args", required=True, help="Arguments to pass to the executable, in quotes")
+    parser.add_argument("--test-case-name", required=True, help="The name of the test case to look up in the baseline file")
+    cli_args = parser.parse_args()
+
+    gpu_log_file = "nvidia-smi.log"
+    monitor_command = f"nvidia-smi --query-gpu=utilization.gpu,power.draw --format=csv,noheader,nounits -l 1 > {gpu_log_file}"
+    monitor_process = subprocess.Popen(monitor_command, shell=True)
+    command = [cli_args.executable] + cli_args.args.split()
+    print(f"Running command: {' '.join(command)}")
+    result = subprocess.run(command, text=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    monitor_process.terminate()
+    time.sleep(1)
+
+    if result.returncode != 0:
+        print("--- Benchmark FAILED to run ---")
+        print(result.stdout)
+        print(result.stderr)
+        sys.exit(1)
+
+    print("--- Benchmark Ran Successfully ---")
+    print(result.stdout)
+
+    gpu_util_summary, gpu_power_summary = analyze_gpu_log(gpu_log_file)
+    print("\n--- GPU Monitoring Summary ---")
+    print(f"GPU Utilization: {gpu_util_summary}")
+    print(f"GPU Power Draw:  {gpu_power_summary}")
+
+    measured_metrics = parse_benchmark_output(result.stdout)
+    if not measured_metrics:
+        print("ERROR: Could not parse any metrics from the benchmark's text output.")
+        sys.exit(1)
+
+    try:
+        script_dir = os.path.dirname(os.path.realpath(__file__))
+        baseline_file_path = os.path.join(script_dir, "gpu_performance_baselines.yaml")
+        with open(baseline_file_path) as f:
+            all_baselines = yaml.safe_load(f)
+    except FileNotFoundError:
+        print(f"ERROR: Master baseline file not found at {baseline_file_path}")
+        sys.exit(1)
+
+    baseline_metrics = all_baselines.get(cli_args.test_case_name)
+    if not baseline_metrics:
+        print(f"ERROR: Could not find baseline entry for '{cli_args.test_case_name}' in {baseline_file_path}")
+        sys.exit(1)
+
+    all_metrics_ok = True
+    print("\n--- Performance Validation ---")
+    for key, baseline_value in baseline_metrics.items():
+        if key == "Threshold":
+            continue
+
+        if key in measured_metrics:
+            measured_value = measured_metrics[key]
+            threshold = baseline_metrics.get("Threshold", 0.25)
+            upper_bound = baseline_value * (1 + threshold)
+
+            print(f"Metric: '{key}'")
+            print(f"  - Measured: {measured_value:.2f}")
+            print(f"  - Baseline: {baseline_value:.2f}")
+            print(f"  - Allowed Upper Bound: {upper_bound:.2f}")
+
+            if measured_value > upper_bound:
+                print("  - STATUS: \033[91mFAILED (Exceeded threshold)\033[0m")
+                all_metrics_ok = False
+            else:
+                print("  - STATUS: \033[92mPASSED\033[0m")
+        else:
+            print(f"Metric '{key}' from baseline not found in run output. SKIPPING.")
+
+    if all_metrics_ok:
+        print("\nOverall Performance: PASSED")
+        sys.exit(0)
+    else:
+        print("\nOverall Performance: FAILED due to regression.")
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

ci-scripts/xml_class_list.yml

@@ -24,7 +24,8 @@
   - Undeploy_Object
   - Cppcheck_Analysis
   - Deploy_Run_OC_PhySim
-  - Build_Deploy_PhySim
+  - Build_Deploy_Docker_PhySim
+  - Build_Deploy_Source_PhySim
   - LicenceAndFormattingCheck
   - Push_Local_Registry
   - Pull_Local_Registry

ci-scripts/xml_files/container_5g_f1_rfsim.xml

@@ -240,7 +240,7 @@
     <class>Custom_Command</class>
     <desc>UE (1) connected to DU-PCI 1?</desc>
     <node>localhost</node>
-    <command>echo ci fetch_du_by_ue_id | ncat 192.168.71.150 9090 | grep "3585"</command>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3585"</command>
   </testCase>
 
   <testCase>
@@ -271,7 +271,7 @@
     <class>Custom_Command</class>
     <desc>UE (1) connected to DU-PCI 0?</desc>
     <node>localhost</node>
-    <command>echo ci fetch_du_by_ue_id | ncat 192.168.71.150 9090 | grep "3584"</command>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3584"</command>
   </testCase>
 
   <testCase>
@@ -302,7 +302,7 @@
     <class>Custom_Command</class>
     <desc>UE (1) connected to DU-PCI 1?</desc>
     <node>localhost</node>
-    <command>echo ci fetch_du_by_ue_id | ncat 192.168.71.150 9090 | grep "3585"</command>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3585"</command>
   </testCase>
 
   <testCase>

ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml

@@ -21,7 +21,7 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-fr2-66prb-5gnr-tdd</htmlTabRef>
+  <htmlTabRef>rfsim-fr2-32prb-5gnr-tdd</htmlTabRef>
   <htmlTabName>Monolithic FR2 gNB</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
 
@@ -42,7 +42,7 @@
     <class>Deploy_Object</class>
     <desc>Deploy OAI gNB</desc>
     <node>localhost</node>
-    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_66prb</yaml_path>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
     <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
   </testCase>
 
@@ -50,7 +50,7 @@
     <class>Deploy_Object</class>
     <desc>Deploy OAI NR-UE</desc>
     <node>localhost</node>
-    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_66prb</yaml_path>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
     <services>oai-gnb oai-nr-ue</services>
   </testCase>
 
@@ -88,7 +88,7 @@
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 5G stack</desc>
     <node>localhost</node>
-    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_66prb</yaml_path>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
     <d_retx_th>10,0,0,0</d_retx_th>
     <u_retx_th>10,0,0,0</u_retx_th>
   </testCase>

ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml

@@ -120,7 +120,7 @@
     <class>Custom_Command</class>
     <desc>UE (1) connected to DU-PCI 1?</desc>
     <node>localhost</node>
-    <command>echo ci fetch_du_by_ue_id | ncat 192.168.71.180 9090 | grep "1234"</command>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.180 9090 | grep "1234"</command>
   </testCase>
 
   <testCase>
@@ -181,7 +181,7 @@
     <class>Custom_Command</class>
     <desc>UE (1) connected to DU-PCI 0?</desc>
     <node>localhost</node>
-    <command>echo ci fetch_du_by_ue_id | ncat 192.168.71.150 9090 | grep "3584"</command>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3584"</command>
   </testCase>
 
   <testCase>
@@ -218,7 +218,7 @@
     <class>Custom_Command</class>
     <desc>UE (1) connected to DU-PCI 1?</desc>
     <node>localhost</node>
-    <command>echo ci fetch_du_by_ue_id | ncat 192.168.71.180 9090 | grep "1234"</command>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.180 9090 | grep "1234"</command>
   </testCase>
 
   <testCase>

ci-scripts/xml_files/container_5g_vrtsim_cirdb.xml

@@ -1,130 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-  <htmlTabRef>vrtsim-5gnr-cirdb</htmlTabRef>
-  <htmlTabName>Monolithic gNB vrtsim + CIRDB</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
-
-  <testCase>
-    <class>Pull_Local_Registry</class>
-    <desc>Pull Images from Local Registry</desc>
-    <node>localhost</node>
-    <images>oai-gnb oai-nr-ue</images>
-    <tag_prefix>arm_</tag_prefix>
-  </testCase>
-
-  <testCase>
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>localhost</node>
-  </testCase>
-
-  <testCase>
-    <class>Deploy_Object</class>
-    <desc>Deploy OAI 5G CoreNetwork</desc>
-    <node>localhost</node>
-    <yaml_path>ci-scripts/yaml_files/5g_vrtsim_cirdb</yaml_path>
-    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-  </testCase>
-
-  <testCase>
-    <class>Deploy_Object</class>
-    <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
-    <node>localhost</node>
-    <yaml_path>ci-scripts/yaml_files/5g_vrtsim_cirdb</yaml_path>
-    <services>oai-gnb oai-nr-ue</services>
-  </testCase>
-
-  <testCase>
-    <class>Attach_UE</class>
-    <desc>Attach OAI UE (Wait for IP)</desc>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-  </testCase>
-
-  <testCase>
-    <class>Ping</class>
-    <desc>Ping ext-dn from NR-UE</desc>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <ping_args>-c 20 -i 0.25</ping_args>
-    <ping_packetloss_threshold>5</ping_packetloss_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Ping</class>
-    <desc>Ping NR-UE from ext-dn</desc>
-    <id>rfsim5g_ext_dn</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ue</svr_id>
-    <svr_node>localhost</svr_node>
-    <ping_args>-c 20 -i 0.25</ping_args>
-    <ping_packetloss_threshold>5</ping_packetloss_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
-    <iperf_args>-u -b 3M -t 20 -R</iperf_args>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
-    <iperf_args>-u -b 1M -t 20</iperf_args>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Undeploy_Object</class>
-    <always_exec>true</always_exec>
-    <desc>Undeploy all OAI 5G stack</desc>
-    <node>localhost</node>
-    <yaml_path>ci-scripts/yaml_files/5g_vrtsim_cirdb</yaml_path>
-    <d_retx_th>10,0,0,0</d_retx_th>
-    <u_retx_th>1,0,0,0</u_retx_th>
-  </testCase>
-
-  <testCase>
-    <class>Clean_Test_Server_Images</class>
-    <always_exec>true</always_exec>
-    <desc>Clean Test Images on Test Server</desc>
-    <node>localhost</node>
-    <images>oai-gnb oai-nr-ue</images>
-
-  </testCase>
-
-</testCaseList>

ci-scripts/xml_files/container_build_run_tests.xml

@@ -29,6 +29,7 @@
     <class>Build_Run_Tests</class>
     <desc>Build and Run UnitTests</desc>
     <node>obelix</node>
+    <kind>all</kind>
   </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_image_build.xml

@@ -35,7 +35,7 @@
     <class>Build_Image</class>
     <desc>Build all Images</desc>
     <node>obelix</node>
-    <kind>x86</kind>
+    <kind>all</kind>
   </testCase>
 
   <testCase>

ci-scripts/xml_files/container_sa_aerial_quectel.xml

@@ -80,7 +80,7 @@
   <testCase>
     <class>Iperf</class>
     <desc>iperf (DL/UDP/800M)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 800M -t 30 -R -l 1428</iperf_args>
+    <iperf_args>-u -b 800M -t 30 -R</iperf_args>
     <svr_id>oc-cn5g-20897-aerial</svr_id>
     <id>up2-aerial</id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -101,7 +101,7 @@
     <class>Iperf</class>
     <desc>Optional iperf (DL/UDP/1000M)(30 sec)(single-ue profile)</desc>
     <may_fail>true</may_fail>
-    <iperf_args>-u -b 1000M -t 30 -R -l 1428</iperf_args>
+    <iperf_args>-u -b 1000M -t 30 -R</iperf_args>
     <svr_id>oc-cn5g-20897-aerial</svr_id>
     <id>up2-aerial</id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>

ci-scripts/xml_files/container_sa_aerial_quectel_ul_heavy.xml

@@ -101,7 +101,7 @@
   <testCase>
     <class>Iperf</class>
     <desc>iperf (DL/UDP/200M)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 200M -t 30 -R -l 1428</iperf_args>
+    <iperf_args>-u -b 200M -t 30 -R</iperf_args>
     <svr_id>oc-cn5g-20897-aerial</svr_id>
     <id>up2-aerial</id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>

ci-scripts/xml_files/container_sa_f1_ho_b210_quectel.xml

@@ -129,7 +129,7 @@
     <class>Custom_Command</class>
     <desc>UE connected to DU1?</desc>
     <node>groot</node>
-    <command>echo ci fetch_du_by_ue_id | ncat 127.0.0.1 9090 | grep "3585"</command>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
   </testCase>
 
   <testCase>
@@ -152,7 +152,7 @@
     <class>Custom_Command</class>
     <desc>UE connected to DU0?</desc>
     <node>groot</node>
-    <command>echo ci fetch_du_by_ue_id | ncat 127.0.0.1 9090 | grep "3584"</command>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3584"</command>
   </testCase>
 
   <testCase>
@@ -175,7 +175,7 @@
     <class>Custom_Command</class>
     <desc>UE connected to DU1?</desc>
     <node>groot</node>
-    <command>echo ci fetch_du_by_ue_id | ncat 127.0.0.1 9090 | grep "3585"</command>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
   </testCase>
 
   <testCase>

ci-scripts/xml_files/container_sa_n2_ho_b210_quectel.xml

@@ -121,7 +121,7 @@
     <class>Custom_Command</class>
     <desc>UE connected to gNB-PCI1?</desc>
     <node>rocket</node>
-    <command>echo ci fetch_du_by_ue_id | ncat 127.0.0.1 9090 | grep "3585"</command>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
   </testCase>
 
   <testCase>
@@ -144,7 +144,7 @@
     <class>Custom_Command</class>
     <desc>UE connected to gNB-PCI0?</desc>
     <node>groot</node>
-    <command>echo ci fetch_du_by_ue_id | ncat 127.0.0.1 9090 | grep "3584"</command>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3584"</command>
   </testCase>
 
   <testCase>

ci-scripts/xml_files/physim_gracehopper.xml

@@ -32,11 +32,10 @@
   </testCase>
 
   <testCase>
-    <class>Build_Deploy_PhySim</class>
-    <desc>Build and Deploy PhySim in Docker</desc>
-    <script>scripts/docker-build-and-deploy-physims.sh</script>
+    <class>Build_Deploy_Docker_PhySim</class>
+    <desc>Build and Deploy PhySim</desc>
     <node>localhost</node>
-    <ctest-opt>-R 5g -E "nr_dlsim|nr_ulsim|ldpctest" -j32</ctest-opt>
+    <ctest-opt>-R 5g -E "nr_dlsim|nr_ulsim|ldpctest|cuda" -j32</ctest-opt>
   </testCase>
 
 </testCaseList>

ci-scripts/xml_files/physim_timed_gracehopper.xml

@@ -32,9 +32,8 @@
   </testCase>
 
   <testCase>
-    <class>Build_Deploy_PhySim</class>
+    <class>Build_Deploy_Docker_PhySim</class>
     <desc>Build and Deploy PhySim with timing check</desc>
-    <script>scripts/docker-build-and-deploy-physims.sh</script>
     <node>localhost</node>
     <ctest-opt>-R 5g -R "nr_dlsim|nr_ulsim|ldpctest" -E physim.5g.nr_dlsim.mcs.mimo.test9 -j1</ctest-opt>
   </testCase>

ci-scripts/xml_files/t2_offload_physim_enc_dec.xml

@@ -32,9 +32,8 @@
   </testCase>
 
   <testCase>
-    <class>Build_Deploy_PhySim</class>
+    <class>Build_Deploy_Source_PhySim</class>
     <desc>Build and Deploy PhySim T2 Offload tests</desc>
-    <script>scripts/source-deploy-physims.sh</script>
     <node>caracal</node>
     <ctest-opt>-R 5g-offload -j1</ctest-opt>
   </testCase>

ci-scripts/xml_files/test_channel_scalability_gracehopper.xml

@@ -21,8 +21,8 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>channelsim-tab</htmlTabRef>
-  <htmlTabName>ChannelSim</htmlTabName>
+  <htmlTabRef>physim-tab</htmlTabRef>
+  <htmlTabName>PhySim</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
 
   <testCase>
@@ -32,12 +32,10 @@
   </testCase>
 
   <testCase>
-    <class>Build_Deploy_PhySim</class>
-    <desc>Build and Deploy Test Channel Simulation</desc>
-    <script>scripts/docker-build-and-deploy-chansim.sh</script>
+    <class>Build_Deploy_Docker_PhySim</class>
+    <desc>Build and Deploy Test Channel Scalability</desc>
     <node>localhost</node>
-    <ctest-opt>-R cuda.5g.channelsim</ctest-opt>
+    <ctest-opt>-R cuda</ctest-opt>
   </testCase>
 
 </testCaseList>
-

ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml

@@ -208,10 +208,9 @@ services:
         environment:
             TZ: Europe/Paris
             ASAN_OPTIONS: detect_leaks=0
-            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.[0].serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
         volumes:
             - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
-            - ../../conf_files/lteue.rfsim.conf:/opt/oai-lte-ue/etc/ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep lte-uesoftmodem"
             interval: 10s

ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml

@@ -30,10 +30,9 @@ services:
         environment:
             TZ: Europe/Paris
             ASAN_OPTIONS: detect_leaks=0
-            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.[0].serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time --noS1
+            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time --noS1
         volumes:
             - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
-            - ../../conf_files/lteue.rfsim.conf:/opt/oai-lte-ue/etc/ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep lte-uesoftmodem"
             interval: 10s

ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml

@@ -208,10 +208,9 @@ services:
         environment:
             TZ: Europe/Paris
             ASAN_OPTIONS: detect_leaks=0
-            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 50 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.[0].serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 50 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
         volumes: 
             - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
-            - ../../conf_files/lteue.rfsim.conf:/opt/oai-lte-ue/etc/ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep lte-uesoftmodem"
             interval: 10s

ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml

@@ -208,10 +208,9 @@ services:
         environment:
             TZ: Europe/Paris
             ASAN_OPTIONS: detect_leaks=0
-            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 100 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.[0].serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 100 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
         volumes:
             - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
-            - ../../conf_files/lteue.rfsim.conf:/opt/oai-lte-ue/etc/ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep lte-uesoftmodem"
             interval: 10s

ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml

@@ -28,10 +28,9 @@ services:
         environment:
             TZ: Europe/Paris
             ASAN_OPTIONS: detect_leaks=0
-            USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsim --noS1 --rfsimulator.[0].serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time --noS1
+            USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsim --noS1 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time --noS1
         volumes:
             - ../../conf_files/lteue.usim-mbs.conf:/opt/oai-lte-ue/etc/ue_usim.conf
-            - ../../conf_files/lteue.rfsim.conf:/opt/oai-lte-ue/etc/ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep lte-uesoftmodem"
             interval: 10s

ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml

@@ -33,10 +33,9 @@ services:
             TZ: Europe/Paris
             HOSTNAME: oai_ue0
             ASAN_OPTIONS: detect_leaks=0
-            USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsim --noS1 --rfsimulator.[0].serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time --noS1
+            USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsim --noS1 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time --noS1
         volumes:
             - ../../conf_files/lteue.usim-mbs.conf:/opt/oai-lte-ue/etc/ue_usim.conf
-            - ../../conf_files/lteue.rfsim.conf:/opt/oai-lte-ue/etc/ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep lte-uesoftmodem"
             interval: 10s

ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml

@@ -208,10 +208,9 @@ services:
         environment:
             TZ: Europe/Paris
             ASAN_OPTIONS: detect_leaks=0
-            USE_ADDITIONAL_OPTIONS: --rfsim -T -C 2605000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.[0].serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --rfsim -T -C 2605000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
         volumes:
             - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
-            - ../../conf_files/lteue.rfsim.conf:/opt/oai-lte-ue/etc/ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep lte-uesoftmodem"
             interval: 10s

ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml

@@ -130,10 +130,10 @@ services:
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim
                                     --log_config.global_log_options level,nocolor,time
-                                    --rfsimulator.[0].options chanmod
+                                    --rfsimulator.options chanmod
                                     --telnetsrv --telnetsrv.listenaddr 192.168.71.171
                                     --telnetsrv.shrmod ci
-                                    --rfsimulator.[0].serveraddr 192.168.71.181
+                                    --rfsimulator.serveraddr 192.168.71.181
             ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
         depends_on:
             - oai-cu
@@ -168,7 +168,7 @@ services:
                                     --gNBs.[0].servingCellConfigCommon.[0].dl_absoluteFrequencyPointA 642024
                                     --gNBs.[0].servingCellConfigCommon.[0].ssb_PositionsInBurst_Bitmap 3
                                     --MACRLCs.[0].local_n_address 192.168.71.172
-                                    --rfsimulator.[0].serveraddr 192.168.71.181
+                                    --rfsimulator.serveraddr 192.168.71.181
             ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
         depends_on:
             - oai-cu
@@ -199,8 +199,8 @@ services:
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
                                     -r 106 --numerology 1 -C 3619200000
                                     --uicc0.imsi 208990100001100
-                                    --rfsimulator.[0].options chanmod
-                                    --rfsimulator.[0].serveraddr server
+                                    --rfsimulator.options chanmod
+                                    --rfsimulator.serveraddr server
                                     --telnetsrv --telnetsrv.shrmod ciUE --telnetsrv.listenaddr 192.168.71.181 --telnetsrv.listenport 8091
                                     --channelmod.modellist_rfsimu_1.[0].model_name rfsimu_channel_ue0
                                     --channelmod.modellist_rfsimu_1.[1].model_name rfsimu_channel_ue1

ci-scripts/yaml_files/5g_rfsimulator/README.md

@@ -256,7 +256,7 @@ Create the entry for the second UE in `docker-compose.yaml` file as follows:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 -C 3619200000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         devices:
@@ -518,7 +518,8 @@ uicc0 = {
   imsi = "208990100001100";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+  dnn= "oai";
+  nssai_sst=1;
 }
 ```
 

ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml

@@ -123,7 +123,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -150,7 +150,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -177,7 +177,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -204,7 +204,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001103 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001103 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -231,7 +231,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001104 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001104 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -258,7 +258,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001105 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001105 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -285,7 +285,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001106 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001106 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -312,7 +312,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001107 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001107 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -339,7 +339,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001108 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001108 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -366,7 +366,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001109 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001109 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_rfsimulator/local-override-ue-gdb.yaml

@@ -3,4 +3,4 @@ services:
     privileged: true
     stdin_open: true
     tty: true
-    command: gdb --args /opt/oai-nr-ue/bin/nr-uesoftmodem -O /opt/oai-nr-ue/etc/nr-ue.conf -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+    command: gdb --args /opt/oai-nr-ue/bin/nr-uesoftmodem -O /opt/oai-nr-ue/etc/nr-ue.conf -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time

ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml

@@ -121,7 +121,7 @@ services:
             - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim -r 24 --ssb 24 --numerology 1 -C 3604800000 --uicc0.imsi 208990100001100
-                                    --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+                                    --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
                                     --telnetsrv --telnetsrv.shrmod ciUE --telnetsrv.listenaddr 192.168.71.150 --telnetsrv.listenport 8091
             ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
         depends_on:

ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml

@@ -124,7 +124,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: --rfsim -r 273 --numerology 1 --band 78 -C 3450720000 --ssb 1518 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --rfsim -r 273 --numerology 1 --band 78 -C 3450720000 --ssb 1518 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml

@@ -309,7 +309,7 @@ services:
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
                                     -r 106 --numerology 1 -C 3619200000
                                     --uicc0.imsi 208990100001100
-                                    --rfsimulator.[0].serveraddr oai-du
+                                    --rfsimulator.serveraddr oai-du
         depends_on:
             - oai-du
         networks:
@@ -338,8 +338,8 @@ services:
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
                                     -r 106 --numerology 1 -C 3619200000
-                                    --uicc0.imsi 208990100001101 --uicc0.pdu_sessions.[0].nssai_sst 2
-                                    --rfsimulator.[0].serveraddr 192.168.78.3
+                                    --uicc0.imsi 208990100001101 --uicc0.nssai_sst 2
+                                    --rfsimulator.serveraddr 192.168.78.3
         depends_on:
             - oai-du2
         networks:
@@ -368,8 +368,8 @@ services:
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
                                     -r 106 --numerology 1 -C 3619200000
-                                    --uicc0.imsi 208990100001102 --uicc0.pdu_sessions.[0].nssai_sst 3
-                                    --rfsimulator.[0].serveraddr 192.168.78.4
+                                    --uicc0.imsi 208990100001102 --uicc0.nssai_sst 3
+                                    --rfsimulator.serveraddr 192.168.78.4
             ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-du3

ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml

@@ -8,7 +8,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --rfsimulator.[0].wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
         networks:
             public_net:
@@ -33,7 +33,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
         devices:
             - /dev/net/tun:/dev/net/tun

ci-scripts/yaml_files/5g_rfsimulator_flexric/docker-compose.yml

@@ -105,7 +105,7 @@ services:
         privileged: true
         container_name: rfsim5g-oai-nr-ue
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 -C 3619200000 --uicc0.imsi 001010000000003 --rfsimulator.[0].serveraddr 192.168.70.151 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 -C 3619200000 --uicc0.imsi 001010000000003 --rfsimulator.serveraddr 192.168.70.151 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -124,7 +124,7 @@ services:
         privileged: true
         container_name: rfsim5g-oai-nr-ue2
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 -C 3619200000 --uicc0.imsi 001010000000004 --rfsimulator.[0].serveraddr 192.168.70.151 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 -C 3619200000 --uicc0.imsi 001010000000004 --rfsimulator.serveraddr 192.168.70.151 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml

@@ -102,7 +102,7 @@ services:
             public_net:
                 ipv4_address: 192.168.71.140
         volumes:
-            - ../../conf_files/gnb.sa.band257.u3.66prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
+            - ../../conf_files/gnb.sa.band261.u3.32prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
             start_period: 10s
@@ -121,8 +121,8 @@ services:
             - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim
-                                    --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-                                    -C 27975360000 -r 66 --numerology 3 --ssb 48 --band 257
+                                    --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+                                    -r 32 --numerology 3 --band 261 -C 27533160000 --ssb 73
             ASAN_OPTIONS: detect_leaks=0
         devices:
              - /dev/net/tun:/dev/net/tun

ci-scripts/yaml_files/5g_rfsimulator_multiue/docker-compose.yaml

@@ -111,7 +111,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim --log_config.global_log_options level,nocolor,time --num-ues 10
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time --num-ues 10
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_rfsimulator_multiue/nrue.uicc.conf

@@ -2,193 +2,74 @@ uicc0 = {
   imsi = "208990100001100";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+  dnn= "oai";
+  nssai_sst=1;
 }
 uicc1 = {
   imsi = "208990100001101";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+  dnn= "oai";
+  nssai_sst=1;
 }
 uicc2 = {
   imsi = "208990100001102";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+  dnn= "oai";
+  nssai_sst=1;
 }
 uicc3 = {
   imsi = "208990100001103";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+  dnn= "oai";
+  nssai_sst=1;
 }
 uicc4 = {
   imsi = "208990100001104";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+  dnn= "oai";
+  nssai_sst=1;
 }
 uicc5 = {
   imsi = "208990100001105";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+  dnn= "oai";
+  nssai_sst=1;
 }
 uicc6 = {
   imsi = "208990100001106";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+  dnn= "oai";
+  nssai_sst=1;
 }
 uicc7 = {
   imsi = "208990100001107";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+  dnn= "oai";
+  nssai_sst=1;
 }
 uicc8 = {
   imsi = "208990100001108";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+  dnn= "oai";
+  nssai_sst=1;
 }
 uicc9 = {
   imsi = "208990100001109";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+  dnn= "oai";
+  nssai_sst=1;
 }
 
+
+
 thread-pool: "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
 
-rfsimulator = (
-  {
-    serveraddr = "192.168.71.140";
-  }, {
-    serveraddr = "192.168.71.140";
-  }, {
-    serveraddr = "192.168.71.140";
-  }, {
-    serveraddr = "192.168.71.140";
-  }, {
-    serveraddr = "192.168.71.140";
-  }, {
-    serveraddr = "192.168.71.140";
-  }, {
-    serveraddr = "192.168.71.140";
-  }, {
-    serveraddr = "192.168.71.140";
-  }, {
-    serveraddr = "192.168.71.140";
-  }, {
-    serveraddr = "192.168.71.140";
-  }
-);
-
-RUs = (
-  {
-    nb_tx      = 1;
-    nb_rx      = 1;
-  }, {
-    nb_tx      = 1;
-    nb_rx      = 1;
-  }, {
-    nb_tx      = 1;
-    nb_rx      = 1;
-  }, {
-    nb_tx      = 1;
-    nb_rx      = 1;
-  }, {
-    nb_tx      = 1;
-    nb_rx      = 1;
-  }, {
-    nb_tx      = 1;
-    nb_rx      = 1;
-  }, {
-    nb_tx      = 1;
-    nb_rx      = 1;
-  }, {
-    nb_tx      = 1;
-    nb_rx      = 1;
-  }, {
-    nb_tx      = 1;
-    nb_rx      = 1;
-  }, {
-    nb_tx      = 1;
-    nb_rx      = 1;
-  }
-);
-
-cells = (
-  {
-    ru_id      = 0;
-    band       = 78;
-    rf_freq    = 3319680000L;
-    numerology = 1;
-    N_RB_DL    = 106;
-    ssb_start  = 516;
-  }, {
-    ru_id      = 1;
-    band       = 78;
-    rf_freq    = 3319680000L;
-    numerology = 1;
-    N_RB_DL    = 106;
-    ssb_start  = 516;
-  }, {
-    ru_id      = 2;
-    band       = 78;
-    rf_freq    = 3319680000L;
-    numerology = 1;
-    N_RB_DL    = 106;
-    ssb_start  = 516;
-  }, {
-    ru_id      = 3;
-    band       = 78;
-    rf_freq    = 3319680000L;
-    numerology = 1;
-    N_RB_DL    = 106;
-    ssb_start  = 516;
-  }, {
-    ru_id      = 4;
-    band       = 78;
-    rf_freq    = 3319680000L;
-    numerology = 1;
-    N_RB_DL    = 106;
-    ssb_start  = 516;
-  }, {
-    ru_id      = 5;
-    band       = 78;
-    rf_freq    = 3319680000L;
-    numerology = 1;
-    N_RB_DL    = 106;
-    ssb_start  = 516;
-  }, {
-    ru_id      = 6;
-    band       = 78;
-    rf_freq    = 3319680000L;
-    numerology = 1;
-    N_RB_DL    = 106;
-    ssb_start  = 516;
-  }, {
-    ru_id      = 7;
-    band       = 78;
-    rf_freq    = 3319680000L;
-    numerology = 1;
-    N_RB_DL    = 106;
-    ssb_start  = 516;
-  }, {
-    ru_id      = 8;
-    band       = 78;
-    rf_freq    = 3319680000L;
-    numerology = 1;
-    N_RB_DL    = 106;
-    ssb_start  = 516;
-  }, {
-    ru_id      = 9;
-    band       = 78;
-    rf_freq    = 3319680000L;
-    numerology = 1;
-    N_RB_DL    = 106;
-    ssb_start  = 516;
-  }
-);

ci-scripts/yaml_files/5g_rfsimulator_n2_ho/docker-compose.yaml

@@ -149,7 +149,7 @@ services:
                                     --gNBs.[0].nr_cellid 0
                                     --telnetsrv --telnetsrv.listenaddr 192.168.71.171
                                     --telnetsrv.shrmod ci
-                                    --rfsimulator.[0].serveraddr 192.168.71.190
+                                    --rfsimulator.serveraddr 192.168.71.190
             ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
         depends_on:
             - oai-cucp-0
@@ -176,7 +176,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --rfsim --rfsimulator.[0].serveraddr server
+            USE_ADDITIONAL_OPTIONS: --rfsim --rfsimulator.serveraddr server
                                     --band 78 -C 3619200000 -r 106 --numerology 1 --ssb 516
                                     --uicc0.imsi 208990100001100
                                     --log_config.global_log_options level,nocolor,time
@@ -259,7 +259,7 @@ services:
             - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim
-                                    --rfsimulator.[0].serveraddr 192.168.71.190
+                                    --rfsimulator.serveraddr 192.168.71.190
                                     --log_config.global_log_options level,nocolor,time
                                     --gNBs.[0].gNB_DU_ID 1234
                                     --gNBs.[0].gNB_ID 0xb00

ci-scripts/yaml_files/5g_rfsimulator_ntn_geo/docker-compose.yaml

@@ -123,7 +123,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --band 254 -C 2488400000 --CO -873500000 -r 25 --numerology 0 --ssb 60 --rfsim --rfsimulator.[0].prop_delay 238.74 --rfsimulator.[0].serveraddr 192.168.71.140 --num-ul-actors 1 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --band 254 -C 2488400000 --CO -873500000 -r 25 --numerology 0 --ssb 60 --rfsim --rfsimulator.prop_delay 238.74 --rfsimulator.serveraddr 192.168.71.140 --num-ul-actors 1 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_rfsimulator_ntn_leo/docker-compose.yaml

@@ -121,10 +121,13 @@ services:
             - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS:
-                --rfsim --rfsimulator.[0].serveraddr 192.168.71.140
+                --band 254 -C 2488400000 --CO -873500000 -r 25 --numerology 0 --ssb 60
+                --rfsim --rfsimulator.prop_delay 20 --rfsimulator.options chanmod
+                --rfsimulator.serveraddr 192.168.71.140
                 --time-sync-I 0.1 --ntn-initial-time-drift -46
-                --initial-fo 57340 --cont-fo-comp 3
+                --initial-fo 57340 --cont-fo-comp 2
                 --log_config.global_log_options level,nocolor,time
+                --num-ul-actors 1
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_rfsimulator_prs/docker-compose.yaml

@@ -36,7 +36,7 @@ services:
         environment:
             USE_ADDITIONAL_OPTIONS: --phy-test --rfsim -E
                                     --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw
-                                    --rfsimulator.[0].serveraddr 192.168.71.140
+                                    --rfsimulator.serveraddr 192.168.71.140
                                     --log_config.global_log_options level,nocolor,time
                                     --telnetsrv --telnetsrv.listenaddr 192.168.71.150 --telnetsrv.listenport 8091
                                     --telnetsrv.shrmod ciUE

ci-scripts/yaml_files/5g_rfsimulator_sidelink/docker-compose.yaml

@@ -8,7 +8,7 @@ services:
             - NET_ADMIN
             - NET_RAW
         environment:
-            USE_ADDITIONAL_OPTIONS: --sl-mode 2 --sync-ref 4 --rfsim --rfsimulator.[0].serveraddr server --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sl-mode 2 --sync-ref 4 --rfsim --rfsimulator.serveraddr server --log_config.global_log_options level,nocolor,time
         networks:
             public_net:
                 ipv4_address: 192.168.71.140
@@ -33,7 +33,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --sl-mode 2 --rfsim --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sl-mode 2 --rfsim --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-nr-ue-1
         networks:

ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml

@@ -8,7 +8,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --rfsimulator.[0].wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
         networks:
             public_net:
@@ -33,7 +33,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
         devices:
             - /dev/net/tun:/dev/net/tun

ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml

@@ -149,7 +149,7 @@ services:
             - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152680000 --CO -400000000 --ssb 48
-                                    --rfsimulator.[0].serveraddr 192.168.71.141 --log_config.global_log_options level,nocolor,time
+                                    --rfsimulator.serveraddr 192.168.71.141 --extra-pdu-id 2 --log_config.global_log_options level,nocolor,time
                                     --telnetsrv --telnetsrv.shrmod ciUE --telnetsrv.listenaddr 192.168.71.150 --telnetsrv.listenport 8091
             ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
         depends_on:
@@ -160,7 +160,7 @@ services:
         devices:
              - /dev/net/tun:/dev/net/tun
         volumes:
-            - ../../conf_files/nrue.uicc.2pdu.conf:/opt/oai-nr-ue/etc/nr-ue.conf
+            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
             start_period: 10s

ci-scripts/yaml_files/5g_vrtsim_cirdb/docker-compose.yaml

@@ -1,183 +0,0 @@
-services:
-    # CIR Generator service - generates CIRDB files on every CI run
-    cir-generator:
-        image: oaisoftwarealliance/cir-generator:test
-        environment:
-            GENERATOR_ARGS: "--demo"
-            OUTPUT: "--out /opt/output/cir_db.bin"
-        volumes:
-            - cirdb_data:/opt/output
-
-    mysql:
-        container_name: "rfsim5g-mysql"
-        image: mysql:8.0
-        init: true
-        volumes:
-            - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
-            - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
-        environment:
-            - TZ=Europe/Paris
-            - MYSQL_DATABASE=oai_db
-            - MYSQL_USER=test
-            - MYSQL_PASSWORD=test
-            - MYSQL_ROOT_PASSWORD=linux
-        healthcheck:
-            test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
-            interval: 10s
-            timeout: 5s
-            start_period: 10s
-            start_interval: 500ms
-            retries: 30
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.131
-
-    oai-amf:
-        container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.1.10
-        environment:
-            - TZ=Europe/paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
-        depends_on:
-            - mysql
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.132
-
-    oai-smf:
-        container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.1.10
-        environment:
-            - TZ=Europe/Paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
-        depends_on:
-            - oai-amf
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.133
-
-    oai-upf:
-        container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.1.10
-        init: true
-        environment:
-            - TZ=Europe/Paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
-        depends_on:
-            - oai-smf
-        cap_add:
-            - NET_ADMIN
-            - SYS_ADMIN
-        cap_drop:
-            - ALL
-        privileged: true
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.134
-                interface_name: eth0
-            traffic_net:
-                ipv4_address: 192.168.72.134
-                interface_name: eth1
-
-    oai-ext-dn:
-        privileged: true
-        container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:latest
-        init: true
-        entrypoint: /bin/bash -c \
-              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
-              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
-        depends_on:
-            - oai-upf
-        networks:
-            traffic_net:
-                ipv4_address: 192.168.72.135
-        healthcheck:
-            test: /bin/bash -c "ping -c 2 192.168.72.134"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-            start_period: 10s
-            start_interval: 500ms
-
-    oai-gnb:
-        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
-        container_name: rfsim5g-oai-gnb
-        cap_drop:
-            - ALL
-        environment:
-            USE_ADDITIONAL_OPTIONS: -E --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role server --vrtsim.cirdb 1 --vrtsim.cirdb_file /cirdb/cir_db.bin --vrtsim.cirdb_yaml /cirdb/cir_db.yaml --vrtsim.cirdb_model_id 0 --vrtsim.cirdb_ds_ns 1 --vrtsim.cirdb_speed_mps 1.5
-        depends_on:
-            cir-generator:
-                condition: service_completed_successfully
-            oai-ext-dn:
-                condition: service_started
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.140
-        volumes:
-            - ../../conf_files/gnb.sa.band78.106prb.vrtsim.2x2.yaml:/opt/oai-gnb/etc/gnb.yaml
-            - cirdb_data:/cirdb:ro
-            - tmp_data:/tmp/
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-softmodem"
-            interval: 10s
-            timeout: 5s
-            start_period: 10s
-            start_interval: 500ms
-            retries: 5
-        ipc: host
-
-    oai-nr-ue:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
-        container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN
-            - NET_RAW
-        environment:
-            USE_ADDITIONAL_OPTIONS: -E -r 106 --numerology 1 --band 78 -C 3619200000 --ssb 516 --uicc0.imsi 208990100001100 --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role client
-        depends_on:
-            - oai-gnb
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.150
-        devices:
-             - /dev/net/tun:/dev/net/tun
-        volumes:
-            - ../../conf_files/nrue.vrtsim.chanmod.yaml:/opt/oai-nr-ue/etc/nr-ue.yaml
-            - tmp_data:/tmp/
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-uesoftmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-            start_period: 10s
-            start_interval: 500ms
-        ipc: host
-
-networks:
-    public_net:
-        driver: bridge
-        name: rfsim5g-oai-public-net
-        ipam:
-            config:
-                - subnet: 192.168.71.128/26
-        driver_opts:
-            com.docker.network.bridge.name: "rfsim5g-public"
-    traffic_net:
-        driver: bridge
-        name: rfsim5g-oai-traffic-net
-        ipam:
-            config:
-                - subnet: 192.168.72.128/26
-        driver_opts:
-            com.docker.network.bridge.name: "rfsim5g-traffic"
-
-volumes:
-    tmp_data:
-    cirdb_data:

ci-scripts/yaml_files/sa_gnb_aerial/aerial_l1_entrypoint.sh

@@ -4,6 +4,8 @@
 cuBB_Path="${cuBB_SDK:-/opt/nvidia/cuBB}"
 
 cd "$cuBB_Path" || exit 1
+# Add gdrcopy to LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=/usr/local/nvidia/lib:/usr/local/nvidia/lib64:/opt/mellanox/dpdk/lib/x86_64-linux-gnu:/opt/mellanox/doca/lib/x86_64-linux-gnu:/opt/nvidia/cuBB/cuPHY-CP/external/gdrcopy/build/x86_64/
 
 # Restart MPS
 # Export variables
@@ -12,7 +14,7 @@ export CUDA_MPS_PIPE_DIRECTORY=/var
 export CUDA_MPS_LOG_DIRECTORY=/var
 
 # Stop existing MPS
-echo quit | sudo -E nvidia-cuda-mps-control
+sudo -E echo quit | sudo -E nvidia-cuda-mps-control
 
 # Start MPS
 sudo -E nvidia-cuda-mps-control -d
@@ -22,11 +24,11 @@ sudo -E echo start_server -uid 0 | sudo -E nvidia-cuda-mps-control
 # Check if an argument is provided
 if [ $# -eq 0 ]; then
     # No argument provided, use default value
-    argument="P5G_WNC_GH"
+    argument="P5G_FXN_GH"
 else
     # Argument provided, use it
     argument="$1"
 fi
 
-sudo -E "$cuBB_Path"/build.$(uname -m)/cuPHY-CP/cuphycontroller/examples/cuphycontroller_scf "$argument"
-sudo -E ./build.$(uname -m)/cuPHY-CP/gt_common_libs/nvIPC/tests/pcap/pcap_collect
+sudo -E "$cuBB_Path"/build/cuPHY-CP/cuphycontroller/examples/cuphycontroller_scf "$argument"
+sudo -E ./build/cuPHY-CP/gt_common_libs/nvIPC/tests/pcap/pcap_collect

ci-scripts/yaml_files/sa_gnb_aerial/cuphycontroller_P5G_WNC_GH.yaml

@@ -1,243 +0,0 @@
-# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-aerial_sdk_version: 25-3-cubb
-l2adapter_filename: l2_adapter_config_P5G_GH.yaml
-aerial_metrics_backend_address: 127.0.0.1:8081
-
-# CPU core shared by all low-priority threads
-low_priority_core: 10
-enable_ptp_svc_monitoring: 0
-ptp_rms_threshold: 20 #ns
-nic_tput_alert_threshold_mbps: 85000
-
-cuphydriver_config:
-  standalone: 0
-  validation: 0
-  num_slots: 8
-  log_level: DBG
-  profiler_sec: 0
-  dpdk_thread: 10
-  dpdk_verbose_logs: 0
-  accu_tx_sched_res_ns: 500
-  accu_tx_sched_disable: 0 #Flag applicable only for CX6-DX : BF3/CX7 HW and beyond support accurate send scheduling directly on timestamp, for CX6-DX this is implemented via software emulation
-  fh_stats_dump_cpu_core: -1
-  pdump_client_thread: -1
-  use_green_contexts: 0
-  use_batched_memcpy: 0 # Experimental feature; requires >= CUDA 12.8
-  mps_sm_pusch: 100
-  mps_sm_pucch: 2
-  mps_sm_prach: 2
-  mps_sm_ul_order: 20
-  mps_sm_pdsch: 102
-  mps_sm_pdcch: 10
-  mps_sm_pbch: 2
-  mps_sm_gpu_comms: 16
-  mps_sm_srs: 16
-  pdsch_fallback: 0
-  dpdk_file_prefix: cuphycontroller
-  nics:
-    - nic: '0000:01:00.0'
-      mtu: 9216
-      cpu_mbufs: 196608
-      uplane_tx_handles: 64
-      txq_size: 8192
-      rxq_size: 16384
-      gpu: 0
-  cus_port_failover: 0
-  gpus:
-    - 0
-    # Set GPUID to the GPU sharing the PCIe switch as NIC
-    # run nvidia-smi topo -m to find out which GPU
-  workers_ul: [4,5]
-  workers_dl: [6,7,8]
-  debug_worker: -1
-  workers_sched_priority: 95
-  prometheus_thread: -1
-  start_section_id_srs: 3072
-  start_section_id_prach: 2048
-  enable_ul_cuphy_graphs: 1
-  enable_dl_cuphy_graphs: 1
-  ul_order_kernel_mode: 0 # 0: Ping-Pong, 1: dual CTA
-  ul_order_timeout_cpu_ns: 8000000
-  ul_order_timeout_log_interval_ns: 1000000000
-  ul_order_timeout_gpu_ns: 3000000
-  ul_order_timeout_gpu_srs_ns: 5200000
-  ul_srs_aggr3_task_launch_offset_ns: 500000
-  ul_order_timeout_gpu_log_enable: 0
-  ul_order_max_rx_pkts: 512
-  ul_order_rx_pkts_timeout_ns: 100000
-  cplane_disable: 0
-  gpu_init_comms_dl: 1
-  cell_group: 1
-  cell_group_num: 1
-  fix_beta_dl: 0
-  bfw_beta_prescaler: 16384
-  pusch_workCancelMode: 2  # set cuphyPuschStatPrms_t workCancelMode field to PUSCH_DEVICE_GRAPHS; this only sets the mode and does not cancel work;
-                           # work cancellation (i.e., not launching some of the device graphs) can only occur after an explicit internal
-                           # memory write is timely observed by a PUSCH graph.
-  pusch_sinr: 2
-  pusch_rssi: 1
-  pusch_tdi: 1
-  pusch_cfo: 1
-  pusch_dftsofdm: 0
-  pusch_to: 1
-  pusch_select_eqcoeffalgo: 3
-  pusch_select_chestalgo: 1
-  pusch_enable_perprgchest: 0
-  pusch_tbsizecheck: 1
-  pusch_deviceGraphLaunchEn: 1
-  pusch_waitTimeOutPreEarlyHarqUs: 3000
-  pusch_waitTimeOutPostEarlyHarqUs: 3000
-  puxch_polarDcdrListSz: 8
-  enable_cpu_task_tracing: 0
-  enable_prepare_tracing: 0
-  disable_empw: 0 #1=>Disables Multi packet WQE feature
-  cqe_tracer_config:
-    enable_dl_cqe_tracing: 0
-    cqe_trace_cell_mask: 1 #[64 bit mask: Bit0->Cell0, Bit1->Cell1...]
-    cqe_trace_slot_mask: 196800 #[20 bit mask: Bit0->Slot0, Bit1->Slot1...] 196800=>All *6,*7 DL Slots
-  ul_rx_pkt_tracing_level: 0
-  ul_rx_pkt_tracing_level_srs: 0
-  pmu_metrics: 0 #Enable and select PMU metrics, 0=disabled, 1=General Counters (platform agnostic), 2=Topdown Metrics (Grace only), 3=Cache Metrics (Grace only)
-  enable_h2d_copy_thread: 1
-  h2d_copy_thread_cpu_affinity : 11
-  h2d_copy_thread_sched_priority : 95 #0->SCHED_OTHER, >0->Actual
-  split_ul_cuda_streams: 0 # 1=Put UL slot 4 and slot 5 on different streams for DDDSUUDDDD pattern
-  serialize_pucch_pusch: 0 # 1=Force serialization of PUSCH/PUCCH
-                           # Note: for Early Harq (EH) order is PUSCH EH -> PUCCH -> PUSCH non EH
-                           #       for non-Early Harq order is PUCCH -> all PUSCH processing
-  aggr_obj_non_avail_th: 5 # Threshold for consecutive non-availability of Aggregated objects(UL/DL) or DL/UL buffers
-  dl_wait_th_ns:
-    - 500000  #H2D copy wait threshold
-    - 4000000 #cuPHY DL channel wait threshold
-  sendCPlane_timing_error_th_ns : 0
-  sendCPlane_ulbfw_backoff_th_ns: 300000    # ULBFW must be completed by cplane send time - this is the backoff time
-  sendCPlane_dlbfw_backoff_th_ns: 300000    # DLBFW must be completed by cplane send time - this is the backoff time
-  pusch_forcedNumCsi2Bits: 0
-  mMIMO_enable: 0
-  enable_srs: 1
-  ue_mode: 0
-  mCh_segment_proc_enable: 0
-  pusch_aggr_per_ctx: 3
-  prach_aggr_per_ctx: 2
-  pucch_aggr_per_ctx: 4
-  srs_aggr_per_ctx: 3
-  ul_input_buffer_per_cell: 10
-  ul_input_buffer_per_cell_srs: 6
-  max_harq_pools: 384
-  max_harq_tx_count_bundled: 10
-  max_harq_tx_count_non_bundled: 4
-  ok_testbench_config:
-    enable_ok_tb: 0
-    num_ok_tb_slot: 0 #Presently not used
-  max_ru_unhealthy_ul_slots: 100
-  srs_chest_algo_type: 0
-  srs_chest_tol2_normalization_algo_type: 1
-  srs_chest_tol2_constant_scaler: 32768.0
-  bfw_power_normalization_alg_selector: 1
-  total_num_srs_chest_buffers: 6144
-  send_static_bfw_wt_all_cplane: 1
-  ul_pcap_capture_enable: 0
-  ul_pcap_capture_thread_cpu_affinity: 10
-  ul_pcap_capture_thread_sched_priority: 95
-  pcap_logger_ul_cplane_enable: 0
-  pcap_logger_dl_cplane_enable: 0
-  pcap_logger_thread_cpu_affinity: 10
-  pcap_logger_thread_sched_prio: 95
-  pcap_logger_file_save_dir: ./
-  dlc_bfw_enable_divide_per_cell: 0 # Enable/disable dividing DL BFW C-Plane transmission window among multiple cells in a slot
-  ulc_bfw_enable_divide_per_cell: 0 # Enable/disable dividing UL BFW C-Plane transmission window among multiple cells in a slot
-  dlc_alloc_cplane_bfw_txq: 0 # Allocates a second separate queue for BFW DL C-Plane transmission
-  ulc_alloc_cplane_bfw_txq: 1 # Allocates a second separate queue for BFW UL C-Plane transmission
-  #static beam id range
-  static_beam_id_start: 1
-  static_beam_id_end: 16527
-  #dynamic beam id range
-  dynamic_beam_id_start: 16528 #Dynamic beam ID start should be after static beam ID end
-  dynamic_beam_id_end: 32767 #15bit max value
-  bfw_c_plane_chaining_mode: 0 # 0: Default memcpy of BFW weights, 1: CPU mbuf chaining of BFW weights, 2: GPU mbuf chaining
-  enable_l1_param_sanity_check: 0
-  pusch_nMaxLdpcHetConfigs: 32
-  notify_ul_harq_buffer_release: 0
-
-  # data_config:
-    # datalake_core: 12           # This must be set for Data Lake and/or E3 Agent to be used
-    # datalake_db_write_enable: 1   # Enable/disable ClickHouse writes based on datalake_data_types
-    # datalake_samples: 1000000
-    # datalake_address: localhost
-    # datalake_engine: "MergeTree() PRIMARY KEY (TsTaiNs)"
-    # # datalake_drop_tables: 0   # Set to 1 to drop Clickhouse tables at startup
-    # datalake_data_types: [fh, pusch, hest]  # Data types to write to ClickHouse DB (all types always collected in memory for E3 Agent):
-                                            # fh = Fronthaul IQ samples,pusch = PUSCH/FAPI data, hest = channel estimates
-    # datalake_store_failed_pdu: 0      # Set to 1 to store PDU data even when CRC fails
-    # e3_agent_enable: 0          # Enable/disable E3 Agent and dApp capabilities
-    # num_rows_fh: 120
-    # num_rows_pusch: 200
-    # num_rows_hest: 140
-    # e3_pub_port: 5555           # E3 publisher port for indication messages
-    # e3_rep_port: 5556           # E3 reply port for E3AP requests
-    # e3_sub_port: 5560           # E3 subscriber port for Manager messages
-
-  cells:
-    - name: O-RU 0
-      cell_id: 1
-      ru_type: 1
-      # set to 00:00:00:00:00:00 to use the MAC address of the NIC port to use
-      src_mac_addr: 00:00:00:00:00:00
-      dst_mac_addr: e8:c7:cf:ad:12:0b #WNC n78
-      nic: '0000:01:00.0'
-      vlan: 500
-      pcp: 7
-      txq_count_uplane: 1
-      eAxC_id_ssb_pbch: [0, 1, 2, 3]
-      eAxC_id_pdcch: [0, 1, 2, 3]
-      eAxC_id_pdsch: [0, 1, 2, 3]
-      eAxC_id_csirs: [0, 1, 2, 3]
-      eAxC_id_pusch: [0, 1, 2, 3]
-      eAxC_id_pucch: [0, 1, 2, 3]
-      eAxC_id_srs: [8, 9, 10, 11]
-      eAxC_id_prach: [4, 5, 6, 7]
-      dl_iq_data_fmt: {comp_meth: 1, bit_width: 9}
-      ul_iq_data_fmt: {comp_meth: 1, bit_width: 9}
-      section_3_time_offset: 484
-      fs_offset_dl: 7
-      exponent_dl: 4
-      ref_dl: 0
-      fs_offset_ul: -5
-      exponent_ul: 4
-      max_amp_ul: 65504
-      mu: 1
-      T1a_max_up_ns: 280000
-      T1a_max_cp_ul_ns: 405000
-      Ta4_min_ns: 50000
-      Ta4_max_ns: 331000
-      Tcp_adv_dl_ns: 125000
-      ul_u_plane_tx_offset_ns: 280000
-      fh_len_range: 0
-      pusch_prb_stride: 273
-      prach_prb_stride: 12
-      srs_prb_stride: 273
-      pusch_ldpc_max_num_itr_algo_type: 1
-      pusch_fixed_max_num_ldpc_itrs: 10
-      pusch_ldpc_early_termination: 0
-      pusch_ldpc_algo_index: 0
-      pusch_ldpc_flags: 2
-      pusch_ldpc_use_half: 1
-      pusch_nMaxPrb: 273
-      pusch_nMaxRx: 4
-      ul_gain_calibration: 78.68
-      lower_guard_bw: 845
-      tv_pusch: cuPhyChEstCoeffs.h5

ci-scripts/yaml_files/sa_gnb_aerial/docker-compose.yaml

@@ -18,13 +18,12 @@ services:
       - /lib/modules:/lib/modules
       - /dev/hugepages:/dev/hugepages
       - /usr/src:/usr/src
-      - ./cuphycontroller_P5G_WNC_GH.yaml:/opt/nvidia/cuBB/cuPHY-CP/cuphycontroller/config/cuphycontroller_P5G_WNC_GH.yaml
       - ./aerial_l1_entrypoint.sh:/opt/nvidia/cuBB/aerial_l1_entrypoint.sh
       - /var/log/aerial:/var/log/aerial
       - ../../../cmake_targets/share:/opt/cuBB/share
     userns_mode: host
     ipc: "shareable"
-    image: cubb-build:25-3
+    image: cubb-build:25-2.1
     environment:
       - cuBB_SDK=/opt/nvidia/cuBB
     command: bash -c "sudo rm -rf /tmp/phy.log && sudo chmod +x /opt/nvidia/cuBB/aerial_l1_entrypoint.sh && /opt/nvidia/cuBB/aerial_l1_entrypoint.sh"
@@ -46,7 +45,7 @@ services:
       - IPC_LOCK
     ipc: "container:nv-cubb"
     environment:
-      USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,utc_time
+      USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time
     deploy:
       resources:
         reservations:

ci-scripts/yaml_files/sa_gnb_aerial_ul/aerial_l1_entrypoint.sh

@@ -4,6 +4,8 @@
 cuBB_Path="${cuBB_SDK:-/opt/nvidia/cuBB}"
 
 cd "$cuBB_Path" || exit 1
+# Add gdrcopy to LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=/usr/local/nvidia/lib:/usr/local/nvidia/lib64:/opt/mellanox/dpdk/lib/x86_64-linux-gnu:/opt/mellanox/doca/lib/x86_64-linux-gnu:/opt/nvidia/cuBB/cuPHY-CP/external/gdrcopy/build/x86_64/
 
 # Restart MPS
 # Export variables
@@ -12,7 +14,7 @@ export CUDA_MPS_PIPE_DIRECTORY=/var
 export CUDA_MPS_LOG_DIRECTORY=/var
 
 # Stop existing MPS
-echo quit | sudo -E nvidia-cuda-mps-control
+sudo -E echo quit | sudo -E nvidia-cuda-mps-control
 
 # Start MPS
 sudo -E nvidia-cuda-mps-control -d
@@ -22,11 +24,11 @@ sudo -E echo start_server -uid 0 | sudo -E nvidia-cuda-mps-control
 # Check if an argument is provided
 if [ $# -eq 0 ]; then
     # No argument provided, use default value
-    argument="P5G_WNC_GH"
+    argument="P5G_FXN_GH"
 else
     # Argument provided, use it
     argument="$1"
 fi
 
-sudo -E "$cuBB_Path"/build.$(uname -m)/cuPHY-CP/cuphycontroller/examples/cuphycontroller_scf "$argument"
-sudo -E ./build.$(uname -m)/cuPHY-CP/gt_common_libs/nvIPC/tests/pcap/pcap_collect
+sudo -E "$cuBB_Path"/build/cuPHY-CP/cuphycontroller/examples/cuphycontroller_scf "$argument"
+sudo -E ./build/cuPHY-CP/gt_common_libs/nvIPC/tests/pcap/pcap_collect

ci-scripts/yaml_files/sa_gnb_aerial_ul/cuphycontroller_P5G_WNC_GH_ul.yaml

@@ -1,243 +0,0 @@
-# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-aerial_sdk_version: 25-3-cubb
-l2adapter_filename: l2_adapter_config_P5G_GH.yaml
-aerial_metrics_backend_address: 127.0.0.1:8081
-
-# CPU core shared by all low-priority threads
-low_priority_core: 10
-enable_ptp_svc_monitoring: 0
-ptp_rms_threshold: 20 #ns
-nic_tput_alert_threshold_mbps: 85000
-
-cuphydriver_config:
-  standalone: 0
-  validation: 0
-  num_slots: 8
-  log_level: DBG
-  profiler_sec: 0
-  dpdk_thread: 10
-  dpdk_verbose_logs: 0
-  accu_tx_sched_res_ns: 500
-  accu_tx_sched_disable: 0 #Flag applicable only for CX6-DX : BF3/CX7 HW and beyond support accurate send scheduling directly on timestamp, for CX6-DX this is implemented via software emulation
-  fh_stats_dump_cpu_core: -1
-  pdump_client_thread: -1
-  use_green_contexts: 0
-  use_batched_memcpy: 0 # Experimental feature; requires >= CUDA 12.8
-  mps_sm_pusch: 100
-  mps_sm_pucch: 2
-  mps_sm_prach: 2
-  mps_sm_ul_order: 20
-  mps_sm_pdsch: 102
-  mps_sm_pdcch: 10
-  mps_sm_pbch: 2
-  mps_sm_gpu_comms: 16
-  mps_sm_srs: 16
-  pdsch_fallback: 0
-  dpdk_file_prefix: cuphycontroller
-  nics:
-    - nic: '0000:01:00.0'
-      mtu: 9216
-      cpu_mbufs: 196608
-      uplane_tx_handles: 64
-      txq_size: 8192
-      rxq_size: 16384
-      gpu: 0
-  cus_port_failover: 0
-  gpus:
-    - 0
-    # Set GPUID to the GPU sharing the PCIe switch as NIC
-    # run nvidia-smi topo -m to find out which GPU
-  workers_ul: [4,5]
-  workers_dl: [6,7,8]
-  debug_worker: -1
-  workers_sched_priority: 95
-  prometheus_thread: -1
-  start_section_id_srs: 3072
-  start_section_id_prach: 2048
-  enable_ul_cuphy_graphs: 1
-  enable_dl_cuphy_graphs: 1
-  ul_order_kernel_mode: 0 # 0: Ping-Pong, 1: dual CTA
-  ul_order_timeout_cpu_ns: 8000000
-  ul_order_timeout_log_interval_ns: 1000000000
-  ul_order_timeout_gpu_ns: 3000000
-  ul_order_timeout_gpu_srs_ns: 5200000
-  ul_srs_aggr3_task_launch_offset_ns: 500000
-  ul_order_timeout_gpu_log_enable: 0
-  ul_order_max_rx_pkts: 512
-  ul_order_rx_pkts_timeout_ns: 100000
-  cplane_disable: 0
-  gpu_init_comms_dl: 1
-  cell_group: 1
-  cell_group_num: 1
-  fix_beta_dl: 0
-  bfw_beta_prescaler: 16384
-  pusch_workCancelMode: 2  # set cuphyPuschStatPrms_t workCancelMode field to PUSCH_DEVICE_GRAPHS; this only sets the mode and does not cancel work;
-                           # work cancellation (i.e., not launching some of the device graphs) can only occur after an explicit internal
-                           # memory write is timely observed by a PUSCH graph.
-  pusch_sinr: 2
-  pusch_rssi: 1
-  pusch_tdi: 1
-  pusch_cfo: 1
-  pusch_dftsofdm: 0
-  pusch_to: 1
-  pusch_select_eqcoeffalgo: 3
-  pusch_select_chestalgo: 1
-  pusch_enable_perprgchest: 0
-  pusch_tbsizecheck: 1
-  pusch_deviceGraphLaunchEn: 1
-  pusch_waitTimeOutPreEarlyHarqUs: 3000
-  pusch_waitTimeOutPostEarlyHarqUs: 3000
-  puxch_polarDcdrListSz: 8
-  enable_cpu_task_tracing: 0
-  enable_prepare_tracing: 0
-  disable_empw: 0 #1=>Disables Multi packet WQE feature
-  cqe_tracer_config:
-    enable_dl_cqe_tracing: 0
-    cqe_trace_cell_mask: 1 #[64 bit mask: Bit0->Cell0, Bit1->Cell1...]
-    cqe_trace_slot_mask: 196800 #[20 bit mask: Bit0->Slot0, Bit1->Slot1...] 196800=>All *6,*7 DL Slots
-  ul_rx_pkt_tracing_level: 0
-  ul_rx_pkt_tracing_level_srs: 0
-  pmu_metrics: 0 #Enable and select PMU metrics, 0=disabled, 1=General Counters (platform agnostic), 2=Topdown Metrics (Grace only), 3=Cache Metrics (Grace only)
-  enable_h2d_copy_thread: 1
-  h2d_copy_thread_cpu_affinity : 11
-  h2d_copy_thread_sched_priority : 95 #0->SCHED_OTHER, >0->Actual
-  split_ul_cuda_streams: 0 # 1=Put UL slot 4 and slot 5 on different streams for DDDSUUDDDD pattern
-  serialize_pucch_pusch: 0 # 1=Force serialization of PUSCH/PUCCH
-                           # Note: for Early Harq (EH) order is PUSCH EH -> PUCCH -> PUSCH non EH
-                           #       for non-Early Harq order is PUCCH -> all PUSCH processing
-  aggr_obj_non_avail_th: 5 # Threshold for consecutive non-availability of Aggregated objects(UL/DL) or DL/UL buffers
-  dl_wait_th_ns:
-    - 500000  #H2D copy wait threshold
-    - 4000000 #cuPHY DL channel wait threshold
-  sendCPlane_timing_error_th_ns : 0
-  sendCPlane_ulbfw_backoff_th_ns: 300000    # ULBFW must be completed by cplane send time - this is the backoff time
-  sendCPlane_dlbfw_backoff_th_ns: 300000    # DLBFW must be completed by cplane send time - this is the backoff time
-  pusch_forcedNumCsi2Bits: 0
-  mMIMO_enable: 0
-  enable_srs: 1
-  ue_mode: 0
-  mCh_segment_proc_enable: 0
-  pusch_aggr_per_ctx: 9 #3
-  prach_aggr_per_ctx: 2
-  pucch_aggr_per_ctx: 4
-  srs_aggr_per_ctx: 3
-  ul_input_buffer_per_cell: 10
-  ul_input_buffer_per_cell_srs: 6
-  max_harq_pools: 384
-  max_harq_tx_count_bundled: 10
-  max_harq_tx_count_non_bundled: 4
-  ok_testbench_config:
-    enable_ok_tb: 0
-    num_ok_tb_slot: 0 #Presently not used
-  max_ru_unhealthy_ul_slots: 100
-  srs_chest_algo_type: 0
-  srs_chest_tol2_normalization_algo_type: 1
-  srs_chest_tol2_constant_scaler: 32768.0
-  bfw_power_normalization_alg_selector: 1
-  total_num_srs_chest_buffers: 6144
-  send_static_bfw_wt_all_cplane: 1
-  ul_pcap_capture_enable: 0
-  ul_pcap_capture_thread_cpu_affinity: 10
-  ul_pcap_capture_thread_sched_priority: 95
-  pcap_logger_ul_cplane_enable: 0
-  pcap_logger_dl_cplane_enable: 0
-  pcap_logger_thread_cpu_affinity: 10
-  pcap_logger_thread_sched_prio: 95
-  pcap_logger_file_save_dir: ./
-  dlc_bfw_enable_divide_per_cell: 0 # Enable/disable dividing DL BFW C-Plane transmission window among multiple cells in a slot
-  ulc_bfw_enable_divide_per_cell: 0 # Enable/disable dividing UL BFW C-Plane transmission window among multiple cells in a slot
-  dlc_alloc_cplane_bfw_txq: 0 # Allocates a second separate queue for BFW DL C-Plane transmission
-  ulc_alloc_cplane_bfw_txq: 1 # Allocates a second separate queue for BFW UL C-Plane transmission
-  #static beam id range
-  static_beam_id_start: 1
-  static_beam_id_end: 16527
-  #dynamic beam id range
-  dynamic_beam_id_start: 16528 #Dynamic beam ID start should be after static beam ID end
-  dynamic_beam_id_end: 32767 #15bit max value
-  bfw_c_plane_chaining_mode: 0 # 0: Default memcpy of BFW weights, 1: CPU mbuf chaining of BFW weights, 2: GPU mbuf chaining
-  enable_l1_param_sanity_check: 0
-  pusch_nMaxLdpcHetConfigs: 32
-  notify_ul_harq_buffer_release: 0
-
-  # data_config:
-    # datalake_core: 12           # This must be set for Data Lake and/or E3 Agent to be used
-    # datalake_db_write_enable: 1   # Enable/disable ClickHouse writes based on datalake_data_types
-    # datalake_samples: 1000000
-    # datalake_address: localhost
-    # datalake_engine: "MergeTree() PRIMARY KEY (TsTaiNs)"
-    # # datalake_drop_tables: 0   # Set to 1 to drop Clickhouse tables at startup
-    # datalake_data_types: [fh, pusch, hest]  # Data types to write to ClickHouse DB (all types always collected in memory for E3 Agent):
-                                            # fh = Fronthaul IQ samples,pusch = PUSCH/FAPI data, hest = channel estimates
-    # datalake_store_failed_pdu: 0      # Set to 1 to store PDU data even when CRC fails
-    # e3_agent_enable: 0          # Enable/disable E3 Agent and dApp capabilities
-    # num_rows_fh: 120
-    # num_rows_pusch: 200
-    # num_rows_hest: 140
-    # e3_pub_port: 5555           # E3 publisher port for indication messages
-    # e3_rep_port: 5556           # E3 reply port for E3AP requests
-    # e3_sub_port: 5560           # E3 subscriber port for Manager messages
-
-  cells:
-    - name: O-RU 0
-      cell_id: 1
-      ru_type: 1
-      # set to 00:00:00:00:00:00 to use the MAC address of the NIC port to use
-      src_mac_addr: 00:00:00:00:00:00
-      dst_mac_addr: e8:c7:cf:ad:12:0b #WNC n78
-      nic: '0000:01:00.0'
-      vlan: 500
-      pcp: 7
-      txq_count_uplane: 1
-      eAxC_id_ssb_pbch: [0, 1, 2, 3]
-      eAxC_id_pdcch: [0, 1, 2, 3]
-      eAxC_id_pdsch: [0, 1, 2, 3]
-      eAxC_id_csirs: [0, 1, 2, 3]
-      eAxC_id_pusch: [0, 1, 2, 3]
-      eAxC_id_pucch: [0, 1, 2, 3]
-      eAxC_id_srs: [8, 9, 10, 11]
-      eAxC_id_prach: [4, 5, 6, 7]
-      dl_iq_data_fmt: {comp_meth: 1, bit_width: 9}
-      ul_iq_data_fmt: {comp_meth: 1, bit_width: 9}
-      section_3_time_offset: 484
-      fs_offset_dl: 7
-      exponent_dl: 4
-      ref_dl: 0
-      fs_offset_ul: -5
-      exponent_ul: 4
-      max_amp_ul: 65504
-      mu: 1
-      T1a_max_up_ns: 280000
-      T1a_max_cp_ul_ns: 405000
-      Ta4_min_ns: 50000
-      Ta4_max_ns: 331000
-      Tcp_adv_dl_ns: 125000
-      ul_u_plane_tx_offset_ns: 280000
-      fh_len_range: 0
-      pusch_prb_stride: 273
-      prach_prb_stride: 12
-      srs_prb_stride: 273
-      pusch_ldpc_max_num_itr_algo_type: 1
-      pusch_fixed_max_num_ldpc_itrs: 10
-      pusch_ldpc_early_termination: 0
-      pusch_ldpc_algo_index: 0
-      pusch_ldpc_flags: 2
-      pusch_ldpc_use_half: 1
-      pusch_nMaxPrb: 273
-      pusch_nMaxRx: 4
-      ul_gain_calibration: 78.68
-      lower_guard_bw: 845
-      tv_pusch: cuPhyChEstCoeffs.h5

ci-scripts/yaml_files/sa_gnb_aerial_ul/docker-compose.yaml

@@ -18,13 +18,12 @@ services:
       - /lib/modules:/lib/modules
       - /dev/hugepages:/dev/hugepages
       - /usr/src:/usr/src
-      - ./cuphycontroller_P5G_WNC_GH_ul.yaml:/opt/nvidia/cuBB/cuPHY-CP/cuphycontroller/config/cuphycontroller_P5G_WNC_GH.yaml
       - ./aerial_l1_entrypoint.sh:/opt/nvidia/cuBB/aerial_l1_entrypoint.sh
       - /var/log/aerial:/var/log/aerial
       - ../../../cmake_targets/share:/opt/cuBB/share
     userns_mode: host
     ipc: "shareable"
-    image: cubb-build:25-3
+    image: cubb-build:25-2.1_srs-ul-heavy
     environment:
       - cuBB_SDK=/opt/nvidia/cuBB
     command: bash -c "sudo rm -rf /tmp/phy.log && sudo chmod +x /opt/nvidia/cuBB/aerial_l1_entrypoint.sh && /opt/nvidia/cuBB/aerial_l1_entrypoint.sh"
@@ -46,7 +45,7 @@ services:
       - IPC_LOCK
     ipc: "container:nv-cubb"
     environment:
-      USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,utc_time
+      USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time
     deploy:
       resources:
         reservations:

cmake_targets/build_oai

@@ -36,8 +36,9 @@ set_openair_env
 # Variables for UE data generation
 conf_nvram_path=$OPENAIR_DIR/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
 
-HWs=""
+HW=""
 BUILD_DIR=ran_build
+DISABLE_HARDWARE_DEPENDENCY="False"
 CMAKE_BUILD_TYPE="RelWithDebInfo"
 CMAKE_CMD="$CMAKE"
 OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope ldpc_cuda ldpc_aal ldpc_xdma websrv oai_iqplayer imscope imscope_record"
@@ -81,8 +82,6 @@ Options:
   Makes the NR softmodem
 --RU
   Makes the OAI RRU
---nrRU
-  Makes the NR RRU
 --UE
    Makes the UE specific parts (usim, nvram) from the given configuration file
 --nrUE
@@ -228,11 +227,6 @@ function main() {
             TARGET_LIST="$TARGET_LIST oairu"
             echo_info "Will compile RRU"
             shift;;
-       --nrRU)
-            NRRU=1
-            TARGET_LIST="$TARGET_LIST nr-oru"
-            echo_info "Will compile NR O-RU"
-            shift;;
        --UE)
             UE=1
             TARGET_LIST="$TARGET_LIST lte-uesoftmodem conf2uedata usim nvram"
@@ -253,22 +247,22 @@ function main() {
        -w | --hardware)
             case "$2" in
                 "USRP" | "BLADERF" | "LMSSDR" | "IRIS")
-                    HWs+=" OAI_"$2
+                    HW="OAI_"$2
                     TARGET_LIST="$TARGET_LIST oai_${2,,}devif" # ,, makes lowercase
                     CMAKE_CMD="$CMAKE_CMD -DOAI_$2=ON"
                     ;;
                 "SIMU")
-                    HWs+=" OAI_"$2
+                    HW="OAI_"$2
                     TARGET_LIST="$TARGET_LIST rfsimulator"
                     CMAKE_CMD="$CMAKE_CMD -DOAI_$2=ON"
                     ;;
                 "AW2SORI")
-                    HWs=" OAI_"$2
+                    HW="OAI_"$2
                     TARGET_LIST="$TARGET_LIST aw2sori_transpro"
                     CMAKE_CMD="$CMAKE_CMD -DOAI_$2=ON"
                     ;;
                 "AERIAL"|"Aerial"|"aerial")
-                    HWs+=" OAI_AERIAL"
+                    HW="OAI_AERIAL"
                     CMAKE_CMD="$CMAKE_CMD -DOAI_AERIAL=ON"
                     ;;
                 "None")
@@ -327,6 +321,10 @@ function main() {
             CMAKE_CMD="$CMAKE_CMD -DT_TRACER=False"
             echo_info "Disabling the T tracer"
             shift 1;;
+       --disable-hardware-dependency)
+            echo_info "Disabling hardware dependency for compiling software"
+            DISABLE_HARDWARE_DEPENDENCY="True"
+            shift 1;;
        --ue-trace)
             CMAKE_CMD="$CMAKE_CMD -DUE_DEBUG_TRACE=False"
             echo_info "Enabling UE trace for debug"
@@ -419,23 +417,27 @@ function main() {
       echo_info "installing LTTng"
       install_lttng $1
     fi
-    for HW in $HWs; do
-      if [ "$HW" == "OAI_USRP" ] ; then
-        echo_info "installing packages for USRP support"
-        check_install_usrp_uhd_driver
-        if [ ! -v BUILD_UHD_FROM_SOURCE ]; then
-          install_usrp_uhd_driver $UHD_IMAGES_DIR
-        fi
-      elif [ "$HW" == "OAI_BLADERF" ] ; then
-        echo_info "installing packages for BLADERF support"
-        check_install_bladerf_driver
-      elif [ "$HW" == "OAI_IRIS" ] ; then
-        echo_info "installing packages for IRIS support"
-        check_install_soapy
-      else
-        echo_warning "no installation scripts for hardware $HW"
+    if [ "$HW" == "OAI_USRP" ] ; then
+      echo_info "installing packages for USRP support"
+      check_install_usrp_uhd_driver
+      if [ ! -v BUILD_UHD_FROM_SOURCE ] && [ ! "$DISABLE_HARDWARE_DEPENDENCY" == "True" ]; then
+        install_usrp_uhd_driver $UHD_IMAGES_DIR
       fi
-    done
+    fi
+    if [ "$HW" == "OAI_BLADERF" ] ; then
+      echo_info "installing packages for BLADERF support"
+      check_install_bladerf_driver
+      if [ ! "$DISABLE_HARDWARE_DEPENDENCY" == "True" ]; then
+        flash_firmware_bladerf
+      fi
+    fi
+    if [ "$HW" == "OAI_IRIS" ] ; then
+      echo_info "installing packages for IRIS support"
+      check_install_soapy
+      #if [ ! "$DISABLE_HARDWARE_DEPENDENCY" == "True" ]; then
+      #  flash_firmware_iris
+      #fi
+    fi
   fi
 
   if [ "$INSTALL_OPTIONAL" = "1" ] ; then
@@ -450,7 +452,7 @@ function main() {
   if [[ $TARGET_LIST != "" ]] && [[ -f $OPENAIR_DIR/CMakeLists.txt ]]; then
     # add some default libraries that should always be built
     # for eNB, gNB, UEs, simulators
-    if [[ $gNB == 1 || $eNB == 1 || $UE == 1 || $nrUE == 1 || $SIMUS_PHY == 1 || $RU == 1 || $NRRU == 1 ]]; then
+    if [[ $gNB == 1 || $eNB == 1 || $UE == 1 || $nrUE == 1 || $SIMUS_PHY == 1 || $RU == 1 ]]; then
       TARGET_LIST="$TARGET_LIST params_libconfig coding rfsimulator dfts params_yaml vrtsim rf_emulator"
     fi
 

cmake_targets/tools/build_helper

@@ -107,7 +107,6 @@ check_supported_distribution() {
         "ubuntu22.04") return 0 ;;
         "ubuntu20.04") return 0 ;;
         "debian11")    return 0 ;;
-        "debian12")    return 0 ;;
         "fedora41")    return 0 ;;
         "fedora40")    return 0 ;;
         "rhel8.2")     return 0 ;;
@@ -279,7 +278,7 @@ check_install_usrp_uhd_driver(){
             x=$((x + 1))
         done
         $SUDO apt-get update
-        $SUDO apt-get -y install python3-tk  $boost_libs_ubuntu libusb-1.0-0-dev
+        $SUDO apt-get -y install python-tk  $boost_libs_ubuntu libusb-1.0-0-dev
         case "$(get_distribution_release)" in
           "ubuntu20.04" | "ubuntu22.04")
             $SUDO apt-get -y install libuhd-dev libuhd4.5.0 uhd-host
@@ -289,7 +288,7 @@ check_install_usrp_uhd_driver(){
         boost_libs_fedora="boost-chrono boost-date-time boost-filesystem boost-program-options boost-thread boost-test boost-regex boost-devel"
         if [ $IS_CONTAINER -eq 0 ]
         then
-            $SUDO $INSTALLER -y install python3 $boost_libs_fedora libusb1-devel libusbx-devel  python3-mako python3-docutils python3-pip $CMAKE
+            $SUDO $INSTALLER -y install python3 $boost_libs_fedora libusb-devel libusbx-devel  python3-mako python3-docutils python3-pip $CMAKE
             $SUDO pip3 install requests
         else
             $SUDO $INSTALLER -y install $boost_libs_fedora $CMAKE
@@ -346,10 +345,19 @@ install_bladerf_driver_from_source(){
     make
     $SUDO make install
     $SUDO ldconfig
+    echo "Downloading FPGA and firmware images"
+    cd /tmp/bladeRF
+    #wget has been removed from default dependencies, so we must be sure that's installed
+    $SUDO $INSTALLER -y install wget
+    wget --tries=3 --retry-connrefused https://www.nuand.com/fx3/bladeRF_fw_latest.img
+    wget --tries=3 --retry-connrefused https://www.nuand.com/fpga/hostedx40-latest.rbf
+    sudo mkdir -p /usr/share/Nuand/bladeRF
+    sudo mv bladeRF_fw_latest.img /usr/share/Nuand/bladeRF/bladeRF_fw.img
+    sudo mv hostedx40-latest.rbf /usr/share/Nuand/bladeRF/hostedx40.rbf
 }
 
 check_install_bladerf_driver(){
-    if [[ "$OS_BASEDISTRO" == "debian" ]]; then
+    if [[ "$OS_DISTRO" == "ubuntu" ]]; then
         $SUDO apt-get install -y  bladerf libbladerf-dev
         $SUDO apt-get install -y bladerf-firmware-fx3
         $SUDO apt-get install -y bladerf-fpga-hostedx40
@@ -360,6 +368,10 @@ check_install_bladerf_driver(){
    fi
 }
 
+flash_firmware_bladerf() {
+	$SUDO bladeRF-cli --flash-firmware /usr/share/Nuand/bladeRF/bladeRF_fw.img
+}
+
 check_install_lmssdr_driver(){
 	if ( [ -d "/usr/local/include/lime" ] &&
              [ -f "/usr/local/include/lime/LimeSuite.h" ] )
@@ -441,7 +453,7 @@ check_install_additional_tools (){
   local optional_packages=""
   if [[ "$OS_BASEDISTRO" == "debian" ]]; then
     case "$(get_distribution_release)" in
-        "ubuntu20.04" | "ubuntu22.04" | "debian11" | "debian12" )
+        "ubuntu20.04" | "ubuntu22.04" | "debian11" )
             optional_packages="python3 python3-pip python3-dev python3-scipy python3-matplotlib python3-pyroute2 universal-ctags"
             ;;
     esac
@@ -484,7 +496,7 @@ check_install_oai_software() {
   if [[ "$OS_BASEDISTRO" == "debian" ]]; then
     $SUDO apt install -y software-properties-common
     case "$(get_distribution_release)" in
-         "debian11" | "debian12" )
+         "debian11")
             specific_packages="libz-dev"
             ;;
     esac
@@ -496,6 +508,9 @@ check_install_oai_software() {
         ninja-build \
 	pkg-config \
 	git \
+	libblas-dev \
+	liblapack-dev \
+	liblapacke-dev \
 	libreadline-dev \
 	libconfig-dev \
 	libsctp-dev  \
@@ -533,6 +548,10 @@ check_install_oai_software() {
       openssl-devel \
       patch \
       readline-devel \
+      lapack \
+      lapack-devel \
+      blas \
+      blas-devel \
       vim-common \
       zlib-devel \
       yaml-cpp-devel