Modified nr_radio_config.c to always include SLIV(0,12) UL TDA when E3_AGENT is enabled

* updated ran functiond for dapp to remove action def and renamed formats

* updated e3_agent code and ran_func_dapp to expose dapp ids and e3 ran func to which each dapp is subscribed

* implemented triggering of RIC service update at every status change of dApp

* modified ran function dapp to handle action definition to specify the kind of report to send in return

* removed report style 1 that was used to geth both types of indications

* updated ran func dapp to populate the new ran func struct following the new structure definition

* fixed missing branchets in if, restored some comments and exception messages, and added macros for report styles

* clang-formatted files in ran func def

.gitignore

@@ -7,6 +7,7 @@ cmake_targets/*/build/
 cmake_targets/ran_build/
 log/
 lte_build_oai/
+build*
 
 # IDE files
 .vscode
@@ -33,3 +34,5 @@ nfapi_nr_interface_scf
 *.log
 *.out
 CMakeUserPresets.json
+
+build/*

CMakeLists.txt

@@ -83,25 +83,40 @@ option(PACKAGING_COMMON "Will produce a package containing common target, config
 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)
 find_program(ASN1C_EXEC_PATH asn1c HINTS /opt/asn1c/bin)
 set(ASN1C_EXEC ${ASN1C_EXEC_PATH} CACHE FILEPATH "path to asn1c executable")
-if(NOT ASN1C_EXEC)
-    message(FATAL_ERROR "No asn1c found!
-You might want to re-run ./build_oai -I
-Or provide a path to asn1c using
-./build_oai ... --cmake-opt -DASN1C_EXEC=/path/to/asn1c
-")
+option(AUTO_DOWNLOAD_ASN1C "Automatically download asn1c if not found" OFF)
+if (ASN1C_EXEC)
+  check_option(${ASN1C_EXEC} -gen-APER ASN1C_EXEC)
+  check_option(${ASN1C_EXEC} -no-gen-UPER ASN1C_EXEC)
+  check_option(${ASN1C_EXEC} -no-gen-JER ASN1C_EXEC)
+  check_option(${ASN1C_EXEC} -no-gen-BER ASN1C_EXEC)
+  check_option(${ASN1C_EXEC} -no-gen-OER ASN1C_EXEC)
+  add_custom_target(asn1c DEPENDS ${ASN1C_EXEC})
+else ()
+  if (NOT AUTO_DOWNLOAD_ASN1C)
+    message(FATAL_ERROR "asn1c not found. Install it globally or activate AUTO_DOWNLOAD_ASN1C")
+  endif()
+  message(STATUS "Downloading and compile asn1c local in this build tree")
+  include(ExternalProject)
+  ExternalProject_Add(
+    asn1c_gen
+    GIT_REPOSITORY https://github.com/mouse07410/asn1c
+    GIT_TAG 940dd5fa9f3917913fd487b13dfddfacd0ded06e
+    GIT_REMOTE_UPDATE_STRATEGY CHECKOUT
+    BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/bin/asn1c
+    BUILD_IN_SOURCE True
+    CONFIGURE_COMMAND autoreconf -i
+    BUILD_COMMAND ./configure --prefix ${CMAKE_BINARY_DIR}
+    COMMAND make -j8 CFLAGS=-fno-strict-aliasing -Wmisleading-indentation
+    STEP_TARGETS build
+  )
+  set(ASN1C_EXEC ${CMAKE_BINARY_DIR}/bin/asn1c)
+  add_custom_target(asn1c DEPENDS asn1c_gen)
 endif()
-check_option(${ASN1C_EXEC} -gen-APER ASN1C_EXEC)
-check_option(${ASN1C_EXEC} -no-gen-UPER ASN1C_EXEC)
-check_option(${ASN1C_EXEC} -no-gen-JER ASN1C_EXEC)
-check_option(${ASN1C_EXEC} -no-gen-BER ASN1C_EXEC)
-check_option(${ASN1C_EXEC} -no-gen-OER ASN1C_EXEC)
-
 #########################################################
 # Base directories, compatible with legacy OAI building #
 #########################################################
@@ -362,6 +377,12 @@ endif()
 add_boolean_option(ENABLE_IMSCOPE OFF "Enable phy scope based on imgui" OFF)
 add_boolean_option(ENABLE_IMSCOPE_RECORD OFF "Enable recording IQ data for imscope" OFF)
 
+#########################
+##### E3 AGENT
+#########################
+set(E3_AGENT "OFF" CACHE STRING "O-RAN nGRG E3 Agent for dApps")
+set_property(CACHE E3_AGENT PROPERTY STRINGS "ON" "OFF")
+
 ##################################################
 # ASN.1 grammar C code generation & dependencies #
 ##################################################
@@ -420,7 +441,6 @@ add_library(ngap
   ${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
   ${NGAP_DIR}/ngap_gNB_ue_context.c
   ${NGAP_DIR}/ngap_gNB_NRPPa_transport_procedures.c
   )
@@ -709,14 +729,18 @@ target_link_libraries(SCHED_LIB PRIVATE asn1_lte_rrc_hdrs)
 set(SCHED_NR_SRC
   ${OPENAIR1_DIR}/SCHED_NR/phy_procedures_nr_gNB.c
   ${OPENAIR1_DIR}/SCHED_NR/nr_prach_procedures.c
+  ${OPENAIR1_DIR}/SCHED_NR/nr_ru_procedures.c
   ${OPENAIR1_DIR}/SCHED_NR/phy_frame_config_nr.c
 )
 add_library(SCHED_NR_LIB ${SCHED_NR_SRC})
 target_link_libraries(SCHED_NR_LIB PRIVATE asn1_nr_rrc_hdrs UTIL)
+target_link_libraries(SCHED_NR_LIB PRIVATE NFAPI_LIB) # some FAPI messages pack "subPDUs"
+if(E3_AGENT)
+  target_compile_definitions(SCHED_NR_LIB PRIVATE E3_AGENT)
+endif()
 
 set(SCHED_SRC_RU
   ${OPENAIR1_DIR}/SCHED/ru_procedures.c
-  ${OPENAIR1_DIR}/SCHED_NR/nr_ru_procedures.c
   ${OPENAIR1_DIR}/SCHED/prach_procedures.c
 )
 add_library(SCHED_RU_LIB ${SCHED_SRC_RU})
@@ -752,6 +776,7 @@ set(NFAPI_SRC
 add_library(NFAPI_LIB ${NFAPI_SRC})
 target_link_libraries(NFAPI_LIB PUBLIC nfapi_common)
 target_link_libraries(NFAPI_LIB PUBLIC nr_fapi_p5 nr_fapi_p7)
+target_link_libraries(NFAPI_LIB PRIVATE z)
 
 if(OAI_WLS)
   target_compile_definitions(NFAPI_LIB PRIVATE ENABLE_WLS)
@@ -866,7 +891,6 @@ set(PHY_SRC_COMMON
   ${OPENAIR1_DIR}/PHY/TOOLS/sqrt.c
   ${OPENAIR1_DIR}/PHY/TOOLS/get_sin_cos.c
   ${OPENAIR1_DIR}/PHY/TOOLS/oai_arith_operations.c
-  ${OPENAIR1_DIR}/PHY/log_tools.c
   )
 
 set(PHY_SRC
@@ -877,6 +901,10 @@ set(PHY_SRC
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pilots_mbsfn.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_coding.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_modulation.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_demodulation.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/freq_equalization.c  
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_adjust_sync_eNB.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pbch.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci.c
@@ -893,22 +921,22 @@ set(PHY_SRC
   )
 
 set(PHY_SRC_RU
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/if4_tools.c
+  ${OPENAIR1_DIR}/PHY/if4_tools.c
   ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/drs_modulation.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_demodulation.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_adjust_sync_eNB.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/freq_equalization.c
   ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_ul.c
-  ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_nr.c
   ${OPENAIR1_DIR}/PHY/MODULATION/ul_7_5_kHz.c
   ${OPENAIR1_DIR}/PHY/MODULATION/gen_75KHz.cpp
   ${OPENAIR1_DIR}/PHY/MODULATION/beamforming.c
   ${OPENAIR1_DIR}/PHY/MODULATION/compute_bf_weights.c
   ${OPENAIR1_DIR}/PHY/INIT/lte_init_ru.c
-  ${OPENAIR1_DIR}/PHY/INIT/nr_init_ru.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/prach.c
+  )
 
+set(NR_PHY_SRC_RU
+  ${OPENAIR1_DIR}/PHY/MODULATION/nr_beamforming.c
+  ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_nr.c
+  ${OPENAIR1_DIR}/PHY/INIT/nr_init_ru.c
+  ${OPENAIR1_DIR}/PHY/if4_tools.c
   )
 
 set(PHY_SRC_UE
@@ -1068,7 +1096,7 @@ 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 polar smallblock ds)
 
 add_library(PHY_NR_NO_AVX_256 ${PHY_NR_SRC})
 target_link_libraries(PHY_NR_NO_AVX_256 nr_phy_common nr_common)
@@ -1080,6 +1108,8 @@ target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs nr_phy_common nr_common
 add_library(PHY_RU ${PHY_SRC_RU})
 target_link_libraries(PHY_RU PRIVATE asn1_lte_rrc_hdrs UTIL)
 
+add_library(NR_PHY_RU ${NR_PHY_SRC_RU})
+
 #Layer 2 library
 #####################
 set(MAC_DIR ${OPENAIR2_DIR}/LAYER2/MAC)
@@ -1318,6 +1348,7 @@ if(E2_AGENT)
   target_compile_definitions(L2 PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
 endif()
 
+
 add_library(MAC_UE_NR ${MAC_NR_SRC_UE})
 target_link_libraries(MAC_UE_NR PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs PUBLIC nr_ue_power_procedures nr_ue_ra_procedures)
 
@@ -1348,6 +1379,10 @@ if(OAI_AERIAL)
     target_compile_definitions(L2_NR PRIVATE ENABLE_AERIAL)
 endif()
 
+if(E3_AGENT)
+  target_compile_definitions(L2_NR PRIVATE E3_AGENT)
+endif()
+
 add_library(L2_LTE_NR
   # temporary solution until 4G/5G code completely untangled (as evidenced by deletion of the following file)
   ${MAC_DIR}/dummy_functions.c
@@ -1742,7 +1777,7 @@ target_link_libraries(lte-softmodem PRIVATE
   lte_rrc nr_rrc s1ap m2ap x2ap m3ap GTPV1U SECURITY UTIL 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
-  -Wl,--end-group z dl)
+  -Wl,--end-group dl)
 
 target_link_libraries(lte-softmodem PRIVATE pthread m CONFIG_LIB rt)
 target_link_libraries(lte-softmodem PRIVATE ${T_LIB})
@@ -1757,13 +1792,17 @@ add_executable(oairu
   ${OPENAIR_DIR}/executables/lte-ru.c
   ${OPENAIR_DIR}/executables/ru_control.c
   ${OPENAIR_DIR}/openair1/SCHED/phy_procedures_lte_common.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/freq_equalization.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_demodulation.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_adjust_sync_eNB.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
-  -Wl,--end-group z dl)
+  -Wl,--end-group dl)
 
 target_link_libraries(oairu PRIVATE pthread m CONFIG_LIB rt ${T_LIB})
 target_link_libraries(oairu PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
@@ -1792,7 +1831,7 @@ target_link_libraries(lte-uesoftmodem PRIVATE
   SECURITY UTIL 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
-  -Wl,--end-group z dl)
+  -Wl,--end-group dl)
 
 target_link_libraries(lte-uesoftmodem PRIVATE pthread m CONFIG_LIB rt)
 target_link_libraries(lte-uesoftmodem PRIVATE ${T_LIB})
@@ -1808,11 +1847,12 @@ add_executable(nr-oru
   ${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_NR/nr_ru_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
+  UTIL NR_PHY_RU PHY_NR shlib_loader dl
   radio_common softmodem_common)
 target_link_libraries(nr-oru PRIVATE pthread m CONFIG_LIB rt ${T_LIB} utils
   barrier actor)
@@ -1836,12 +1876,12 @@ 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
-  ITTI ${NAS_UE_LIB} lte_rrc nr_rrc
+  UTIL SCTP_CLIENT SCHED_LIB SCHED_NR_LIB PHY_NR PHY PHY_NR_COMMON NR_PHY_RU GTPV1U SECURITY
+  ITTI ${NAS_UE_LIB} 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
-  -Wl,--end-group z dl)
+  -Wl,--end-group dl)
 
 target_link_libraries(nr-softmodem PRIVATE pthread m CONFIG_LIB rt)
 target_link_libraries(nr-softmodem PRIVATE ${T_LIB})
@@ -1863,6 +1903,11 @@ if(E2_AGENT)
   target_compile_definitions(nr-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
 endif()
 
+if (E3_AGENT)
+    target_link_libraries(nr-softmodem PRIVATE e3ap)
+    target_compile_definitions(nr-softmodem PRIVATE E3_AGENT)
+endif()
+
 
 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(nr-softmodem PRIVATE
@@ -1881,10 +1926,14 @@ target_link_libraries(nr-cuup PRIVATE
                       GTPV1U e1ap f1ap
                       time_management softmodem_common
                       alg
-                      z dl pthread ${T_LIB})
+                      dl pthread ${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)
+  if(E3_AGENT)
+    target_link_libraries(nr-cuup PRIVATE e3ap)
+    target_compile_definitions(nr-cuup PRIVATE E3_AGENT)
+  endif()
   target_compile_definitions(nr-cuup PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
 endif()
 
@@ -1905,11 +1954,11 @@ add_executable(nr-uesoftmodem
 
 target_link_libraries(nr-uesoftmodem PRIVATE
   -Wl,--start-group
-  nr_rrc SECURITY UTIL SCHED_RU_LIB SCHED_NR_UE_LIB
-  PHY_COMMON PHY_NR_COMMON PHY_NR_UE NR_L2_UE MAC_NR_COMMON NFAPI_LIB
+  nr_rrc SECURITY UTIL SCHED_NR_UE_LIB
+  PHY_NR_COMMON PHY_NR_UE NR_L2_UE MAC_NR_COMMON NFAPI_LIB
   ITTI SIMU radio_common
   time_management softmodem_common
-  -Wl,--end-group z dl)
+  -Wl,--end-group dl)
 
 target_link_libraries(nr-uesoftmodem PRIVATE pthread m CONFIG_LIB rt nr_ue_phy_meas)
 target_link_libraries(nr-uesoftmodem PRIVATE ${T_LIB})
@@ -1983,14 +2032,14 @@ 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
+  -Wl,--start-group UTIL SIMU 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
   )
 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
+  -Wl,--start-group UTIL SIMU 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
 )
 target_link_libraries(nr_pbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
@@ -2000,14 +2049,14 @@ add_executable(nr_psbchsim
   ${NFAPI_USER_DIR}/nfapi.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 -Wl,--end-group
+  -Wl,--start-group UTIL SIMU PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON CONFIG_LIB -Wl,--end-group
   m pthread ${T_LIB} ITTI dl physim_common softmodem_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
+  -Wl,--start-group UTIL SIMU 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
 )
 target_link_libraries(nr_pucchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
@@ -2019,15 +2068,15 @@ add_executable(nr_dlsim
   ${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 CONFIG_LIB L2_NR -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl nr_ue_phy_meas physim_common
+  -Wl,--start-group UTIL SIMU 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 nr_ue_phy_meas physim_common NR_L2_UE
   softmodem_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
+  -Wl,--start-group UTIL SIMU PHY_NR_COMMON PHY_NR 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)
 target_link_libraries(nr_prachsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
@@ -2035,7 +2084,7 @@ add_executable(nr_ulschsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulschsim.c
   )
 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
+  -Wl,--start-group UTIL SIMU 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
 )
 target_link_libraries(nr_ulschsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
@@ -2048,8 +2097,8 @@ add_executable(nr_ulsim
   )
 
 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 CONFIG_LIB L2_NR -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl nr_ue_phy_meas physim_common softmodem_common
+  -Wl,--start-group UTIL SIMU 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 nr_ue_phy_meas physim_common softmodem_common NR_L2_UE
   )
 target_link_libraries(nr_ulsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
@@ -2059,7 +2108,7 @@ add_executable(nr_srssim
   )
 
 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
+  -Wl,--start-group UTIL SIMU 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
   )
 
@@ -2128,7 +2177,7 @@ if (${T_TRACER})
         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
-        PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU
+        PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU NR_PHY_RU
         L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE MAC_NR_COMMON MAC_UE_NR ngap
         GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE SIMU
         dfts config_internals nr_common crc_byte)

NOTICE

@@ -84,3 +84,11 @@ Nuand: https://github.com/Nuand/bladeRF/tree/master?tab=License-1-ov-file
 
 Credits for https://github.com/pothosware/SoapySDR
 Pothosware: BSL 1.0 License
+
+Credits for https://github.com/zeromq/libzmq
+ZeroMQ authors: Mozilla Public License Version 2.0
+
+Credits for source code:
+  - radio/zmq/zmq_imported.cpp
+  - radio/zmq/zmq_imported.h
+Software Radio Systems Limited: BSD-3-Clause-Open-MPI

ci-scripts/Jenkinsfile-GitLab-Container

@@ -219,28 +219,6 @@ pipeline {
             }
           }
         }
-        stage ("cppcheck") {
-          steps {
-            script {
-              triggerSlaveJob ('RAN-cppcheck', 'cppcheck')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                cppcheckStatus = finalizeSlaveJob('RAN-cppcheck')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += cppcheckStatus
-              }
-            }
-          }
-        }
         stage ("ARM-Cross-Compile") {
           steps {
             script {

ci-scripts/args_parse.py

@@ -22,7 +22,7 @@ import constants as CONST
 #-----------------------------------------------------------
 
 
-def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER):
+def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,CLUSTER):
 
     force_local = False
     date_fmt = None
@@ -53,7 +53,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER):
             RAN.ranRepository=matchReg.group(1)
             HTML.ranRepository=matchReg.group(1)
             CONTAINERS.ranRepository=matchReg.group(1)
-            SCA.ranRepository=matchReg.group(1)
             CLUSTER.ranRepository=matchReg.group(1)
         elif re.match(r'^\-\-eNB_AllowMerge=(.+)$|^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE):
             if re.match(r'^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE):
@@ -66,7 +65,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER):
                 RAN.ranAllowMerge=True
                 HTML.ranAllowMerge=True
                 CONTAINERS.ranAllowMerge=True
-                SCA.ranAllowMerge=True
                 CLUSTER.ranAllowMerge=True
         elif re.match(r'^\-\-eNBBranch=(.+)$|^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE):
             if re.match(r'^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE):
@@ -77,7 +75,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER):
             RAN.ranBranch=matchReg.group(1)
             HTML.ranBranch=matchReg.group(1)
             CONTAINERS.ranBranch=matchReg.group(1)
-            SCA.ranBranch=matchReg.group(1)
             CLUSTER.ranBranch=matchReg.group(1)
         elif re.match(r'^\-\-eNBCommitID=(.*)$|^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE):
             if re.match(r'^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE):
@@ -88,7 +85,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER):
             RAN.ranCommitID=matchReg.group(1)
             HTML.ranCommitID=matchReg.group(1)
             CONTAINERS.ranCommitID=matchReg.group(1)
-            SCA.ranCommitID=matchReg.group(1)
             CLUSTER.ranCommitID=matchReg.group(1)
         elif re.match(r'^\-\-eNBTargetBranch=(.*)$|^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE):
             if re.match(r'^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE):
@@ -99,7 +95,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER):
             RAN.ranTargetBranch=matchReg.group(1)
             HTML.ranTargetBranch=matchReg.group(1)
             CONTAINERS.ranTargetBranch=matchReg.group(1)
-            SCA.ranTargetBranch=matchReg.group(1)
             CLUSTER.ranTargetBranch=matchReg.group(1)
         elif re.match(r'^\-\-eNBIPAddress=(.+)$|^\-\-eNB[1-2]IPAddress=(.+)$', myArgv, re.IGNORECASE):
             print("parameters --eNB*IPAddress ignored")
@@ -112,7 +107,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER):
                 matchReg = re.match(r'^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNBSourceCodePath=matchReg.group(1)
                 CONTAINERS.eNBSourceCodePath=matchReg.group(1)
-                SCA.eNBSourceCodePath=matchReg.group(1)
                 CLUSTER.eNBSourceCodePath=matchReg.group(1)
             elif re.match(r'^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
                 print("parameter --eNB1SourceCodePath ignored")

ci-scripts/ci_infra.yaml

@@ -79,11 +79,11 @@ oc-cn5g:
 
 oc-cn5g-20897:
   Host: cacofonix
-  NetworkScript: echo "inet 172.21.6.105"
+  NetworkScript: echo "inet 172.21.6.115"
   RunIperf3Server: False
-  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72"
-  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72"
-  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72 %%log_dir%%"
+  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2026-apr oaicicd-core-for-fhi72"
+  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2026-apr oaicicd-core-for-fhi72"
+  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2026-apr oaicicd-core-for-fhi72 %%log_dir%%"
 
 oc-cn5g-00103-ho:
   Host: groot
@@ -143,7 +143,7 @@ ltebox-nano:
     - "sudo su -c 'screen -dm -S simulated_hss /opt/hss_sim0609/starthss'"
     - "sleep 1"
     - "sudo /opt/ltebox/tools/start_mme && sudo /opt/ltebox/tools/start_xGw &"
-    - "sleep 1"
+    - "sleep 2"
   Undeploy: "sudo /opt/ltebox/tools/stop_xGw; sudo /opt/ltebox/tools/stop_mme; sudo killall screen"
   LogCollect: "cp /opt/hss_sim0609/hss.log /opt/ltebox/var/log/{mmeLog.0,s1apcLog.0,s1apsLog.0,s11cLog.0,libLog.0,xGwLog.0} %%log_dir%%"
 
@@ -154,7 +154,7 @@ sabox-nepes:
     - "sudo su -c 'screen -dm -S simulated_5g_hss /opt/hss_sim0609/start_5g_hss'"
     - "sleep 1"
     - "sudo /opt/ltebox/tools/start_sabox < /dev/null &> /dev/null"
-    - "sleep 1"
+    - "sleep 2"
   LogCollect: "cp /opt/hss_sim0609/hss.log /opt/ltebox/var/log/{amfLog.0,ngapcLog.0,ngapcommonLog.0,ngapsLog.0,xGwLog.0,upfLog.0} %%log_dir%%"
   Undeploy: "sudo /opt/ltebox/tools/stop_sabox; sudo killall screen"
 
@@ -165,7 +165,7 @@ ltebox-nepes:
     - "sudo su -c 'screen -dm -S simulated_hss /opt/hss_sim0609/starthss'"
     - "sleep 1"
     - "sudo /opt/ltebox/tools/start_mme && sudo /opt/ltebox/tools/start_xGw &"
-    - "sleep 1"
+    - "sleep 2"
   Undeploy: "sudo /opt/ltebox/tools/stop_xGw; sudo /opt/ltebox/tools/stop_mme; sudo killall screen"
   LogCollect: "cp /opt/hss_sim0609/hss.log /opt/ltebox/var/log/{mmeLog.0,s1apcLog.0,s1apsLog.0,s11cLog.0,libLog.0,xGwLog.0} %%log_dir%%"
 

ci-scripts/cls_containerize.py

@@ -184,11 +184,6 @@ class Containerize():
 		self.services = ''
 		self.deploymentTag = ''
 
-		self.cli = ''
-		self.cliBuildOptions = ''
-		self.dockerfileprefix = ''
-		self.host = ''
-
 		self.num_attempts = 1
 
 		self.flexricTag = ''
@@ -203,18 +198,7 @@ class Containerize():
 		cmd = cls_cmd.getConnection(node)
 		log_files = []
 	
-		# Checking the hostname to get adapted on cli and dockerfileprefixes
-		cmd.run('hostnamectl')
-		result = re.search('Ubuntu|Red Hat', cmd.getBefore())
-		self.host = result.group(0)
-		if self.host == 'Ubuntu':
-			self.cli = 'docker'
-			self.dockerfileprefix = '.ubuntu'
-			self.cliBuildOptions = ''
-		elif self.host == 'Red Hat':
-			self.cli = 'sudo podman'
-			self.dockerfileprefix = '.rhel9'
-			self.cliBuildOptions = '--disable-compression'
+		dockerfileprefix = '.ubuntu'
 
 		# we always build the ran-build image with all targets
 		# Creating a tupple with the imageName, the DockerFile prefix pattern, targetName and sanitized option
@@ -232,23 +216,20 @@ class Containerize():
 			imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup', ''))
 			imageNames.append(('oai-lte-ue', 'lteUE', 'oai-lte-ue', ''))
 			imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue', ''))
-			if self.host == 'Red Hat':
-				imageNames.append(('oai-physim', 'phySim', 'oai-physim', ''))
-			if self.host == 'Ubuntu':
-				imageNames.append(('oai-lte-ru', 'lteRU', 'oai-lte-ru', ''))
-				# 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"'))
-				imageNames.append(('oai-gnb', 'gNB', 'oai-gnb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
-				imageNames.append(('oai-lte-ue', 'lteUE', 'oai-lte-ue-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
-				imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
-				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', ''))
+			imageNames.append(('oai-lte-ru', 'lteRU', 'oai-lte-ru', ''))
+			# 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"'))
+			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
+			imageNames.append(('oai-lte-ue', 'lteUE', 'oai-lte-ue-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
+			imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
+			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'
+			dockerfileprefix = '.ubuntu.cross-arm64'
 		result = re.search('native_armv9', self.imageKind)
 		if result is not None:
 			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
@@ -263,10 +244,6 @@ class Containerize():
 			imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue', ''))
 		
 		cmd.cd(lSourcePath)
-		# if asterix, copy the entitlement and subscription manager configurations
-		if self.host == 'Red Hat':
-			cmd.run('mkdir -p ./etc-pki-entitlement')
-			cmd.run('cp /etc/pki/entitlement/*.pem ./etc-pki-entitlement/')
 
 		baseImage = 'ran-base'
 		baseTag = 'develop'
@@ -275,7 +252,7 @@ class Containerize():
 		if (self.ranAllowMerge):
 			imageTag = 'ci-temp'
 			if self.ranTargetBranch == 'develop':
-				cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base{self.dockerfileprefix} | grep --colour=never -i INDEX')
+				cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base{dockerfileprefix} | grep --colour=never -i INDEX')
 				result = re.search('index', cmd.getBefore())
 				if result is not None:
 					forceBaseImageBuild = True
@@ -289,31 +266,30 @@ class Containerize():
 			forceBaseImageBuild = True
 
 		# Let's remove any previous run artifacts if still there
-		cmd.run(f"{self.cli} image prune --force")
+		cmd.run(f"docker image prune --force")
 		for image,pattern,name,option in imageNames:
-			cmd.run(f"{self.cli} image rm {name}:{imageTag}", reportNonZero=False)
+			cmd.run(f"docker image rm {name}:{imageTag}", reportNonZero=False)
 
 		cmd.run(f'docker login -u oaicicd -p oaicicd {DEFAULT_REGISTRY}')
 		ubuntuImage = "ubuntu:noble"
 		# Build the base image only on Push Events (not on Merge Requests)
 		# On when the base image docker file is being modified.
 		if forceBaseImageBuild:
-			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
+			cmd.run(f"docker image rm {baseImage}:{baseTag}")
 			logfile = f'{lSourcePath}/cmake_targets/log/ran-base.docker.log'
-			if self.host == 'Ubuntu':
-				option = f" --build-arg UBUNTU_IMAGE={DEFAULT_REGISTRY}/{ubuntuImage}"
-			cmd.run(f"{self.cli} build {self.cliBuildOptions} --target {baseImage} --tag {baseImage}:{baseTag} --file docker/Dockerfile.base{self.dockerfileprefix} {option} . &> {logfile}", timeout=1600)
+			option = f" --build-arg UBUNTU_IMAGE={DEFAULT_REGISTRY}/{ubuntuImage}"
+			cmd.run(f"docker build --target {baseImage} --tag {baseImage}:{baseTag} --file docker/Dockerfile.base{dockerfileprefix} {option} . &> {logfile}", timeout=1600)
 			t = ("ran-base", archiveArtifact(cmd, ctx, logfile))
 			log_files.append(t)
 
 		# First verify if the base image was properly created.
-		ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}")
+		ret = cmd.run(f"docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}")
 		allImagesSize = {}
 		if ret.returncode != 0:
 			logging.error('\u001B[1m Could not build properly ran-base\u001B[0m')
 			# Recover the name of the failed container?
-			cmd.run(f"{self.cli} ps --quiet --filter \"status=exited\" -n1 | xargs --no-run-if-empty {self.cli} rm -f")
-			cmd.run(f"{self.cli} image prune --force")
+			cmd.run(f"docker ps --quiet --filter \"status=exited\" -n1 | xargs --no-run-if-empty docker rm -f")
+			cmd.run(f"docker image prune --force")
 			cmd.close()
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
@@ -333,32 +309,31 @@ class Containerize():
 		for image,pattern,name,option in imageNames:
 			# the archived Dockerfiles have "ran-base:latest" as base image
 			# we need to update them with proper tag
-			cmd.run(f'git checkout -- docker/Dockerfile.{pattern}{self.dockerfileprefix}')
-			cmd.run(f'sed -i -e "s#{baseImage}:latest#{baseImage}:{baseTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
+			cmd.run(f'git checkout -- docker/Dockerfile.{pattern}{dockerfileprefix}')
+			cmd.run(f'sed -i -e "s#{baseImage}:latest#{baseImage}:{baseTag}#" docker/Dockerfile.{pattern}{dockerfileprefix}')
 			# 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}')
+				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build-asan:{imageTag}#" docker/Dockerfile.{pattern}{dockerfileprefix}')
 			elif "fhi72" in name or name == "oai-nr-oru":
-				cmd.run(f'sed -i -e "s#ran-build-fhi72:latest#ran-build-fhi72:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
+				cmd.run(f'sed -i -e "s#ran-build-fhi72:latest#ran-build-fhi72:{imageTag}#" docker/Dockerfile.{pattern}{dockerfileprefix}')
 			elif image != 'ran-build':
-				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
+				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{dockerfileprefix}')
 			if image == 'oai-gnb-aerial':
 				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2026.01.07.tar.gz .')
 			logfile = f'{lSourcePath}/cmake_targets/log/{name}.docker.log'
-			if self.host == 'Ubuntu':
-				option = option + f" --build-arg UBUNTU_IMAGE={DEFAULT_REGISTRY}/{ubuntuImage}"
-			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)
+			option = option + f" --build-arg UBUNTU_IMAGE={DEFAULT_REGISTRY}/{ubuntuImage}"
+			ret = cmd.run(f'docker build --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{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')
 			# check the status of the build
-			ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {name}:{imageTag}")
+			ret = cmd.run(f"docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' {name}:{imageTag}")
 			if ret.returncode != 0:
 				logging.error('\u001B[1m Could not build properly ' + name + '\u001B[0m')
 				status = False
 				# Here we should check if the last container corresponds to a failed command and destroy it
-				cmd.run(f"{self.cli} ps --quiet --filter \"status=exited\" -n1 | xargs --no-run-if-empty {self.cli} rm -f")
+				cmd.run(f"docker ps --quiet --filter \"status=exited\" -n1 | xargs --no-run-if-empty docker rm -f")
 				allImagesSize[name] = 'N/A -- Build Failed'
 				break
 			else:
@@ -372,16 +347,16 @@ class Containerize():
 					logging.debug(f'{name} size is unknown')
 					allImagesSize[name] = 'unknown'
 			# Now pruning dangling images in between target builds
-			cmd.run(f"{self.cli} image prune --force")
+			cmd.run(f"docker image prune --force")
 		cmd.run(f'docker logout {DEFAULT_REGISTRY}')
 		# Remove all intermediate build images and clean up
-		cmd.run(f"{self.cli} image rm ran-build:{imageTag} ran-build-asan:{imageTag} ran-build-fhi72:{imageTag} || true")
-		cmd.run(f"{self.cli} volume prune --force")
+		cmd.run(f"docker image rm ran-build:{imageTag} ran-build-asan:{imageTag} ran-build-fhi72:{imageTag} || true")
+		cmd.run(f"docker volume prune --force")
 
 		# Remove some cached artifacts to prevent out of diskspace problem
 		logging.debug(cmd.run("df -h").stdout)
 		logging.debug(cmd.run("docker system df").stdout)
-		cmd.run(f"{self.cli} buildx prune --filter until=1h --force")
+		cmd.run(f"docker buildx prune --filter until=1h --force")
 		logging.debug(cmd.run("df -h").stdout)
 		logging.debug(cmd.run("docker system df").stdout)
 
@@ -489,20 +464,12 @@ class Containerize():
 		cmd = cls_cmd.getConnection(node)
 		cmd.cd(lSourcePath)
 
-		ret = cmd.run('hostnamectl')
-		result = re.search('Ubuntu', ret.stdout)
-		host = result.group(0)
-		if host != 'Ubuntu':
-			cmd.close()
-			raise Exception("Can build unit tests only on Ubuntu server")
-		logging.debug('running on Ubuntu as expected')
-
 		# check that ran-base image exists as we expect it
 		baseImage = 'ran-base'
 		baseTag = 'develop'
 		if self.ranAllowMerge:
 			if self.ranTargetBranch == 'develop':
-				cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base{self.dockerfileprefix} | grep --colour=never -i INDEX')
+				cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base.ubuntu | grep --colour=never -i INDEX')
 				result = re.search('index', cmd.getBefore())
 				if result is not None:
 					baseTag = 'ci-temp'

ci-scripts/cls_oai_html.py

@@ -379,90 +379,6 @@ class HTMLManagement():
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.close()
 
-	def CreateHtmlTestRowCppCheckResults(self, CCR):
-		if (self.htmlFooterCreated or (not self.htmlHeaderCreated)):
-			return
-		self.htmlFile = open('test_results.html', 'a')
-		vId = 0
-		for version in CCR.versions:
-			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
-			self.htmlFile.write('        <td colspan="6"><b> Results for cppcheck v ' + version + ' </b></td>\n')
-			self.htmlFile.write('      </tr>\n')
-			self.htmlFile.write('      <tr>\n')
-			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> NB ERRORS</b></td>\n')
-			if CCR.nbErrors[vId] == 0:
-				myColor = 'lightgreen'
-			elif CCR.nbErrors[vId] < 20:
-				myColor = 'orange'
-			else:
-				myColor = 'lightcoral'
-			self.htmlFile.write('        <td colspan="3" bgcolor = "' + myColor + '"><b>' + str(CCR.nbErrors[vId]) + '</b></td>\n')
-			self.htmlFile.write('      </tr>\n')
-			self.htmlFile.write('      <tr>\n')
-			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> NB WARNINGS</b></td>\n')
-			if CCR.nbWarnings[vId] == 0:
-				myColor = 'lightgreen'
-			elif CCR.nbWarnings[vId] < 20:
-				myColor = 'orange'
-			else:
-				myColor = 'lightcoral'
-			self.htmlFile.write('        <td colspan="3" bgcolor = "' + myColor + '"><b>' + str(CCR.nbWarnings[vId]) + '</b></td>\n')
-			self.htmlFile.write('      </tr>\n')
-			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
-			self.htmlFile.write('        <td colspan="6"> ----------------- </td>\n')
-			self.htmlFile.write('      </tr>\n')
-			self.htmlFile.write('      <tr>\n')
-			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Memory leak</b></td>\n')
-			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbMemLeaks[vId]) + '</td>\n')
-			self.htmlFile.write('      </tr>\n')
-			self.htmlFile.write('      <tr>\n')
-			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Possible null pointer deference</b></td>\n')
-			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbNullPtrs[vId]) + '</td>\n')
-			self.htmlFile.write('      </tr>\n')
-			self.htmlFile.write('      <tr>\n')
-			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Uninitialized variable</b></td>\n')
-			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbUninitVars[vId]) + '</td>\n')
-			self.htmlFile.write('      </tr>\n')
-			self.htmlFile.write('      <tr>\n')
-			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Undefined behaviour shifting</b></td>\n')
-			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbTooManyBitsShift[vId]) + '</td>\n')
-			self.htmlFile.write('      </tr>\n')
-			self.htmlFile.write('      <tr>\n')
-			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Signed integer overflow</b></td>\n')
-			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbIntegerOverflow[vId]) + '</td>\n')
-			self.htmlFile.write('      </tr>\n')
-			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
-			self.htmlFile.write('        <td colspan="6"> </td>\n')
-			self.htmlFile.write('      </tr>\n')
-			self.htmlFile.write('      <tr>\n')
-			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Printf formatting issues</b></td>\n')
-			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbInvalidPrintf[vId]) + '</td>\n')
-			self.htmlFile.write('      </tr>\n')
-			self.htmlFile.write('      <tr>\n')
-			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Modulo result is predetermined</b></td>\n')
-			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbModuloAlways[vId]) + '</td>\n')
-			self.htmlFile.write('      </tr>\n')
-			self.htmlFile.write('      <tr>\n')
-			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Opposite Condition -> dead code</b></td>\n')
-			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbOppoInnerCondition[vId]) + '</td>\n')
-			self.htmlFile.write('      </tr>\n')
-			self.htmlFile.write('      <tr>\n')
-			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Wrong Scanf Nb Args</b></td>\n')
-			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbWrongScanfArg[vId]) + '</td>\n')
-			self.htmlFile.write('      </tr>\n')
-			vId += 1
-
 	def CreateHtmlTestRowPhySimTestResult(self, testSummary, testResult):
 		if (self.htmlFooterCreated or (not self.htmlHeaderCreated)):
 			return

ci-scripts/cls_static_code_analysis.py

@@ -27,160 +27,30 @@ import constants as CONST
 import cls_cmd
 from cls_ci_helper import archiveArtifact
 
-#-----------------------------------------------------------
-# Class Declaration
-#-----------------------------------------------------------
-class CppCheckResults():
-
-	def __init__(self):
-
-		self.variants = ['bionic', 'focal']
-		self.versions = ['','']
-		self.nbErrors = [0,0]
-		self.nbWarnings = [0,0]
-		self.nbNullPtrs = [0,0]
-		self.nbMemLeaks = [0,0]
-		self.nbUninitVars = [0,0]
-		self.nbInvalidPrintf = [0,0]
-		self.nbModuloAlways = [0,0]
-		self.nbTooManyBitsShift = [0,0]
-		self.nbIntegerOverflow = [0,0]
-		self.nbWrongScanfArg = [0,0]
-		self.nbPtrAddNotNull = [0,0]
-		self.nbOppoInnerCondition = [0,0]
-
 class StaticCodeAnalysis():
 
-	def __init__(self):
-
-		self.ranRepository = ''
-		self.ranBranch = ''
-		self.ranAllowMerge = False
-		self.ranCommitID = ''
-		self.ranTargetBranch = ''
-		self.eNBSourceCodePath = ''
-
-	def CppCheckAnalysis(self, ctx, node, HTML):
-		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		lSourcePath = self.eNBSourceCodePath
-
-		if not lSourcePath or not node:
-			raise ValueError(f"{lSourcePath=} {node=}")
-		logging.debug('Building on server: ' + node)
-		cmd = cls_cmd.getConnection(node)
-		# on RedHat/CentOS .git extension is mandatory
-		result = re.search(r'([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository)
-		if result is not None:
-			full_ran_repo_name = self.ranRepository.replace('git/', 'git')
-		else:
-			full_ran_repo_name = self.ranRepository + '.git'
-
-		cmd.cd(lSourcePath)
-		logDir = f'{lSourcePath}/cmake_targets/log'
-		cmd.run(f'mkdir -p {logDir}')
-		cmd.run('docker image rm oai-cppcheck:bionic oai-cppcheck:focal')
-		cmd.run(f'sed -e "s@xenial@bionic@" {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.xenial > {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.bionic')
-		cmd.run(f'docker build --tag oai-cppcheck:bionic --file {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.bionic . > {logDir}/cppcheck-bionic.txt 2>&1')
-		cmd.run(f'sed -e "s@xenial@focal@" {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.xenial > {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.focal')
-		cmd.run(f'docker build --tag oai-cppcheck:focal --file {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.focal . > {logDir}/cppcheck-focal.txt 2>&1')
-		cmd.run('docker image rm oai-cppcheck:bionic oai-cppcheck:focal')
-
-		bionic = archiveArtifact(cmd, ctx, f'{logDir}/cppcheck-bionic.txt')
-		focal = archiveArtifact(cmd, ctx, f'{logDir}/cppcheck-focal.txt')
-		cmd.close()
-
-		CCR = CppCheckResults()
-		CCR_ref = CppCheckResults()
-		vId = 0
-		for variant in CCR.variants:
-			filename = ctx.baseFilename() + '-cppcheck-'+ variant + '.txt'
-			logging.info(f"will check file '{filename}'")
-			if not os.path.isfile(filename):
-				raise FileNotFoundError(f"{filename} is not a file")
-			else:
-				xmlStart = False
-				with open(filename, 'r') as logfile:
-					for line in logfile:
-						ret = re.search(r'cppcheck version="(?P<version>[0-9\.]+)"', str(line))
-						if ret is not None:
-						   CCR.versions[vId] = ret.group('version')
-						if re.search('RUN cat cmake_targets/log/cppcheck.xml', str(line)) is not None:
-							xmlStart = True
-						if xmlStart:
-							if re.search('severity="error"', str(line)) is not None:
-								CCR.nbErrors[vId] += 1
-							if re.search('severity="warning"', str(line)) is not None:
-								CCR.nbWarnings[vId] += 1
-							if re.search('id="memleak"', str(line)) is not None:
-								CCR.nbMemLeaks[vId] += 1
-							if re.search('id="nullPointer"', str(line)) is not None:
-								CCR.nbNullPtrs[vId] += 1
-							if re.search('id="uninitvar"', str(line)) is not None:
-								CCR.nbUninitVars[vId] += 1
-							if re.search('id="invalidPrintfArgType_sint"|id="invalidPrintfArgType_uint"', str(line)) is not None:
-								CCR.nbInvalidPrintf[vId] += 1
-							if re.search('id="moduloAlwaysTrueFalse"', str(line)) is not None:
-								CCR.nbModuloAlways[vId] += 1
-							if re.search('id="shiftTooManyBitsSigned"', str(line)) is not None:
-								CCR.nbTooManyBitsShift[vId] += 1
-							if re.search('id="integerOverflow"', str(line)) is not None:
-								CCR.nbIntegerOverflow[vId] += 1
-							if re.search('id="wrongPrintfScanfArgNum"|id="invalidScanfArgType_int"', str(line)) is not None:
-								CCR.nbWrongScanfArg[vId] += 1
-							if re.search('id="pointerAdditionResultNotNull"', str(line)) is not None:
-								CCR.nbPtrAddNotNull[vId] += 1
-							if re.search('id="oppositeInnerCondition"', str(line)) is not None:
-								CCR.nbOppoInnerCondition[vId] += 1
-			vMsg  = ''
-			vMsg += '========  Variant ' + variant + ' - ' + CCR.versions[vId] + ' ========\n'
-			vMsg += '   ' + str(CCR.nbErrors[vId]) + ' errors\n'
-			vMsg += '   ' + str(CCR.nbWarnings[vId]) + ' warnings\n'
-			vMsg += '  -- Details --\n'
-			vMsg += '   Memory leak:                     ' + str(CCR.nbMemLeaks[vId]) + '\n'
-			vMsg += '   Possible null pointer deference: ' + str(CCR.nbNullPtrs[vId]) + '\n'
-			vMsg += '   Uninitialized variable:          ' + str(CCR.nbUninitVars[vId]) + '\n'
-			vMsg += '   Undefined behaviour shifting:    ' + str(CCR.nbTooManyBitsShift[vId]) + '\n'
-			vMsg += '   Signed integer overflow:         ' + str(CCR.nbIntegerOverflow[vId]) + '\n'
-			vMsg += '\n'
-			vMsg += '   Printf formatting issue:         ' + str(CCR.nbInvalidPrintf[vId]) + '\n'
-			vMsg += '   Modulo result is predetermined:  ' + str(CCR.nbModuloAlways[vId]) + '\n'
-			vMsg += '   Opposite Condition -> dead code: ' + str(CCR.nbOppoInnerCondition[vId]) + '\n'
-			vMsg += '   Wrong Scanf Nb Args:             ' + str(CCR.nbWrongScanfArg[vId]) + '\n'
-			for vLine in vMsg.split('\n'):
-				logging.debug(vLine)
-			vId += 1
-
-		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
-		HTML.CreateHtmlTestRowCppCheckResults(CCR)
-		logging.info('\u001B[1m Static Code Analysis Pass\u001B[0m')
-
-		return True
-
-	def LicenceAndFormattingCheck(self, ctx, node, HTML):
+	def LicenceAndFormattingCheck(ctx, node, HTML, d, branch, allowMerge, targetBranch):
 		# Workspace is no longer recreated from scratch.
 		# It implies that this method shall be called last within a build pipeline
 		# where workspace is already created
-		lSourcePath = self.eNBSourceCodePath
 
-		if not node or not lSourcePath:
-			raise ValueError(f"{lSourcePath=} {node=}")
+		if not node or not d:
+			raise ValueError(f"{d=} {node=}")
 		logging.debug('Building on server: ' + node)
 		cmd = cls_cmd.getConnection(node)
 		check_options = ''
-		if self.ranAllowMerge:
-			check_options = f'--build-arg MERGE_REQUEST=true --build-arg SRC_BRANCH={self.ranBranch}'
-			if self.ranTargetBranch == '':
-				if self.ranBranch != 'develop' and self.ranBranch != 'origin/develop':
+		if allowMerge:
+			check_options = f'--build-arg MERGE_REQUEST=true --build-arg SRC_BRANCH={branch}'
+			if targetBranch == '':
+				if branch != 'develop' and branch != 'origin/develop':
 					check_options += ' --build-arg TARGET_BRANCH=develop'
 			else:
-				check_options += f' --build-arg TARGET_BRANCH={self.ranTargetBranch}'
+				check_options += f' --build-arg TARGET_BRANCH={targetBranch}'
 
-		logDir = f'{lSourcePath}/cmake_targets/log/'
+		logDir = f'{d}/cmake_targets/log/'
 		cmd.run(f'mkdir -p {logDir}')
 		cmd.run('docker image rm oai-formatting-check:latest')
-		cmd.run(f'docker build --target oai-formatting-check --tag oai-formatting-check:latest {check_options} --file {lSourcePath}/ci-scripts/docker/Dockerfile.formatting.ubuntu {lSourcePath} > {logDir}/oai-formatting-check.txt 2>&1')
+		cmd.run(f'docker build --target oai-formatting-check --tag oai-formatting-check:latest {check_options} --file {d}/ci-scripts/docker/Dockerfile.formatting.ubuntu {d} > {logDir}/oai-formatting-check.txt 2>&1')
 
 		cmd.run('docker image rm oai-formatting-check:latest')
 		cmd.run('docker image prune --force')

ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf

@@ -215,6 +215,7 @@ L1s =
 (
   {
     num_cc = 1;
+    prach_dtx_threshold = 200;
     tr_n_preference = "local_mac";
   }
 );

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

@@ -17,6 +17,7 @@ gNBs =
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
     plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
+    cu_sibs = ( 2, 3, 4 );
     @include "neighbour-config.conf"
 
     nr_cellid = 12345678L;

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

@@ -186,10 +186,10 @@ MACRLCs = (
   local_s_portd    = 50011; // vnf p7 port [!]
   tr_s_preference             = "aerial";
   tr_n_preference             = "local_RRC";
-  pucch_RSSI_Threshold = -270;
-  pusch_RSSI_Threshold = -260;
-  pusch_TargetSNRx10          = 260; # 150;
-  pucch_TargetSNRx10          = 200; #200;
+  pucch_RSSI_Threshold        = -270;
+  pusch_RSSI_Threshold        = -260;
+  pusch_TargetSNRx10          = 290;
+  pucch_TargetSNRx10          = 200;
   dl_max_mcs = 28;
   ul_max_mcs = 28;
   ul_min_mcs = 9;

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

@@ -161,7 +161,7 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.6.103"; });
+    amf_ip_address = ({ ipv4 = "172.21.6.113"; });
 
     NETWORK_INTERFACES :
     {

ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf

@@ -197,7 +197,7 @@ RUs = (
   nb_tx          = 2;
   nb_rx          = 2;
   att_tx         = 0;
-  att_rx         = 0;
+  att_rx         = 6;
   bands          = [77];
   max_pdschReferenceSignalPower = -27;
   max_rxgain                    = 71;

ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma-deltaMCS.conf

@@ -18,7 +18,7 @@ gNBs =
     nr_cellid = 12345678L;
 
     ////////// Physical parameters:
-
+    use_deltaMCS = 1;
 
     servingCellConfigCommon = (
     {
@@ -180,7 +180,7 @@ MACRLCs = (
 {
   tr_s_preference             = "local_L1";
   tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 200;
+  pusch_TargetSNRx10          = 100;
   pucch_TargetSNRx10          = 200;
   ul_prbblack_SNR_threshold   = 10;
 }

ci-scripts/conf_files/neighbour-config.conf

@@ -5,6 +5,57 @@
 #  for the 2-cell rfsim setup (gNB_ID 0xe00 & 0xb00)       #
 ############################################################
 
+############################################################
+#                           SIB2                           #
+############################################################
+
+sib2_config : {
+  q_Hyst                   = 0;
+  cellReselectionPriority  = 0;
+  threshServingLowP        = 0;
+  threshServingLowQ        = 0;
+  s_NonIntraSearchP        = -1;
+  s_NonIntraSearchQ        = -1;
+  q_RxLevMin               = -56;
+  q_QualMin                = -1;
+  s_IntraSearchP           = 22;
+  s_IntraSearchQ           = -1;
+  t_ReselectionNR          = 1;
+  deriveSSB_IndexFromCell  = 1;
+
+  speed_t_Evaluation       = 0;
+  speed_t_HystNormal       = 0;
+  speed_n_CellChangeMedium = 1;
+  speed_n_CellChangeHigh   = 2;
+  speed_sf_Medium          = 1;
+  speed_sf_High            = 0;
+};
+
+############################################################
+#      Per-frequency SIB4 inter-frequency configuration    #
+############################################################
+
+frequency_list = (
+  {
+    absoluteFrequencySSB = 621312;
+    subcarrierSpacing    = 1; # 30 kHz
+    band                 = 78;
+
+    frequency_config = (
+      {
+        cellReselectionPriority = 5;
+        threshX_HighP           = 10;
+        threshX_LowP            = 6;
+        threshX_HighQ           = -1;
+        threshX_LowQ            = -1;
+        q_OffsetFreq            = 0;
+        q_RxLevMin              = -56;
+        t_ReselectionNR         = 1;
+      }
+    );
+  }
+);
+
 neighbour_list = (
   ##########################################################
   #      Entry USED BY gNB_ID = 0xe00  (nr_cellid = 1)     #
@@ -21,6 +72,9 @@ neighbour_list = (
         band                = 78;
         plmn                = { mcc = 208; mnc = 99; mnc_length = 2 };
         tracking_area_code  = 1;
+        q_OffsetCell        = 2;
+        q_RxLevMinOffsetCell= 2;
+        q_QualMinOffsetCell = 1;
       }
     );
   },
@@ -40,6 +94,9 @@ neighbour_list = (
         band                = 78;
         plmn                = { mcc = 208; mnc = 99; mnc_length = 2 };
         tracking_area_code  = 1;
+        q_OffsetCell        = 2;
+        q_RxLevMinOffsetCell= 2;
+        q_QualMinOffsetCell = 1;
       }
     );
   }

ci-scripts/docker/Dockerfile.cppcheck.xenial

@@ -1,41 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-#---------------------------------------------------------------------
-#
-# Dockerfile for the Open-Air-Interface BUILD service
-#   Valid for Ubuntu 22.04
-#
-#---------------------------------------------------------------------
-FROM ubuntu:xenial AS oai-cppcheck
-
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update && \
-    apt-get upgrade --yes && \
-    apt-get install --yes \
-       build-essential \
-       vim \
-       cppcheck
-
-WORKDIR /oai-ran
-COPY . .
-
-WORKDIR /oai-ran/common/utils/T
-RUN make
-
-WORKDIR /oai-ran
-RUN mkdir -p cmake_targets/log && \
-    cppcheck --enable=warning --force --xml --xml-version=2 \
-        --inline-suppr \
-        -i openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c \
-        --suppressions-list=ci-scripts/cppcheck_suppressions.list \
-        -I common/utils \
-        -I openair3/NAS/COMMON/UTIL \
-        -j`nproc` . 2> cmake_targets/log/cppcheck.xml 1> cmake_targets/log/cppcheck_build.txt
-
-RUN grep -E -c 'severity="error' cmake_targets/log/cppcheck.xml
-
-RUN grep -E -c 'severity="warning' cmake_targets/log/cppcheck.xml
-
-RUN cat cmake_targets/log/cppcheck.xml

ci-scripts/docker/Dockerfile.unittest.ubuntu

@@ -13,11 +13,12 @@ RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
     DEBIAN_FRONTEND=noninteractive apt-get install --yes \
         libgtest-dev \
-        libyaml-cpp-dev
+        libyaml-cpp-dev \
+        libzmq3-dev
 
 RUN rm -Rf /oai-ran
 WORKDIR /oai-ran
 COPY . .
 
 WORKDIR /oai-ran/build
-RUN cmake -GNinja -DENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DSANITIZE_ADDRESS=True .. && ninja tests
+RUN cmake -GNinja -DENABLE_TESTS=ON -DOAI_ZMQ=ON -DCMAKE_BUILD_TYPE=Debug -DSANITIZE_ADDRESS=True .. && ninja tests

ci-scripts/main.py

@@ -22,7 +22,7 @@ import constants as CONST
 
 import cls_oaicitest		 #main class for OAI CI test framework
 import cls_containerize	 #class Containerize for all container-based operations on RAN/UE objects
-import cls_static_code_analysis  #class for static code analysis
+import cls_static_code_analysis as SCA
 import cls_cluster		 # class for building/deploying on cluster
 import cls_native        # class for all native/source-based operations
 from cls_ci_helper import TestCaseCtx
@@ -64,7 +64,6 @@ def ExecuteActionWithParam(action, ctx, node):
 	global RAN
 	global HTML
 	global CONTAINERS
-	global SCA
 	global CLUSTER
 	if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy' or action == "Build_Cluster_Image" or action == "Build_Run_Tests":
 		RAN.Build_eNB_args=test.findtext('Build_eNB_args')
@@ -196,10 +195,7 @@ def ExecuteActionWithParam(action, ctx, node):
 			success = CONTAINERS.Create_Workspace(node, HTML)
 
 	elif action == 'LicenceAndFormattingCheck':
-		success = SCA.LicenceAndFormattingCheck(ctx, node, HTML)
-
-	elif action == 'Cppcheck_Analysis':
-		success = SCA.CppCheckAnalysis(ctx, node, HTML)
+		success = SCA.StaticCodeAnalysis.LicenceAndFormattingCheck(ctx, node, HTML, RAN.eNBSourceCodePath, RAN.ranBranch, RAN.ranAllowMerge, RAN.ranTargetBranch)
 
 	elif action == 'Push_Local_Registry':
 		tag_prefix = test.findtext('tag_prefix') or ""
@@ -297,7 +293,6 @@ CiTestObj = cls_oaicitest.OaiCiTest()
 RAN = ran.RANManagement()
 HTML = cls_oai_html.HTMLManagement()
 CONTAINERS = cls_containerize.Containerize()
-SCA = cls_static_code_analysis.StaticCodeAnalysis()
 CLUSTER = cls_cluster.Cluster()
 
 #-----------------------------------------------------------
@@ -307,7 +302,7 @@ CLUSTER = cls_cluster.Cluster()
 import args_parse
 # Force local execution, move all execution targets to localhost
 force_local = False
-mode, force_local, date_fmt = args_parse.ArgsParse(sys.argv,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER)
+mode, force_local, date_fmt = args_parse.ArgsParse(sys.argv,CiTestObj,RAN,HTML,CONTAINERS,HELP,CLUSTER)
 fmt = "%(levelname)8s: %(message)s"
 if date_fmt:
     fmt = "[%(asctime)s] %(levelname)s %(message)s"

ci-scripts/scripts/vvdn-activate-carriers.sh

@@ -0,0 +1,48 @@
+#!/bin/sh
+# SPDX-License-Identifier: MIT
+
+set -e
+
+RU_IP="10.10.0.111"
+RU_HOST="root@10.10.0.111"
+
+ssh_exec() {
+    ssh $RU_HOST $@ </dev/null
+}
+
+echo "→ Checking for PTP fluctuations in the last 60 minutes..."
+
+logs=$(journalctl -u ptp4l.service --since "60 minutes ago")
+
+check_ptp=$(echo "$logs" | awk '
+/rms/ {
+    rms=$8
+    if (rms > 100) {
+        print "✗ PTP FLUCTUATION DETECTED → " $0
+        exit 0
+    }
+}
+')
+
+if [ -n "$check_ptp" ]; then
+    echo "$check_ptp"
+else
+    echo "✓ No PTP fluctuations detected."
+fi
+
+echo "→ Checking if VVDN LPRU is PTP synchronized (timeout 1 min)..."
+if ssh_exec 'timeout 1m sh -c "tail -F /var/log/synctimingptp2.log | grep -m 1 -F ,\ synchronized"'; then
+    echo "✓ VVDN LPRU synchronized"
+else
+    echo "✗ VVDN LPRU not synchronized"
+fi
+
+echo "→ Checking TX/RX carrier configuration..."
+if ssh_exec 'sysrepocfg -X -d running -f xml | grep -q "<active>INACTIVE</active>"'; then
+    echo "→ Some carriers are not active, activating via sysrepocfg..."
+    ssh_exec 'sysrepocfg -X -d running -f xml | sed "s/<active>INACTIVE<\/active>/<active>ACTIVE<\/active>/g" | sysrepocfg -I -d running -f xml'
+    echo "✓ All TX/RX carriers activated."
+else
+    echo "✓ All TX/RX carriers already activated."
+fi
+exit 0

ci-scripts/scripts/vvdn-inactivate-carriers.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+# SPDX-License-Identifier: MIT
+
+set -e
+
+RU_HOST="root@10.10.0.111"
+
+ssh_exec() {
+    ssh $RU_HOST $@ </dev/null
+}
+
+echo "→ Inactivating TX/RX carriers on VVDN LPRU..."
+ssh_exec 'sysrepocfg -X -d running -f xml | sed "s/ACTIVE/INACTIVE/g" | sysrepocfg -I -d running -f xml'
+echo "✓ TX/RX carriers inactivated."

ci-scripts/xml_class_list.yml

@@ -23,7 +23,6 @@
   - Deploy_Object
   - Stop_Object
   - Undeploy_Object
-  - Cppcheck_Analysis
   - Deploy_Run_OC_PhySim
   - Build_Deploy_PhySim
   - LicenceAndFormattingCheck

ci-scripts/xml_files/container_5g_zmq_2x2.xml

@@ -0,0 +1,109 @@
+<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
+
+<testCaseList>
+  <htmlTabRef>zmq-5gnr-tdd-2x2</htmlTabRef>
+  <htmlTabName>Monolithic SA TDD 2x2 gNB with zmq radio</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </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_zmq_radio_2x2/</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_zmq_radio_2x2</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/10Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 10M -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/3Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 3M -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_zmq_radio_2x2</yaml_path>
+    <analysis>
+      <services>oai-gnb=RetxCheck=1,0,0,0 oai-gnb=EndsWithBye oai-nr-ue</services>
+    </analysis>
+  </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-asan oai-nr-ue-asan</images>
+  </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_5g_zmq_ocudu_1x1.xml

@@ -0,0 +1,109 @@
+<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
+
+<testCaseList>
+  <htmlTabRef>ocudu-5gnr-tdd-1x1</htmlTabRef>
+  <htmlTabName>OCUDU gnb split8 with OAI UE</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </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_zmq_radio_1x1_ocudu</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OCUDU Split 8 gNB + OAI UE</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_zmq_radio_1x1_ocudu</yaml_path>
+    <services>ocudu-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/3Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 3M -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_zmq_radio_1x1_ocudu</yaml_path>
+    <analysis>
+      <services>oai-nr-ue</services>
+    </analysis>
+  </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-asan oai-nr-ue-asan</images>
+  </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_5g_zmq_ocudu_2x2.xml

@@ -0,0 +1,109 @@
+<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
+
+<testCaseList>
+  <htmlTabRef>ocudu-5gnr-tdd-2x2</htmlTabRef>
+  <htmlTabName>OCUDU gnb split8 with OAI UE</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </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_zmq_radio_2x2_ocudu</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OCUDU Split 8 gNB + OAI UE</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_zmq_radio_2x2_ocudu</yaml_path>
+    <services>ocudu-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/10Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 1M -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/3Mbps/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_zmq_radio_2x2_ocudu</yaml_path>
+    <analysis>
+      <services>oai-nr-ue</services>
+    </analysis>
+  </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-asan oai-nr-ue-asan</images>
+  </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_sa_aerial_quectel.xml

@@ -122,7 +122,7 @@
     <node>gracehopper1-oai</node>
     <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial</yaml_path>
     <analysis>
-      <services>oai-gnb-aerial=RetxCheck=20,100,100,100 oai-gnb-aerial=EndsWithBye</services>
+      <services>oai-gnb-aerial=EndsWithBye</services>
     </analysis>
   </testCase>
 

ci-scripts/xml_files/container_sa_aerial_quectel_ul_heavy.xml

@@ -111,7 +111,7 @@
     <node>gracehopper1-oai</node>
     <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial_ul</yaml_path>
     <analysis>
-      <services>oai-gnb-aerial=RetxCheck=20,100,100,100 oai-gnb-aerial=EndsWithBye</services>
+      <services>oai-gnb-aerial=EndsWithBye</services>
     </analysis>
   </testCase>
 

ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml

@@ -12,6 +12,13 @@
     <script>yaml_files/sa_fhi_7.2_vvdn_gnb/setup_config.sh</script>
   </testCase>
 
+  <testCase>
+    <class>Custom_Script</class>
+    <desc>Activate carriers on VVDN RU</desc>
+    <node>cacofonix</node>
+    <script>scripts/vvdn-activate-carriers.sh</script>
+  </testCase>
+
   <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
@@ -134,9 +141,9 @@
   <testCase>
     <class>Custom_Script</class>
     <always_exec>true</always_exec>
-    <desc>Set CPU to idle state, set kernel parameters to default values</desc>
+    <desc>Inactivate carriers on VVDN RU</desc>
     <node>cacofonix</node>
-    <script>yaml_files/sa_fhi_7.2_vvdn_gnb/setup_cleanup.sh</script>
+    <script>scripts/vvdn-inactivate-carriers.sh</script>
   </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml

@@ -104,7 +104,7 @@
     <node>matix</node>
     <yaml_path>ci-scripts/yaml_files/5g_sa_n310_2x2_100MHz</yaml_path>
     <analysis>
-      <services>oai-gnb=RetxCheck=dl=10,100,100,100;ul=25,100,100,100 oai-gnb=EndsWithBye</services>
+      <services>oai-gnb=EndsWithBye</services>
     </analysis>
   </testCase>
 

ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml

@@ -104,7 +104,7 @@
     <node>matix</node>
     <yaml_path>ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz</yaml_path>
     <analysis>
-      <services>oai-gnb=RetxCheck=dl=15,100,100,100;ul=20,100,100,100 oai-gnb=EndsWithBye</services>
+      <services>oai-gnb=EndsWithBye</services>
     </analysis>
   </testCase>
 

ci-scripts/xml_files/container_sa_n310_4X4_60MHz_quectel.xml

@@ -104,7 +104,7 @@
     <node>matix</node>
     <yaml_path>ci-scripts/yaml_files/5g_sa_n310_4x4_60MHz</yaml_path>
     <analysis>
-      <services>oai-vnf=RetxCheck=10,100,100,100 oai-vnf=EndsWithBye oai-pnf=EndsWithBye</services>
+      <services>oai-vnf=EndsWithBye oai-pnf=EndsWithBye</services>
     </analysis>
   </testCase>
 

ci-scripts/xml_files/cppcheck.xml

@@ -1,20 +0,0 @@
-<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
-
-<testCaseList>
-  <htmlTabRef>build-tab</htmlTabRef>
-  <htmlTabName>CPPCHECK Analysis</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
-
-  <testCase>
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>carabe</node>
-  </testCase>
-
-  <testCase>
-    <class>Cppcheck_Analysis</class>
-    <desc>Static Code Analysis with cppcheck</desc>
-    <node>carabe</node>
-  </testCase>
-
-</testCaseList>

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

@@ -166,7 +166,7 @@ services:
             retries: 5
 
     trf_gen:
-        image: oaisoftwarealliance/trf-gen-cn5g:focal
+        image: oaisoftwarealliance/trf-gen-cn5g:latest
         privileged: true
         container_name: l2sim4g-trf-gen
         networks:

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

@@ -166,7 +166,7 @@ services:
             retries: 5
 
     trf_gen:
-        image: oaisoftwarealliance/trf-gen-cn5g:focal
+        image: oaisoftwarealliance/trf-gen-cn5g:latest
         privileged: true
         container_name: rfsim4g-trf-gen
         networks:

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

@@ -166,7 +166,7 @@ services:
             retries: 5
 
     trf_gen:
-        image: oaisoftwarealliance/trf-gen-cn5g:focal
+        image: oaisoftwarealliance/trf-gen-cn5g:latest
         privileged: true
         container_name: rfsim4g-trf-gen
         networks:

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

@@ -166,7 +166,7 @@ services:
             retries: 5
 
     trf_gen:
-        image: oaisoftwarealliance/trf-gen-cn5g:focal
+        image: oaisoftwarealliance/trf-gen-cn5g:latest
         privileged: true
         container_name: rfsim4g-trf-gen
         networks:

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

@@ -166,7 +166,7 @@ services:
             retries: 5
 
     trf_gen:
-        image: oaisoftwarealliance/trf-gen-cn5g:focal
+        image: oaisoftwarealliance/trf-gen-cn5g:latest
         privileged: true
         container_name: rfsim4g-trf-gen
         networks:

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

@@ -3,7 +3,7 @@
 services:
     mysql:
         container_name: "rfsim5g-mysql"
-        image: mysql:8.0
+        image: mysql:9.6
         init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
@@ -26,7 +26,7 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.1.10
+        image: oaisoftwarealliance/oai-amf:v2.2.1
         environment:
             - TZ=Europe/paris
         volumes:
@@ -38,7 +38,7 @@ services:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.1.10
+        image: oaisoftwarealliance/oai-smf:v2.2.1
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -50,7 +50,7 @@ services:
                 ipv4_address: 192.168.71.133
     oai-upf:
         container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.1.10
+        image: oaisoftwarealliance/oai-upf:v2.2.1
         init: true
         environment:
             - TZ=Europe/Paris
@@ -75,7 +75,7 @@ services:
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:focal
+        image: oaisoftwarealliance/trf-gen-cn5g:latest
         init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\

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

@@ -3,7 +3,7 @@
 services:
     mysql:
         container_name: "rfsim5g-mysql"
-        image: mysql:8.0
+        image: mysql:9.6
         init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
@@ -26,7 +26,7 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.1.10
+        image: oaisoftwarealliance/oai-amf:v2.2.1
         environment:
             - TZ=Europe/paris
         volumes:
@@ -38,7 +38,7 @@ services:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.1.10
+        image: oaisoftwarealliance/oai-smf:v2.2.1
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -50,7 +50,7 @@ services:
                 ipv4_address: 192.168.71.133
     oai-upf:
         container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.1.10
+        image: oaisoftwarealliance/oai-upf:v2.2.1
         init: true
         environment:
             - TZ=Europe/Paris
@@ -74,7 +74,7 @@ services:
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:focal
+        image: oaisoftwarealliance/trf-gen-cn5g:latest
         init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\

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

@@ -38,11 +38,11 @@ Password:
 Now pull images.
 
 ```bash
-$ docker pull mysql:8.0
-$ docker pull oaisoftwarealliance/oai-amf:v2.1.10
-$ docker pull oaisoftwarealliance/oai-smf:v2.1.10
-$ docker pull oaisoftwarealliance/oai-upf:v2.1.10
-$ docker pull oaisoftwarealliance/trf-gen-cn5g:focal
+$ docker pull mysql:9.6
+$ docker pull oaisoftwarealliance/oai-amf:v2.2.1
+$ docker pull oaisoftwarealliance/oai-smf:v2.2.1
+$ docker pull oaisoftwarealliance/oai-upf:v2.2.1
+$ docker pull oaisoftwarealliance/trf-gen-cn5g:latest
 
 $ docker pull oaisoftwarealliance/oai-gnb:develop
 $ docker pull oaisoftwarealliance/oai-nr-ue:develop
@@ -570,7 +570,7 @@ runs the gnb service with modified gNB executable.
 ```bash
 docker compose -f docker-compose.yaml -f local-override.yaml up -d oai-gnb
 ```
-This command rebuilds both the gNB & nrUE and runs the oai-nr-ue container with 
+This command rebuilds both the gNB & nrUE and runs the oai-nr-ue container with
 modified nrUE executable.
 ```bash
 docker compose -f docker-compose.yaml -f local-override.yaml up -d oai-nr-ue

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

@@ -3,7 +3,7 @@
 services:
     mysql:
         container_name: "rfsim5g-mysql"
-        image: mysql:8.0
+        image: mysql:9.6
         init: true
         volumes:
             - ./oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
@@ -26,7 +26,7 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.1.10
+        image: oaisoftwarealliance/oai-amf:v2.2.1
         environment:
             - TZ=Europe/paris
         volumes:
@@ -38,7 +38,7 @@ services:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.1.10
+        image: oaisoftwarealliance/oai-smf:v2.2.1
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -50,7 +50,7 @@ services:
                 ipv4_address: 192.168.71.133
     oai-upf:
         container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.1.10
+        image: oaisoftwarealliance/oai-upf:v2.2.1
         init: true
         environment:
             - TZ=Europe/Paris
@@ -74,7 +74,7 @@ services:
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:focal
+        image: oaisoftwarealliance/trf-gen-cn5g:latest
         init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\

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

@@ -3,7 +3,7 @@
 services:
     mysql:
         container_name: "rfsim5g-mysql"
-        image: mysql:8.0
+        image: mysql:9.6
         init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
@@ -26,7 +26,7 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.1.10
+        image: oaisoftwarealliance/oai-amf:v2.2.1
         environment:
             - TZ=Europe/paris
         volumes:
@@ -38,7 +38,7 @@ services:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.1.10
+        image: oaisoftwarealliance/oai-smf:v2.2.1
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -50,7 +50,7 @@ services:
                 ipv4_address: 192.168.71.133
     oai-upf:
         container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.1.10
+        image: oaisoftwarealliance/oai-upf:v2.2.1
         init: true
         environment:
             - TZ=Europe/Paris
@@ -74,7 +74,7 @@ services:
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:focal
+        image: oaisoftwarealliance/trf-gen-cn5g:latest
         init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\

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

@@ -3,7 +3,7 @@
 services:
     mysql:
         container_name: "rfsim5g-mysql"
-        image: mysql:8.0
+        image: mysql:9.6
         init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
@@ -26,7 +26,7 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.1.10
+        image: oaisoftwarealliance/oai-amf:v2.2.1
         environment:
             - TZ=Europe/paris
         volumes:
@@ -38,7 +38,7 @@ services:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.1.10
+        image: oaisoftwarealliance/oai-smf:v2.2.1
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -50,7 +50,7 @@ services:
                 ipv4_address: 192.168.71.133
     oai-upf:
         container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.1.10
+        image: oaisoftwarealliance/oai-upf:v2.2.1
         init: true
         environment:
             - TZ=Europe/Paris
@@ -74,7 +74,7 @@ services:
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:focal
+        image: oaisoftwarealliance/trf-gen-cn5g:latest
         init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\

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

@@ -3,7 +3,7 @@
 services:
     mysql:
         container_name: "rfsim5g-mysql"
-        image: mysql:8.0
+        image: mysql:9.6
         init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
@@ -26,7 +26,7 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.1.10
+        image: oaisoftwarealliance/oai-amf:v2.2.1
         environment:
             - TZ=Europe/paris
         volumes:
@@ -38,7 +38,7 @@ services:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.1.10
+        image: oaisoftwarealliance/oai-smf:v2.2.1
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -50,7 +50,7 @@ services:
                 ipv4_address: 192.168.71.133
     oai-upf:
         container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.1.10
+        image: oaisoftwarealliance/oai-upf:v2.2.1
         init: true
         environment:
             - TZ=Europe/Paris

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

@@ -3,7 +3,7 @@
 services:
     mysql:
         container_name: "rfsim5g-mysql"
-        image: mysql:8.0
+        image: mysql:9.6
         init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
@@ -26,7 +26,7 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.1.10
+        image: oaisoftwarealliance/oai-amf:v2.2.1
         environment:
             - TZ=Europe/paris
         volumes:
@@ -38,7 +38,7 @@ services:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.1.10
+        image: oaisoftwarealliance/oai-smf:v2.2.1
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -50,7 +50,7 @@ services:
                 ipv4_address: 192.168.71.133
     oai-upf:
         container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.1.10
+        image: oaisoftwarealliance/oai-upf:v2.2.1
         init: true
         environment:
             - TZ=Europe/Paris
@@ -74,7 +74,7 @@ services:
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:focal
+        image: oaisoftwarealliance/trf-gen-cn5g:latest
         init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\

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

@@ -3,7 +3,7 @@
 services:
     mysql:
         container_name: "rfsim5g-mysql"
-        image: mysql:8.0
+        image: mysql:9.6
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
             - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
@@ -23,7 +23,7 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.1.10
+        image: oaisoftwarealliance/oai-amf:v2.2.1
         environment:
             - TZ=Europe/paris
         volumes:
@@ -35,7 +35,7 @@ services:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.1.10
+        image: oaisoftwarealliance/oai-smf:v2.2.1
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -47,7 +47,7 @@ services:
                 ipv4_address: 192.168.71.133
     oai-upf:
         container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.1.10
+        image: oaisoftwarealliance/oai-upf:v2.2.1
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -70,7 +70,7 @@ services:
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:focal
+        image: oaisoftwarealliance/trf-gen-cn5g:latest
         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"

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

@@ -3,7 +3,7 @@
 services:
     mysql:
         container_name: "rfsim5g-mysql"
-        image: mysql:8.0
+        image: mysql:9.6
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
             - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
@@ -23,7 +23,7 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:ci-tmp-pr-372-26c14bcd
+        image: oaisoftwarealliance/oai-amf:v2.2.1
         environment:
             - TZ=Europe/paris
         volumes:
@@ -35,7 +35,7 @@ services:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.1.9
+        image: oaisoftwarealliance/oai-smf:v2.2.1
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -47,7 +47,7 @@ services:
                 ipv4_address: 192.168.71.133
     oai-upf:
         container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.1.9
+        image: oaisoftwarealliance/oai-upf:v2.2.1
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -70,7 +70,7 @@ services:
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:focal
+        image: oaisoftwarealliance/trf-gen-cn5g:latest
         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"

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

@@ -3,7 +3,7 @@
 services:
     mysql:
         container_name: "rfsim5g-mysql"
-        image: mysql:8.0
+        image: mysql:9.6
         init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
@@ -26,7 +26,7 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.1.10
+        image: oaisoftwarealliance/oai-amf:v2.2.1
         environment:
             - TZ=Europe/paris
         volumes:
@@ -38,7 +38,7 @@ services:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.1.10
+        image: oaisoftwarealliance/oai-smf:v2.2.1
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -50,7 +50,7 @@ services:
                 ipv4_address: 192.168.71.133
     oai-upf:
         container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.1.10
+        image: oaisoftwarealliance/oai-upf:v2.2.1
         init: true
         environment:
             - TZ=Europe/Paris
@@ -74,7 +74,7 @@ services:
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:focal
+        image: oaisoftwarealliance/trf-gen-cn5g:latest
         init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\

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

@@ -3,7 +3,7 @@
 services:
     mysql:
         container_name: "rfsim5g-mysql"
-        image: mysql:8.0
+        image: mysql:9.6
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
             - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
@@ -25,7 +25,7 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.1.10
+        image: oaisoftwarealliance/oai-amf:v2.2.1
         environment:
             - TZ=Europe/paris
         volumes:
@@ -37,7 +37,7 @@ services:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.1.10
+        image: oaisoftwarealliance/oai-smf:v2.2.1
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -49,7 +49,7 @@ services:
                 ipv4_address: 192.168.71.133
     oai-upf:
         container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.1.10
+        image: oaisoftwarealliance/oai-upf:v2.2.1
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -72,7 +72,7 @@ services:
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:focal
+        image: oaisoftwarealliance/trf-gen-cn5g:latest
         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"

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

@@ -3,7 +3,7 @@
 services:
     mysql:
         container_name: "rfsim5g-mysql"
-        image: mysql:8.0
+        image: mysql:9.6
         init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
@@ -26,7 +26,7 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.1.10
+        image: oaisoftwarealliance/oai-amf:v2.2.1
         environment:
             - TZ=Europe/paris
         volumes:
@@ -38,7 +38,7 @@ services:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.1.10
+        image: oaisoftwarealliance/oai-smf:v2.2.1
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -50,7 +50,7 @@ services:
                 ipv4_address: 192.168.71.133
     oai-upf:
         container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.1.10
+        image: oaisoftwarealliance/oai-upf:v2.2.1
         init: true
         environment:
             - TZ=Europe/Paris
@@ -74,7 +74,7 @@ services:
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:focal
+        image: oaisoftwarealliance/trf-gen-cn5g:latest
         init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\

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

@@ -3,7 +3,7 @@
 services:
     mysql:
         container_name: "rfsim5g-mysql"
-        image: mysql:8.0
+        image: mysql:9.6
         init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
@@ -26,7 +26,7 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.1.10
+        image: oaisoftwarealliance/oai-amf:v2.2.1
         environment:
             - TZ=Europe/paris
         volumes:
@@ -38,7 +38,7 @@ services:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.1.10
+        image: oaisoftwarealliance/oai-smf:v2.2.1
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -50,7 +50,7 @@ services:
                 ipv4_address: 192.168.71.133
     oai-upf:
         container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.1.10
+        image: oaisoftwarealliance/oai-upf:v2.2.1
         init: true
         environment:
             - TZ=Europe/Paris

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

@@ -12,7 +12,7 @@ services:
 
     mysql:
         container_name: "rfsim5g-mysql"
-        image: mysql:8.0
+        image: mysql:9.6
         init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
@@ -36,7 +36,7 @@ services:
 
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.1.10
+        image: oaisoftwarealliance/oai-amf:v2.2.1
         environment:
             - TZ=Europe/paris
         volumes:
@@ -49,7 +49,7 @@ services:
 
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.1.10
+        image: oaisoftwarealliance/oai-smf:v2.2.1
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -62,7 +62,7 @@ services:
 
     oai-upf:
         container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.1.10
+        image: oaisoftwarealliance/oai-upf:v2.2.1
         init: true
         environment:
             - TZ=Europe/Paris

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

@@ -12,7 +12,7 @@ services:
 
     mysql:
         container_name: "rfsim5g-mysql"
-        image: mysql:8.0
+        image: mysql:9.6
         init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
@@ -36,7 +36,7 @@ services:
 
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.1.10
+        image: oaisoftwarealliance/oai-amf:v2.2.1
         environment:
             - TZ=Europe/paris
         volumes:
@@ -49,7 +49,7 @@ services:
 
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.1.10
+        image: oaisoftwarealliance/oai-smf:v2.2.1
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -62,7 +62,7 @@ services:
 
     oai-upf:
         container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.1.10
+        image: oaisoftwarealliance/oai-upf:v2.2.1
         init: true
         environment:
             - TZ=Europe/Paris

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

@@ -0,0 +1,162 @@
+# SPDX-License-Identifier: MIT
+
+services:
+    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"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            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:focal
+        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"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+    ocudu-gnb:
+        image: ghcr.io/bpodrygajlo/ocudu/ocudu-avx2:7cecca5
+        container_name: ocudu-gnb
+        cap_drop:
+            - ALL
+        cap_add:
+            - SYS_NICE
+        depends_on:
+            - oai-ext-dn
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.140
+        volumes:
+            - ./ocudu.yml:/ocudu.yml
+        healthcheck:
+            test: /bin/bash -c "pgrep gnb_split_8"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+        command: ./usr/local/bin/gnb_split_8 -c /ocudu.yml
+
+    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  # for interface bringup
+            - NET_RAW    # for ping
+            - SYS_NICE
+        environment:
+            USE_ADDITIONAL_OPTIONS: -r 51 --numerology 1 --band 78 -C 3489420000 --ssb 0 -E --uicc0.imsi 208990100001100 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --log_config.global_log_options level,nocolor,time --device.name oai_zmqdevif --zmq.[0].tx_channels tcp://0.0.0.0:4556 --zmq.[0].rx_channels tcp://192.168.71.140:4558
+        depends_on:
+            - ocudu-gnb
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.150
+        devices:
+             - /dev/net/tun:/dev/net/tun
+        volumes:
+            - ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports1.xml:/opt/oai-nr-ue/etc/uecap.xml
+            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-uesoftmodem"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+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"

ci-scripts/yaml_files/5g_zmq_radio_1x1_ocudu/ocudu.yml

@@ -0,0 +1,52 @@
+# SPDX-FileCopyrightText: Copyright (C) 2021-2026 Software Radio Systems Limited
+# SPDX-License-Identifier: BSD-3-Clause-Open-MPI
+# Refer to https://gitlab.com/ocudu/ocudu/-/raw/dev/LICENSE?ref_type=heads
+
+cu_cp:
+  amf:
+    addrs: 192.168.71.132
+    port: 38412
+    bind_addrs: 192.168.71.140
+    supported_tracking_areas:
+      - tac: 1
+        plmn_list:
+          - plmn: "20899"
+            tai_slice_support_list:
+              - sst: 1
+
+ru_sdr:
+  device_driver: zmq
+  device_args: tx_port=tcp://0.0.0.0:4558,rx_port=tcp://192.168.71.150:4556
+  srate: 23.04
+  tx_gain: 25
+  rx_gain: 25
+
+cell_cfg:
+  dl_arfcn: 632628
+  band: 78
+  channel_bandwidth_MHz: 20
+  common_scs: 30
+  plmn: "20899"
+  tac: 1
+  pci: 1
+  tdd_ul_dl_cfg:
+    dl_ul_tx_period: 5
+    nof_dl_slots: 3
+    nof_dl_symbols: 10
+    nof_ul_slots: 1
+    nof_ul_symbols: 2
+  csi:
+    csi_rs_enabled: false
+  pucch:
+    formats: f0_and_f2
+    nof_cell_csi_res: 0
+
+log:
+  filename: gnb.log
+  all_level: debug
+
+pcap:
+  mac_enable: false
+  mac_filename: /tmp/gnb_mac.pcap
+  ngap_enable: false
+  ngap_filename: /tmp/gnb_ngap.pcap

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

@@ -0,0 +1,164 @@
+# SPDX-License-Identifier: MIT
+
+services:
+    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"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            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:focal
+        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"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+    oai-gnb:
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        container_name: rfsim5g-oai-gnb
+        cap_drop:
+            - ALL
+        cap_add:
+            - SYS_NICE
+        environment:
+            USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time --device.name oai_zmqdevif --zmq.[0].tx_channels tcp://0.0.0.0:4558,tcp://0.0.0.0:4559 --zmq.[0].rx_channels tcp://oai-nr-ue:4556,tcp://oai-nr-ue:4557
+            ASAN_OPTIONS: detect_leaks=0
+        depends_on:
+            - oai-ext-dn
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.140
+        volumes:
+            - ../../conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf:/opt/oai-gnb/etc/gnb.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-softmodem"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    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  # for interface bringup
+            - NET_RAW    # for ping
+            - SYS_NICE
+        environment:
+            USE_ADDITIONAL_OPTIONS: -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 --log_config.global_log_options level,nocolor,time --device.name oai_zmqdevif --zmq.[0].tx_channels tcp://0.0.0.0:4556,tcp://0.0.0.0:4557 --zmq.[0].rx_channels tcp://oai-gnb:4558,tcp://oai-gnb:4559
+        depends_on:
+            - oai-gnb
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.150
+        devices:
+             - /dev/net/tun:/dev/net/tun
+        volumes:
+            - ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports2.xml:/opt/oai-nr-ue/etc/uecap.xml
+            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-uesoftmodem"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+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"

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

@@ -0,0 +1,162 @@
+# SPDX-License-Identifier: MIT
+
+services:
+    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"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            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:focal
+        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"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+    ocudu-gnb:
+        image: ghcr.io/bpodrygajlo/ocudu/ocudu-avx2:7cecca5
+        container_name: ocudu-gnb
+        cap_drop:
+            - ALL
+        cap_add:
+            - SYS_NICE
+        depends_on:
+            - oai-ext-dn
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.140
+        volumes:
+            - ./ocudu.yml:/ocudu.yml
+        healthcheck:
+            test: /bin/bash -c "pgrep gnb_split_8"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+        command: ./usr/local/bin/gnb_split_8 -c /ocudu.yml
+
+    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  # for interface bringup
+            - NET_RAW    # for ping
+            - SYS_NICE
+        environment:
+            USE_ADDITIONAL_OPTIONS: -r 106 --numerology 1 --band 78 -C 3489420000 --ssb 42 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --log_config.global_log_options level,nocolor,time --device.name oai_zmqdevif --zmq.[0].tx_channels tcp://0.0.0.0:4556,tcp://0.0.0.0:4557 --zmq.[0].rx_channels tcp://192.168.71.140:4558,tcp://192.168.71.140:4559
+        depends_on:
+            - ocudu-gnb
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.150
+        devices:
+             - /dev/net/tun:/dev/net/tun
+        volumes:
+            - ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports2.xml:/opt/oai-nr-ue/etc/uecap.xml
+            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-uesoftmodem"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+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"

ci-scripts/yaml_files/5g_zmq_radio_2x2_ocudu/ocudu.yml

@@ -0,0 +1,54 @@
+# SPDX-FileCopyrightText: Copyright (C) 2021-2026 Software Radio Systems Limited
+# SPDX-License-Identifier: BSD-3-Clause-Open-MPI
+# Refer to https://gitlab.com/ocudu/ocudu/-/raw/dev/LICENSE?ref_type=heads
+
+cu_cp:
+  amf:
+    addrs: 192.168.71.132
+    port: 38412
+    bind_addrs: 192.168.71.140
+    supported_tracking_areas:
+      - tac: 1
+        plmn_list:
+          - plmn: "20899"
+            tai_slice_support_list:
+              - sst: 1
+
+ru_sdr:
+  device_driver: zmq
+  device_args: tx_port=tcp://0.0.0.0:4558,tx_port=tcp://0.0.0.0:4559,rx_port=tcp://192.168.71.150:4556,rx_port=tcp://192.168.71.150:4557
+  srate: 61.44
+  tx_gain: 25
+  rx_gain: 25
+
+cell_cfg:
+  dl_arfcn: 632628
+  band: 78
+  channel_bandwidth_MHz: 40
+  common_scs: 30
+  plmn: "20899"
+  tac: 1
+  pci: 1
+  nof_antennas_ul: 2
+  nof_antennas_dl: 2
+  tdd_ul_dl_cfg:
+    dl_ul_tx_period: 5
+    nof_dl_slots: 3
+    nof_dl_symbols: 10
+    nof_ul_slots: 1
+    nof_ul_symbols: 2
+  csi:
+    csi_rs_enabled: false
+  pucch:
+    formats: f0_and_f2
+    nof_cell_csi_res: 0
+
+log:
+  filename: gnb.log
+  all_level: debug
+
+pcap:
+  mac_enable: false
+  mac_filename: /tmp/gnb_mac.pcap
+  ngap_enable: false
+  ngap_filename: /tmp/gnb_ngap.pcap

ci-scripts/yaml_files/fr1_epc_20897/docker-compose.yml

@@ -184,7 +184,7 @@ services:
             retries: 5
 
     trf_gen:
-        image: oaisoftwarealliance/trf-gen-cn5g:focal
+        image: oaisoftwarealliance/trf-gen-cn5g:latest
         privileged: true
         container_name: prod-trf-gen
         networks:

ci-scripts/yaml_files/magma_lte_20892/docker-compose.yml

@@ -168,7 +168,7 @@ services:
             retries: 5
 
     trf_gen:
-        image: oaisoftwarealliance/trf-gen-cn5g:focal
+        image: oaisoftwarealliance/trf-gen-cn5g:latest
         privileged: true
         container_name: prod-trf-gen
         networks:

ci-scripts/yaml_files/magma_nsa_20897/docker-compose.yml

@@ -168,7 +168,7 @@ services:
             retries: 5
 
     trf_gen:
-        image: oaisoftwarealliance/trf-gen-cn5g:focal
+        image: oaisoftwarealliance/trf-gen-cn5g:latest
         privileged: true
         container_name: prod-trf-gen
         networks:

ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb/setup_cleanup.sh

@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-set -e
-sudo cpupower idle-set -E > /dev/null
-sudo sysctl kernel.sched_rt_runtime_us=950000
-sudo sysctl kernel.timer_migration=1
-exit 0

ci-scripts/yaml_files/sa_sc_b200_gnb/docker-compose.yml

@@ -17,7 +17,7 @@ services:
         devices:
             - /dev/bus/usb/:/dev/bus/usb/
         volumes:
-            - ../../conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf:/opt/oai-gnb/etc/gnb.conf
+            - ../../conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma-deltaMCS.conf:/opt/oai-gnb/etc/gnb.conf
         # for performance reasons, we use host mode: in bridge mode, we have
         # unacceptable DL TCP performance. However, the whole point of
         # containerization is to not be in host mode, so update this to macvlan

cmake_targets/build_oai

@@ -4,8 +4,6 @@
 # file build_oai
 # brief OAI automated build tool that can be used to install, compile, run OAI.
 
-set -e
-
 # Include helper functions
 THIS_SCRIPT_PATH=$(dirname $(readlink -f "$0"))
 source "$THIS_SCRIPT_PATH"/tools/build_helper
@@ -45,6 +43,8 @@ Options:
    Sets build directory (will be <oai-root>/cmake_targets/<build-dir>/build)
 --build-e2
    Enable the the E2 Agent
+--build-e3
+   Enable the the E3 Agent
 -I | --install-external-packages
    Installs required packages such as LibXML, asn1.1 compiler, ...
    This option will require root password
@@ -70,7 +70,7 @@ Options:
 --UE-conf-nvram [configuration file]
    Specify conf_nvram_path (default \"$conf_nvram_path\")
 -w | --hardware
-   USRP, BLADERF, LMSSDR, IRIS, SIMU, AW2SORI, AERIAL, None (Default)
+   USRP, BLADERF, LMSSDR, IRIS, SIMU, AW2SORI, AERIAL, ZMQ, None (Default)
    Adds this RF board support (in external packages installation and in compilation)
 -t | --transport
    Selects the transport protocol type, options: None, Ethernet, oran_fhlib_5g, oran_fhlib_5g_mplane, WLS
@@ -132,16 +132,9 @@ function main() {
        --build-tool-opt)
             BUILD_TOOL_OPT+=" $2"
             shift 2;;
-       -c | --clean)
+       -c | --clean | -C | --clean-all)
             CLEAN=1
             shift;;
-       -C | --clean-all)
-            CLEAN_ALL=1
-            shift;;
-       --clean-kernel)
-            clean_kernel
-            echo_info "Erased iptables config and removed modules from kernel"
-            shift;;
        --cmake-opt)
             CMAKE_CMD="$CMAKE_CMD $2"
             shift 2;;
@@ -152,6 +145,10 @@ function main() {
              CMAKE_CMD="$CMAKE_CMD -DE2_AGENT=ON"
              shift
              ;;
+       --build-e3 )
+             CMAKE_CMD="$CMAKE_CMD -DE3_AGENT=ON"
+             shift
+             ;;
        -I | --install-external-packages)
             INSTALL_EXTERNAL=1
             echo_info "Will install external packages"
@@ -232,7 +229,7 @@ function main() {
             shift 2;;
        -w | --hardware)
             case "$2" in
-                "USRP" | "BLADERF" | "LMSSDR" | "IRIS")
+                "USRP" | "BLADERF" | "LMSSDR" | "IRIS" | "ZMQ")
                     HWs+=" OAI_"$2
                     TARGET_LIST="$TARGET_LIST oai_${2,,}devif" # ,, makes lowercase
                     CMAKE_CMD="$CMAKE_CMD -DOAI_$2=ON"
@@ -330,8 +327,8 @@ function main() {
               echo_info "Enabling build of all optional shared libraries ($OPTIONAL_LIBRARIES)" 
             else
               for reqlib in $2; do
-                lib=$(echo $OPTIONAL_LIBRARIES | tr ' ' '\n' | grep -w $reqlib) # search given parameter in list
-                [[ $? -ne 0 ]] && echo_fatal "Unknown optional library in $reqlib, valid libraries are $OPTIONAL_LIBRARIES"
+                lib=$(echo $OPTIONAL_LIBRARIES | tr ' ' '\n' | grep -w -- $reqlib) # search given parameter in list
+                [[ $? -ne 0 ]] && echo_fatal "Unknown optional library \"$reqlib\", valid libraries are: $OPTIONAL_LIBRARIES"
                 TARGET_LIST="$TARGET_LIST $lib" # will append the found library
                 CMAKE_CMD="$CMAKE_CMD -DENABLE_${lib^^}=ON"
                 echo_info "Enabling build of optional shared library $lib"
@@ -384,13 +381,8 @@ function main() {
 
   echo "OPENAIR_DIR    = $OPENAIR_DIR"
 
-  if [ "$CLEAN_ALL" = "1" ] ; then
-    clean_all_files
-    echo "Erased all previously producted files"
-  fi
-
-  dlog=$OPENAIR_DIR/cmake_targets/log
-  mkdir -p $dlog
+  DIR=$OPENAIR_DIR/cmake_targets
+  [ "$CLEAN" = "1" ] && rm -rf "$DIR/$BUILD_DIR"
 
   if [ "$INSTALL_EXTERNAL" = "1" ] ; then
     echo_info "Installing packages"
@@ -423,10 +415,6 @@ function main() {
     check_install_additional_tools
   fi
 
-  DIR=$OPENAIR_DIR/cmake_targets
-
-  [ "$CLEAN" = "1" ] && rm -rf $DIR/$BUILD_DIR/build
-
   if [[ $TARGET_LIST != "" ]] && [[ -f $OPENAIR_DIR/CMakeLists.txt ]]; then
     # add some default libraries that should always be built
     # for eNB, gNB, UEs, simulators
@@ -441,11 +429,10 @@ function main() {
     # e.g., cmake_targets/ran_build/build, hence the ../../..
     CMAKE_CMD="$CMAKE_CMD ../../.."
     echo_info "Running \"$CMAKE_CMD\""
-    eval $CMAKE_CMD
+    eval $CMAKE_CMD || echo_fatal "cmake configuration failed"
     cmd="$CMAKE --build . --target ${TARGET_LIST} -- ${BUILD_TOOL_OPT}"
     echo_info "Running \"${cmd}\"" $green
-    eval $cmd
-    ret=$?
+    eval $cmd || echo_fatal "build failed"
 
     if [ "$UE" = 1 ] ; then
       echo_info "Generate LTE USIM default sim content UE specific part"

cmake_targets/macros.cmake

@@ -83,8 +83,8 @@ function(run_asn1c ASN1C_GRAMMAR ASN1C_PREFIX)
   get_filename_component(GRAMMAR_FILE ${ASN1C_GRAMMAR} NAME)
   set(LOGFILE "${CMAKE_CURRENT_BINARY_DIR}/${GRAMMAR_FILE}.log")
   add_custom_command(OUTPUT ${ASN1C_OUTPUT}
-    COMMAND ASN1C_PREFIX=${ASN1C_PREFIX} ${ASN1C_EXEC} ${ASN1C_OPTIONS} -D ${CMAKE_CURRENT_BINARY_DIR} ${ASN1C_GRAMMAR} > ${LOGFILE} 2>&1 || cat ${LOGFILE}
-    DEPENDS ${ASN1C_GRAMMAR}
+    COMMAND ASN1C_PREFIX=${ASN1C_PREFIX} ${ASN1C_EXEC} ${ASN1C_OPTIONS} -D ${CMAKE_CURRENT_BINARY_DIR} ${ASN1C_GRAMMAR} > ${LOGFILE} 2>&1 || ( cat ${LOGFILE} && false )
+    DEPENDS ${ASN1C_GRAMMAR} asn1c
     COMMENT "Generating ${ASN1C_COMMENT} from ${GRAMMAR_FILE}"
   )
 endfunction()

cmake_targets/tools/MODULES/Findxran.cmake

@@ -4,9 +4,9 @@
 # -------
 # 
 # Finds the xran library. Note that the library number is as follows:
-# - oran_bronze_release_v1.1 -> 2.1.1 (B = second letter)
-# - oran_e_maintenance_release_v1.0 -> 5.1.0
-# the version is currently hardcoded to 5.1.0
+# - oran_e_maintenance_release_v1.5 -> 5.1.6
+# - oran_f_release_v1.3 -> 6.1.4
+# - oran_k_release_v1.1 -> 11.1.1
 #
 # Required options
 # ^^^^^^^^^^^^^^^^
@@ -46,13 +46,7 @@
 # ``xran_LIBRARY``
 #   The path to the xran library.
 
-option(xran_LOCATION "directory of XRAN library" "")
-if (NOT xran_LOCATION)
-  message(FATAL_ERROR "xran_LOCATION required")
-endif()
-if (NOT EXISTS ${xran_LOCATION})
-  message(FATAL_ERROR "no such directory: ${xran_LOCATION}")
-endif()
+set(CACHE{xran_LOCATION} TYPE PATH HELP "directory of XRAN library" VALUE "")
 
 find_path(xran_INCLUDE_DIR
   NAMES
@@ -73,27 +67,26 @@ find_library(xran_LIBRARY
   PATH_SUFFIXES build api
   NO_DEFAULT_PATH
 )
-if (NOT xran_LIBRARY)
-  message(FATAL_ERROR "could not detect xran build artifacts at ${xran_LOCATION}/build")
-endif()
 
 set(xran_VERSION_FILE "${xran_LOCATION}/../app/src/common.h")
-if(NOT EXISTS ${xran_VERSION_FILE})
-  message(FATAL_ERROR "could not find xran version file at ${xran_VERSION_FILE}")
+if(EXISTS ${xran_VERSION_FILE})
+  file(STRINGS ${xran_VERSION_FILE} xran_VERSION_LINE REGEX "^#define[ \t]+VERSIONX[ \t]+\"[a-z_.0-9]+\"$")
+else()
+  set(xran_VERSION_LINE "UNKNOWN")
 endif()
 
-file(STRINGS ${xran_VERSION_FILE} xran_VERSION_LINE REGEX "^#define[ \t]+VERSIONX[ \t]+\"[a-z_.0-9]+\"$")
 string(REGEX REPLACE "^#define[ \t]+VERSIONX[ \t]+\"([a-z_.0-9]+)\"$" "\\1" xran_VERSION_STRING "${xran_VERSION_LINE}")
 if (xran_VERSION_STRING MATCHES "^oran_e_maintenance_release_v")
   string(REGEX REPLACE "oran_e_maintenance_release_v([0-9]+).([0-9]+)" "5.\\1.\\2" xran_VERSION ${xran_VERSION_STRING})
 elseif(xran_VERSION_STRING MATCHES "^oran_f_release_v")
   string(REGEX REPLACE "oran_f_release_v([0-9]+).([0-9]+)" "6.\\1.\\2" xran_VERSION ${xran_VERSION_STRING})
+elseif(xran_VERSION_STRING MATCHES "^oran_k_release_v")
+  string(REGEX REPLACE "oran_k_release_v([0-9]+).([0-9]+)" "11.\\1.\\2" xran_VERSION ${xran_VERSION_STRING})
 elseif(xran_VERSION_STRING MATCHES "^oran_bronze_release_v")
   string(REGEX REPLACE "oran_bronze_release_v([0-9]+).([0-9]+)" "2.\\1.\\2" xran_VERSION ${xran_VERSION_STRING})
 else()
-  message(FATAL_ERROR "unrecognized xran version string: ${xran_VERSION_STRING}")
+  set(xran_VERSION "UNKNOWN")
 endif()
-message(STATUS "Found xran release ${xran_VERSION_STRING} (v${xran_VERSION})")
 unset(xran_VERSION_LINE)
 unset(xran_VERSION_STRING)
 unset(xran_VERSION_FILE)

cmake_targets/tools/build_helper

@@ -120,32 +120,6 @@ handler_EXIT() {
 
 trap handler_EXIT EXIT
 
-###########################
-# Cleaners
-###########################
-
-clean_kernel() {
-    $SUDO modprobe ip_tables
-    $SUDO modprobe x_tables
-    $SUDO iptables -P INPUT ACCEPT
-    $SUDO iptables -F INPUT
-    $SUDO iptables -P OUTPUT ACCEPT
-    $SUDO iptables -F OUTPUT
-    $SUDO iptables -P FORWARD ACCEPT
-    $SUDO iptables -F FORWARD
-    $SUDO iptables -t nat -F
-    $SUDO iptables -t mangle -F
-    $SUDO iptables -t filter -F
-    $SUDO iptables -t raw -F
-    echo_info "Flushed iptables"
-}
-
-clean_all_files() {
- set_openair_env
- dir=$OPENAIR_DIR/cmake_targets
- rm -rf $dir/ran_build $dir/ran_build_noLOG
-}
-
 ############################################
 # External packages installers
 ############################################

common/config/config_common.c

@@ -133,7 +133,7 @@ int config_setdefault_int64(configmodule_interface_t *cfg, paramdef_t *cfgoption
   return status;
 }
 
-int config_setdefault_intlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix)
+int config_setdefault_intlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions)
 {
   int status = 0;
 
@@ -193,7 +193,7 @@ int config_setdefault_stringlist(configmodule_interface_t *cfg, paramdef_t *cfgo
   return status;
 }
 
-int config_setdefault_double(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix)
+int config_setdefault_double(configmodule_interface_t *cfg, paramdef_t *cfgoptions)
 {
   int status = 0;
   config_check_valptr(cfg, cfgoptions, sizeof(*cfgoptions->dblptr), 1);
@@ -229,7 +229,7 @@ int config_assign_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions
   return 0;
 }
 
-int config_setdefault_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix)
+int config_setdefault_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions)
 {
   int status = 0;
 
@@ -333,13 +333,13 @@ int config_common_getdefault(configmodule_interface_t *cfg, paramdef_t *cfgoptio
 
     case TYPE_UINTARRAY:
     case TYPE_INTARRAY:
-      return config_setdefault_intlist(cfg, cfgoption, prefix);
+      return config_setdefault_intlist(cfg, cfgoption);
 
     case TYPE_DOUBLE:
-      return config_setdefault_double(cfg, cfgoption, prefix);
+      return config_setdefault_double(cfg, cfgoption);
 
     case TYPE_IPV4ADDR:
-      return config_setdefault_ipv4addr(cfg, cfgoption, prefix);
+      return config_setdefault_ipv4addr(cfg, cfgoption);
 
     case TYPE_LIST:
       // No default value for list type

common/config/config_common.h

@@ -20,11 +20,11 @@ void config_check_valptr(configmodule_interface_t *cfg, paramdef_t *cfgoptions,
 /* functions to set a parameter to its default value */
 int config_setdefault_int(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix);
 int config_setdefault_int64(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix);
-int config_setdefault_intlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix);
+int config_setdefault_intlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions);
 int config_setdefault_string(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix);
 int config_setdefault_stringlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix);
-int config_setdefault_double(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix);
-int config_setdefault_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix);
+int config_setdefault_double(configmodule_interface_t *cfg, paramdef_t *cfgoptions);
+int config_setdefault_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions);
 void *config_allocate_new(configmodule_interface_t *cfg, int sz, bool autoFree);
 void config_assign_int(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *fullname, int val);
 int config_common_getdefault(configmodule_interface_t *cfg, paramdef_t *cfgoption, const char *prefix);

common/config/config_load_configmodule.c

@@ -123,6 +123,10 @@ int config_cmdlineonly_getlist(configmodule_interface_t *cfg,
                                int numparams,
                                const char *prefix)
 {
+  UNUSED(cfg);
+  UNUSED(params);
+  UNUSED(numparams);
+  UNUSED(prefix);
   ParamList->numelt = 0;
   return 0;
 }
@@ -162,15 +166,15 @@ int config_cmdlineonly_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions
 
       case TYPE_UINTARRAY:
       case TYPE_INTARRAY:
-        defval = config_setdefault_intlist(cfg, &cfgoptions[i], prefix);
+        defval = config_setdefault_intlist(cfg, &cfgoptions[i]);
         break;
 
       case TYPE_DOUBLE:
-        defval = config_setdefault_double(cfg, &cfgoptions[i], prefix);
+        defval = config_setdefault_double(cfg, &cfgoptions[i]);
         break;
 
       case TYPE_IPV4ADDR:
-        defval = config_setdefault_ipv4addr(cfg, &cfgoptions[i], prefix);
+        defval = config_setdefault_ipv4addr(cfg, &cfgoptions[i]);
         break;
 
       default:
@@ -278,12 +282,9 @@ configmodule_interface_t *load_configmodule(int argc,
       cfgmode = strdup(CONFIG_LIBCONFIGFILE);
     }
   }
-  static configmodule_interface_t *cfgptr = NULL;
-  if (cfgptr)
-    fprintf(stderr, "ERROR: Call load_configmodule more than one time\n");
 
   // The macros are not thread safe print_params and similar
-  cfgptr = calloc(sizeof(configmodule_interface_t), 1);
+  configmodule_interface_t *cfgptr = calloc(sizeof(configmodule_interface_t), 1);
   if (!cfgptr) {
     fprintf(stderr, "ERROR: cannot allocate a memory for configuration\n");
     return NULL;

common/config/config_load_configmodule.h

@@ -10,6 +10,9 @@
 #ifndef INCLUDE_CONFIG_LOADCONFIGMODULE_H
 #define INCLUDE_CONFIG_LOADCONFIGMODULE_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #include <string.h>
 #include <stdlib.h>
@@ -117,5 +120,8 @@ void write_parsedcfg(configmodule_interface_t *cfg);
 extern void free_configmodule(void);
 #define CONFIG_PRINTF_ERROR(f, x... ) if (isLogInitDone ()) { LOG_E(ENB_APP,f,x);} else {printf(f,x);}; if ( !CONFIG_ISFLAGSET(CONFIG_NOABORTONCHKF) ) exit_fun("exit because configuration failed\n");
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif  /* INCLUDE_CONFIG_LOADCONFIGMODULE_H */

common/config/config_paramdesc.h

@@ -48,8 +48,8 @@ typedef union checkedparam {
     int num_okintval;                                            /* number of valid values in the checkingval array */
   } s1a;
   struct {
-    int (*f2)(configmodule_interface_t *cfg,
-              paramdef_t *param); /* check an integer against an authorized range, defined by its min and max value */
+    int (*f2)(const configmodule_interface_t *cfg,
+              const paramdef_t *param); /* check an integer against an authorized range, defined by its min and max value */
     int okintrange[CONFIG_MAX_NUMCHECKVAL];  /* integer array, store  min and max values  */
 
   } s2;
@@ -181,6 +181,11 @@ typedef struct paramdef {
   {                                                                                                                          \
     OPTNAME(name), HELPSTR(help), PARAMFLAG(flags), .u64ptr = ptr, .defuintval = defval, PARAMTYPE(TYPE_UINT64), .numelt = 0 \
   }
+#define STRINGLISTPARAM(name, help, flags, ptr, defval)                                                                 \
+  {                                                                                                                     \
+    OPTNAME(name), HELPSTR(help), PARAMFLAG(flags), .strptr = ptr, .defstrlistval = defval, PARAMTYPE(TYPE_STRINGLIST), \
+        .numelt = 0                                                                                                     \
+  }
 
 typedef struct paramlist_def {
   char listname[MAX_OPTNAME_SIZE];

common/config/config_userapi.c

@@ -177,19 +177,41 @@ void print_intvalueerror(paramdef_t *param, char *fname, int *okval, int numokva
 
 int config_check_intval(configmodule_interface_t *cfg, paramdef_t *param)
 {
+  UNUSED(cfg);
   if ( param == NULL ) {
     fprintf(stderr,"[CONFIG] config_check_intval: NULL param argument\n");
     return -1;
   }
 
-  for ( int i=0; i<param->chkPptr->s1.num_okintval ; i++) {
-    if( *(param->uptr) == param->chkPptr->s1.okintval[i] ) {
-      return 0;
+  if (param->type == TYPE_INT32 || param->type == TYPE_INT) {
+    if (param->iptr == NULL) {
+      fprintf(stderr, "[CONFIG] config_check_intval: %s: NULL iptr\n", param->optname);
+      return -1;
     }
+    const int v = *param->iptr;
+    for (int i = 0; i < param->chkPptr->s1.num_okintval; i++) {
+      if (v == param->chkPptr->s1.okintval[i])
+        return 0;
+    }
+    fprintf(stderr, "[CONFIG] config_check_intval: %s: %i invalid value, authorized values:\n       ", param->optname, v);
+    for (int i = 0; i < param->chkPptr->s1.num_okintval; i++) {
+      fprintf(stderr, " %i", param->chkPptr->s1.okintval[i]);
+    }
+    fprintf(stderr, " \n");
+    return -1;
+  } else {
+    if (param->uptr == NULL) {
+      fprintf(stderr, "[CONFIG] config_check_intval: %s: NULL uptr\n", param->optname);
+      return -1;
+    }
+    for (int i = 0; i < param->chkPptr->s1.num_okintval; i++) {
+      if (*(param->uptr) == (uint32_t)param->chkPptr->s1.okintval[i]) {
+        return 0;
+      }
+    }
+    print_intvalueerror(param, "config_check_intval", param->chkPptr->s1.okintval, param->chkPptr->s1.num_okintval);
+    return -1;
   }
-
-  print_intvalueerror(param,"config_check_intval", param->chkPptr->s1.okintval,param->chkPptr->s1.num_okintval);
-  return -1;
 }
 
 int config_check_modify_integer(configmodule_interface_t *cfg, paramdef_t *param)
@@ -210,14 +232,38 @@ int config_check_modify_integer(configmodule_interface_t *cfg, paramdef_t *param
   return -1;
 }
 
-int config_check_intrange(configmodule_interface_t *cfg, paramdef_t *param)
+int config_check_intrange(const configmodule_interface_t *cfg, const paramdef_t *param)
 {
+  UNUSED(cfg);
   if( *(param->iptr) >= param->chkPptr->s2.okintrange[0]  && *(param->iptr) <= param->chkPptr->s2.okintrange[1]  ) {
     return 0;
   }
 
-  fprintf(stderr,"[CONFIG] config_check_intrange: %s: %i invalid value, authorized range: %i %i\n",
-          param->optname, (int)*(param->uptr), param->chkPptr->s2.okintrange[0], param->chkPptr->s2.okintrange[1]);
+  fprintf(stderr,
+          "[CONFIG] config_check_intrange: %s: %i invalid value, authorized range: %i %i\n",
+          param->optname,
+          (int)*(param->iptr),
+          param->chkPptr->s2.okintrange[0],
+          param->chkPptr->s2.okintrange[1]);
+  return -1;
+}
+
+int config_check_uintrange(const configmodule_interface_t *cfg, const paramdef_t *param)
+{
+  (void)cfg;
+  const uint32_t *v = param->uptr;
+  const int *range = param->chkPptr->s2.okintrange;
+
+  if (*v >= (uint32_t)range[0] && *v <= (uint32_t)range[1]) {
+    return 0;
+  }
+
+  fprintf(stderr,
+          "[CONFIG] config_check_uintrange: %s: %u invalid, authorized range: %i %i\n",
+          param->optname,
+          *v,
+          range[0],
+          range[1]);
   return -1;
 }
 
@@ -234,6 +280,7 @@ void print_strvalueerror(paramdef_t *param, char *fname, char **okval, int numok
 
 int config_check_strval(configmodule_interface_t *cfg, paramdef_t *param)
 {
+  UNUSED(cfg);
   if ( param == NULL ) {
     fprintf(stderr,"[CONFIG] config_check_strval: NULL param argument\n");
     return -1;

common/config/config_userapi.h

@@ -51,7 +51,8 @@ int config_get_processedint(configmodule_interface_t *cfg, paramdef_t *cfgoption
 /* functions to be used in parameters definition, to check parameters values */
 int config_check_intval(configmodule_interface_t *cfg, paramdef_t *param);
 int config_check_modify_integer(configmodule_interface_t *cfg, paramdef_t *param);
-int config_check_intrange(configmodule_interface_t *cfg, paramdef_t *param);
+int config_check_intrange(const configmodule_interface_t *cfg, const paramdef_t *param);
+int config_check_uintrange(const configmodule_interface_t *cfg, const paramdef_t *param);
 int config_check_strval(configmodule_interface_t *cfg, paramdef_t *param);
 int config_checkstr_assign_integer(configmodule_interface_t *cfg, paramdef_t *param);
 const paramdef_t *config_get_paramdef_from_name(const paramdef_t *pd, int num, const char *name);

common/config/yaml/config_yaml.cpp

@@ -158,6 +158,7 @@ extern "C" int config_yaml_init(configmodule_interface_t *cfg)
 
 extern "C" void config_yaml_end(configmodule_interface_t *cfg)
 {
+  UNUSED(cfg);
   delete config_yaml::config;
 }
 

common/platform_constants.h

@@ -66,7 +66,6 @@
 #define RETURNok (0)
 #define RETURNerror (-1)
 #define DEFAULT_NAS_PATH "PWD"
-#define UNUSED_VARIABLE(vARIABLE) (void)(vARIABLE)
 #define NUM_PRACH_RX_FOR_NOISE_ESTIMATE 100
 
 // SDAP

common/platform_types.h

@@ -241,6 +241,9 @@ typedef struct protocol_ctxt_s {
   bool brOption;
 } protocol_ctxt_t;
 
+/// suppress compiler warning for unused arguments
+#define UNUSED(x) (void)x;
+
 #define UE_MODULE_ID_TO_INSTANCE(mODULE_iD) mODULE_iD + RC.nb_inst
 #define ENB_MODULE_ID_TO_INSTANCE(mODULE_iD) mODULE_iD
 #define UE_INSTANCE_TO_MODULE_ID(iNSTANCE) iNSTANCE - RC.nb_inst

common/utils/CMakeLists.txt

@@ -16,7 +16,7 @@ add_subdirectory(nr)
 add_subdirectory(LOG)
 add_subdirectory(threadPool)
 add_subdirectory(time_manager)
-add_library(utils utils.c system.c time_meas.c time_stat.c tuntap_if.c reverse_bits.c)
+add_library(utils utils.c system.c time_meas.c time_stat.c tuntap_if.c bits.c fsn.c)
 target_include_directories(utils PUBLIC .)
 target_link_libraries(utils PRIVATE ${T_LIB})
 add_subdirectory(barrier)

common/utils/LOG/DOC/addconsoletrace.md

@@ -11,7 +11,7 @@ LOG_D(<component>,<format>,<argument>,...)
 LOG_T(<component>,<format>,<argument>,...)
 )
 ```
-these macros are used in place of the printf C function. The additionnal ***component*** parameter identifies the functionnal module which generates the message. At run time, the message will only be printed if the configured log level for the component is greater or equal than the macro level used in the code.
+these macros are used in place of the printf C function. The additionnal ***component*** parameter identifies the functional module which generates the message. At run time, the message will only be printed if the configured log level for the component is greater or equal than the macro level used in the code.
 
 | macro | level letter | level value | level name |
 |:---------|:---------------|:---------------|----------------:|

common/utils/LOG/log.c

@@ -519,13 +519,7 @@ void logTerm(void)
 }
 
 #include <sys/syscall.h>
-static inline int log_header(log_component_t *c,
-			     char *log_buffer,
-			     int buffsize,
-			     const char *file,
-			     const char *func,
-			     int line,
-			     int level)
+static inline int log_header(log_component_t *c, char *log_buffer, int buffsize, const char *func, int line, int level)
 {
   int flag = g_log->flag;
 
@@ -666,7 +660,7 @@ void log_dump(int component,
 
   if (wbuf != NULL) {
     va_start(args, format);
-    int pos=log_header(c, wbuf,MAX_LOG_TOTAL,"noFile","noFunc",0, OAILOG_INFO);
+    int pos = log_header(c, wbuf, MAX_LOG_TOTAL, "noFunc", 0, OAILOG_INFO);
     pos+=vsprintf(wbuf+pos,format, args);
     va_end(args);
 
@@ -875,6 +869,8 @@ void flush_mem_to_file(void)
 
 static void log_output_memory(log_component_t *c, const char *file, const char *func, int line, int comp, int level, const char* format,va_list args)
 {
+  UNUSED(comp);
+  UNUSED(file);
   //logRecord_mt(file,func,line, pthread_self(), comp, level, format, ##args)
   int len = 0;
   /* The main difference with the version above is the use of this local log_buffer.
@@ -887,7 +883,7 @@ static void log_output_memory(log_component_t *c, const char *file, const char *
 
   // make sure that for log trace the extra info is only printed once, reset when the level changes
   if (level < OAILOG_TRACE) {
-    int n = log_header(c, log_buffer+len, sizeof(log_buffer), file, func, line, level);
+    int n = log_header(c, log_buffer+len, sizeof(log_buffer), func, line, level);
     if (n > 0) {
       len += n;
       if (len > sizeof(log_buffer)) {

common/utils/LOG/log.h

@@ -155,6 +155,7 @@ static const char *const flag_name[] = {FOREACH_FLAG(FLAG_TEXT) ""};
   COMP_DEF(NFAPI_PNF, log)      \
   COMP_DEF(ITTI, log)           \
   COMP_DEF(UTIL, log)           \
+  COMP_DEF(E3AP, log)           \
   COMP_DEF(MAX_LOG_PREDEF_COMPONENTS, )
 
 #define COMP_ENUM(comp, file_extension) comp,

common/utils/T/CMakeLists.txt

@@ -55,7 +55,7 @@ add_dependencies(T_headers T_IDs.h generate_T)
 target_include_directories(T_headers INTERFACE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 
 if(T_TRACER)
-  add_library(T STATIC T.c local_tracer.c T_IDs.h T_messages.txt.h)
+  add_library(T STATIC T.c local_tracer.c T_messages_creator.c T_IDs.h T_messages.txt.h)
   target_link_libraries(T PUBLIC rt)
   target_link_libraries(T PRIVATE CONFIG_LIB T_headers)
 

common/utils/T/DOC/T.md

@@ -14,6 +14,7 @@ It is made of two main parts:
 
 * [Basic usage](./T/basic.md)
 * [Record](./T/record.md)
+* [Record to ClickHouse](./T/record_db.md)
 * [Replay](./T/replay.md)
 * [Multiple tracers](./T/multi.md)
 * [MAC PDUs and wireshark](./T/wireshark.md)

common/utils/T/DOC/T/basic.md

@@ -67,18 +67,26 @@ the T tracer and only output on the terminal). The default is
 
 ## Run a tracer
 
-Go into the directory `common/utils/T/tracer` (or
-`cmake_targets/ran_build/build/common/utils/T/tracer`) and run for example the
+Go into the directory `common/utils/T/tracer` and run for example the
 `enb` tracer:
 
 ```shell
+#in common/utils/T/tracer directory
 ./enb -d ../T_messages.txt
 ```
 
+You can also run it from `cmake_targets/ran_build/build/` directory:
+
+```shell
+# in cmake_targets/ran_build/build directory
+./common/utils/T/tracer/enb -d ../../../common/utils/T/T_messages.txt
+```
+
 To trace a remote program, use the `-ip` option. For example,
 if you want to trace a program running on `192.168.12.148` do:
 
 ```shell
+# in common/utils/T/tracer directory
 ./enb -d ../T_messages.txt -ip 192.168.12.148
 ```
 

common/utils/T/DOC/T/record_db.md

@@ -0,0 +1,181 @@
+<!-- SPDX-License-Identifier: CC-BY-4.0 -->
+
+# Record to ClickHouse
+
+This document describes the database-backed T tracer. Unlike [`record`](./record.md), 
+which writes a `.raw` file, `record_db` writes T tracer events 
+directly into a [ClickHouse database](https://clickhouse.com/docs/intro).
+
+## What `record_db` does
+
+`record_db` connects to a running OAI softmodem instance through 
+the standard T tracer TCP interface and:
+
+- Enables the selected events
+- Creates one ClickHouse table per enabled event
+- Batches received rows and inserts them into ClickHouse
+
+Each table always contains:
+
+- `TsSwNs`: software receive timestamp created by `record_db`
+
+If an event has both `frame` and `slot` (or `subframe`) fields, the
+tool also adds:
+
+- `TsTxUtcNs`: transmission timestamp reconstructed from frame/slot
+
+The remaining columns come from the event definition in
+`T_messages.txt`.
+
+## Build
+
+`record_db` pulls external dependencies (`clickhouse-cpp` and `fmtlog`).
+Also make sure you have `libzstd-dev` version > 1.5.X.
+
+From the repository using build_oai:
+
+```shell
+cd cmake_targets
+./build_oai --gNB --nrUE --cmake-opt -DT_RECORD_DB=ON
+```
+
+Or, from an existing build directory using cmake:
+
+```shell
+cd cmake_targets/ran_build/build
+cmake -DT_RECORD_DB=ON .
+# use make or ninja
+make T_tools
+```
+
+The binary is then available in:
+
+```shell
+cmake_targets/ran_build/build/common/utils/T/tracer/record_db
+```
+
+**NOTE*: Unlike other docs on T Tracer for `record_db` we are building in cmake 
+directory rather than in the directory of T.
+
+## Prerequisites
+
+- a running ClickHouse server reachable from `record_db`
+- an OAI softmodem started with T tracer enabled, typically with `--T_stdout 2`
+- the tracer message description file, usually `common/utils/T/T_messages.txt`
+
+By default `record_db` connects to:
+
+- T tracer endpoint: `127.0.0.1:2021`
+- ClickHouse native endpoint: `localhost:9000`
+- ClickHouse database: `oai`
+
+## Start the softmodem
+
+Start the gNB or UE with T tracer enabled as described in
+[basic usage](./basic.md). For example:
+
+```shell
+cd cmake_targets/ran_build/build
+sudo ./nr-softmodem -O <config-file> --T_stdout 2 --T_nowait
+```
+
+Use `--T_port <port>` on the softmodem side if you want a port other
+than `2021`, and pass the same value to `record_db` with `-p`.
+
+## Basic example
+
+To enable all events except the most verbose groups and write them to
+ClickHouse:
+
+```shell
+cd cmake_targets/ran_build/build/
+./common/utils/T/tracer/record_db -d ../../../common/utils/T/T_messages.txt \
+  -ON \
+  -off VCD \
+  -off HEAVY \
+  -off LEGACY_GROUP_TRACE \
+  -off LEGACY_GROUP_DEBUG
+```
+
+To stop recording, press `Ctrl-C`. The tool flushes pending buffered
+rows before exiting.
+
+## Select specific events
+
+The event selection rules are the same as for [`record`](./record.md):
+
+- `-ON` enables all events
+- `-OFF` disables all events
+- `-on <GROUP or ID>` enables one group or one event
+- `-off <GROUP or ID>` disables one group or one event
+
+These options are processed in order. For example:
+
+```shell
+./common/utils/T/tracer/record_db -d ../../../common/utils/T/T_messages.txt -OFF -on GNB_PHY_UL_FD_PUSCH_IQ -on GNB_PHY_UL_PAYLOAD_RX_BITS
+```
+
+This starts from everything disabled and enables only the two listed
+events.
+
+## ClickHouse options
+
+`record_db` accepts the following database-related options:
+
+```shell
+-ch-host <host>      ClickHouse host, default `localhost`
+-ch-port <port>      ClickHouse native port, default `9000`
+-ch-db <database>    database name, default `oai`
+-ch-user <user>      optional ClickHouse user
+-ch-pass <password>  optional ClickHouse password
+-ch-droptables       drop the target database before starting
+-debug               enable debug logging
+```
+
+Example using a remote ClickHouse instance:
+
+```shell
+./record_db -d ../T_messages.txt \
+  -ON -off HEAVY \
+  -ip 192.168.1.10 -p 2021 \
+  -ch-host 192.168.1.20 -ch-port 9000 -ch-db oai_traces
+```
+
+## Inspect the data
+
+Once `record_db` is running, connect to ClickHouse and inspect the
+generated tables:
+
+```shell
+clickhouse-client --host localhost --port 9000 --query "SHOW TABLES FROM oai"
+```
+
+Count rows in one event table:
+
+```shell
+clickhouse-client --host localhost --port 9000 --query "SELECT count(*) FROM oai.GNB_PHY_UL_FD_PUSCH_IQ"
+```
+
+Inspect the latest samples:
+
+```shell
+clickhouse-client --host localhost --port 9000 --query "SELECT * FROM oai.GNB_PHY_UL_FD_PUSCH_IQ ORDER BY TsSwNs DESC LIMIT 5"
+```
+
+## Important behavior
+
+- Tables are created only for enabled events.
+- Table names match the event names from `T_messages.txt`.
+- The current implementation creates tables with ClickHouse
+  `ENGINE = Memory()`.
+- Because of that engine choice, recorded data remains available while
+  ClickHouse is running, but is not persistent across a ClickHouse
+  restart.
+- If `-ch-droptables` is used, the whole target database is dropped and
+  recreated before capture starts.
+
+## Get the full option list
+
+```shell
+./record_db -h
+```

common/utils/T/T.c

@@ -89,6 +89,7 @@ static int get_message(int s)
 
 static void *T_receive_thread(void *_)
 {
+  UNUSED(_);
   int err = 0;
   while (!err) err = get_message(T_socket);
 

common/utils/T/T.h

@@ -115,7 +115,7 @@ extern int T_stdout;
 
 /* type used to send arbitrary buffer data */
 typedef struct {
-  void *addr;
+  const void *addr;
   int length;
 } T_buffer;
 

common/utils/T/T_messages.txt

@@ -118,23 +118,23 @@ ID = GNB_PHY_PUCCH_PUSCH_IQ
 ID = GNB_PHY_UL_FD_PUSCH_IQ
     DESC = gNodeB UL PUSCH IQ Data in the frequency domain
     GROUP = ALL:PHY:GRAPHIC:HEAVY:GNB
-    FORMAT = int,frame : int,slot : int,datetime_yyyymmdd : int,datetime_hhmmssmmm : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_rx : int,number_of_bits : buffer,data
+    FORMAT = int,frame : int,slot : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_rx : int,number_of_bits : buffer,data
 ID = GNB_PHY_UL_FD_DMRS
     DESC = gNodeB UL DMRS Signal in the frequency domain
     GROUP = ALL:PHY:GRAPHIC:HEAVY:GNB
-    FORMAT = int,frame : int,slot : int,datetime_yyyymmdd : int,datetime_hhmmssmmm : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_rx : int,number_of_bits : buffer,data
+    FORMAT = int,frame : int,slot : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_rx : int,number_of_bits : buffer,data
 ID = GNB_PHY_UL_FD_CHAN_EST_DMRS_POS
     DESC = gNodeB channel estimation in the frequency domain based on DMRS and at DMRS pilots location without any further interploation.
     GROUP = ALL:PHY:GRAPHIC:HEAVY:GNB
-    FORMAT = int,frame : int,slot : int,datetime_yyyymmdd : int,datetime_hhmmssmmm : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_rx : int,number_of_bits : buffer,data
+    FORMAT = int,frame : int,slot : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_rx : int,number_of_bits : buffer,data
 ID = GNB_PHY_UL_FD_CHAN_EST_DMRS_INTERPL
     DESC = gNodeB channel estimation in the frequency domain based on DMRS and interploation.
     GROUP = ALL:PHY:GRAPHIC:HEAVY:GNB
-    FORMAT = int,frame : int,slot : int,datetime_yyyymmdd : int,datetime_hhmmssmmm : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_rx : int,number_of_bits : buffer,dataI
+    FORMAT = int,frame : int,slot : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_rx : int,number_of_bits : buffer,dataI
 ID = GNB_PHY_UL_PAYLOAD_RX_BITS
     DESC = gNodeB slot payload after decoder
     GROUP = ALL:PHY:GRAPHIC:HEAVY:GNB
-    FORMAT = int,frame : int,slot : int,datetime_yyyymmdd : int,datetime_hhmmssmmm : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_rx : int,number_of_bits : buffer,data
+    FORMAT = int,frame : int,slot : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_rx : int,number_of_bits : buffer,data
 ID = GNB_PHY_UL_FREQ_CHANNEL_ESTIMATE
     DESC = gNodeB channel estimation in the frequency domain
     GROUP = ALL:PHY:GRAPHIC:HEAVY:GNB
@@ -159,6 +159,10 @@ ID = GNB_PHY_UL_SRS_TOA_NS
     DESC = gNB ToA estimate from SRS (in ns)
     GROUP = ALL:PHY:GNB
     FORMAT = int,gNB_ID : int,rnti : int,frame : int,subframe : buffer,toa_ns
+ID = GNB_PHY_UL_FREQ_SENSING_SYMBOL
+    DESC = gNodeB output data in the freq domain for sensing symbols
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:GNB
+    FORMAT = int,gNB_ID : int,frame : int,slot : int,antenna : buffer,rxdata
 
 #MAC logs
 ID = ENB_MAC_UE_DL_SDU
@@ -426,6 +430,27 @@ ID = LEGACY_MAC_TRACE
     GROUP = ALL:LEGACY_MAC:LEGACY_GROUP_TRACE:LEGACY
     FORMAT = string,log
 
+ID = LEGACY_E3AP_INFO
+     DESC = E3AP legacy logs - info level
+     GROUP = ALL:LEGACY_E3AP:LEGACY_GROUP_INFO:LEGACY
+     FORMAT = string,log
+ID = LEGACY_E3AP_ERROR
+    DESC = E3AP legacy logs - error level
+    GROUP = ALL:LEGACY_E3AP:LEGACY_GROUP_ERROR:LEGACY
+    FORMAT = string,log
+ID = LEGACY_E3AP_WARNING
+    DESC = E3AP legacy logs - warning level
+    GROUP = ALL:LEGACY_E3AP:LEGACY_GROUP_WARNING:LEGACY
+    FORMAT = string,log
+ID = LEGACY_E3AP_DEBUG
+     DESC = E3AP legacy logs - debug level
+     GROUP = ALL:LEGACY_E3AP:LEGACY_GROUP_DEBUG:LEGACY
+     FORMAT = string,log
+ID = LEGACY_E3AP_TRACE
+    DESC = E3AP legacy logs - trace level
+    GROUP = ALL:LEGACY_E3AP:LEGACY_GROUP_TRACE:LEGACY
+    FORMAT = string,log
+
 ID = LEGACY_NR_MAC_INFO
     DESC = NR_MAC legacy logs - info level
     GROUP = ALL:LEGACY_NR_MAC:LEGACY_GROUP_INFO:LEGACY
@@ -1474,11 +1499,11 @@ ID = UE_PHY_MEAS
 ID = UE_PHY_UL_PAYLOAD_TX_BITS
     DESC = UE UL Tx bits in one slot before decoder and scrambler
     GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,frame : int,slot : int,datetime_yyyymmdd : int,datetime_hhmmssmmm : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_tx : int,number_of_bits : buffer,data
+    FORMAT = int,frame : int,slot : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_tx : int,number_of_bits : buffer,data
 ID = UE_PHY_UL_SCRAMBLED_TX_BITS
     DESC = UE UL Tx bits in one slot after scrambler
     GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,frame : int,slot : int,datetime_yyyymmdd : int,datetime_hhmmssmmm : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_tx : int,number_of_bits : buffer,data
+    FORMAT = int,frame : int,slot : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_tx : int,number_of_bits : buffer,data
 
 #for debug/test - not used
 ID = first

common/utils/T/T_messages_creator.c

@@ -0,0 +1,220 @@
+/*
+ * SPDX-License-Identifier: LicenseRef-CSSL-1.0
+ */
+
+/*!
+ * \brief Helper functions for creating T-Tracer UL PHY trace messages, it is used by data recording application
+ */
+
+/*
+ * Each function logs one UL PHY trace message via the T() macro.
+ * All messages share the same field format (Data Collection Trace Messages Structure):
+ *   int,frame : int,slot :
+ *   int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot :
+ *   int,Nid_cell : int,rnti :
+ *   int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols :
+ *   int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers :
+ *   int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port :
+ *   int,dmrs_nscid : int,nb_antennas_rx : int,number_of_bits : buffer,data
+ */
+
+#include "T.h"
+#include "T_messages_creator.h"
+
+#if T_TRACER
+
+// Internal helper: emit the common UL metadata + buffer via T()
+// Note: The T() macro internally checks T_ACTIVE(trace_id) before sending,
+// so callers do not need an additional T_ACTIVE() guard.
+static inline void log_ul_common(int trace_id,
+                                 int frame,
+                                 int slot,
+                                 const NR_DL_FRAME_PARMS *frame_parms,
+                                 const nfapi_nr_pusch_pdu_t *rel15_ul,
+                                 int number_dmrs_symbols,
+                                 int dmrs_port,
+                                 int number_of_bits,
+                                 const void *data,
+                                 int data_len)
+{
+  T(trace_id,
+    T_INT((int)frame),
+    T_INT((int)slot),
+    T_INT((int)frame_parms->frame_type),
+    T_INT((int)frame_parms->freq_range),
+    T_INT((int)rel15_ul->subcarrier_spacing),
+    T_INT((int)rel15_ul->cyclic_prefix),
+    T_INT((int)frame_parms->symbols_per_slot),
+    T_INT((int)frame_parms->Nid_cell),
+    T_INT((int)rel15_ul->rnti),
+    T_INT((int)rel15_ul->rb_size),
+    T_INT((int)rel15_ul->rb_start),
+    T_INT((int)rel15_ul->start_symbol_index),
+    T_INT((int)rel15_ul->nr_of_symbols),
+    T_INT((int)rel15_ul->qam_mod_order),
+    T_INT((int)rel15_ul->mcs_index),
+    T_INT((int)rel15_ul->mcs_table),
+    T_INT((int)rel15_ul->nrOfLayers),
+    T_INT((int)rel15_ul->transform_precoding),
+    T_INT((int)rel15_ul->dmrs_config_type),
+    T_INT((int)rel15_ul->ul_dmrs_symb_pos),
+    T_INT((int)number_dmrs_symbols),
+    T_INT((int)dmrs_port),
+    T_INT((int)rel15_ul->scid),
+    T_INT((int)frame_parms->nb_antennas_rx),
+    T_INT((int)number_of_bits),
+    T_BUFFER(data, data_len));
+}
+
+void log_ul_fd_dmrs(int frame,
+                    int slot,
+                    const NR_DL_FRAME_PARMS *frame_parms,
+                    const nfapi_nr_pusch_pdu_t *rel15_ul,
+                    int number_dmrs_symbols,
+                    int dmrs_port,
+                    const c16_t *data,
+                    int data_len)
+{
+  log_ul_common(T_GNB_PHY_UL_FD_DMRS,
+                frame, slot, frame_parms, rel15_ul,
+                number_dmrs_symbols, dmrs_port, 0, data, data_len);
+}
+
+void log_ul_fd_chan_est_dmrs_pos(int frame,
+                                int slot,
+                                const NR_DL_FRAME_PARMS *frame_parms,
+                                const nfapi_nr_pusch_pdu_t *rel15_ul,
+                                int number_dmrs_symbols,
+                                int dmrs_port,
+                                const c16_t *data,
+                                int data_len)
+{
+  log_ul_common(T_GNB_PHY_UL_FD_CHAN_EST_DMRS_POS,
+                frame, slot, frame_parms, rel15_ul,
+                number_dmrs_symbols, dmrs_port, 0, data, data_len);
+}
+
+void log_ul_fd_pusch_iq(int frame,
+                        int slot,
+                        const NR_DL_FRAME_PARMS *frame_parms,
+                        const nfapi_nr_pusch_pdu_t *rel15_ul,
+                        int number_dmrs_symbols,
+                        int dmrs_port,
+                        const c16_t *data,
+                        int data_len)
+{
+  log_ul_common(T_GNB_PHY_UL_FD_PUSCH_IQ,
+                frame, slot, frame_parms, rel15_ul,
+                number_dmrs_symbols, dmrs_port, 0, data, data_len);
+}
+
+void log_ul_fd_chan_est_dmrs_interpl(int frame,
+                                    int slot,
+                                    const NR_DL_FRAME_PARMS *frame_parms,
+                                    const nfapi_nr_pusch_pdu_t *rel15_ul,
+                                    int number_dmrs_symbols,
+                                    int dmrs_port,
+                                    const c16_t *data,
+                                    int data_len)
+{
+  log_ul_common(T_GNB_PHY_UL_FD_CHAN_EST_DMRS_INTERPL,
+                frame, slot, frame_parms, rel15_ul,
+                number_dmrs_symbols, dmrs_port, 0, data, data_len);
+}
+
+void log_ul_payload_rx_bits(int frame,
+                           int slot,
+                           const NR_DL_FRAME_PARMS *frame_parms,
+                           const nfapi_nr_pusch_pdu_t *rel15_ul,
+                           int number_dmrs_symbols,
+                           int dmrs_port,
+                           const uint8_t *data,
+                           int tb_size)
+{
+  log_ul_common(T_GNB_PHY_UL_PAYLOAD_RX_BITS,
+                frame, slot, frame_parms, rel15_ul,
+                number_dmrs_symbols, dmrs_port,
+                tb_size << 3, data, tb_size);
+}
+
+// UE-side: uses nfapi_nr_ue_pusch_pdu_t, derives subcarrier_spacing index
+// from frame_parms, and logs nb_antennas_tx instead of nb_antennas_rx.
+void log_ul_payload_tx_bits(int frame,
+                           int slot,
+                           const NR_DL_FRAME_PARMS *frame_parms,
+                           const nfapi_nr_ue_pusch_pdu_t *pusch_pdu,
+                           int number_dmrs_symbols,
+                           int dmrs_port,
+                           const uint8_t *data,
+                           int tb_size)
+{
+  int subcarrier_spacing_index = frame_parms->subcarrier_spacing / 15000 - 1;
+  T(T_UE_PHY_UL_PAYLOAD_TX_BITS,
+    T_INT((int)frame),
+    T_INT((int)slot),
+    T_INT((int)frame_parms->frame_type),
+    T_INT((int)frame_parms->freq_range),
+    T_INT((int)subcarrier_spacing_index),
+    T_INT((int)pusch_pdu->cyclic_prefix),
+    T_INT((int)frame_parms->symbols_per_slot),
+    T_INT((int)frame_parms->Nid_cell),
+    T_INT((int)pusch_pdu->rnti),
+    T_INT((int)pusch_pdu->rb_size),
+    T_INT((int)pusch_pdu->rb_start),
+    T_INT((int)pusch_pdu->start_symbol_index),
+    T_INT((int)pusch_pdu->nr_of_symbols),
+    T_INT((int)pusch_pdu->qam_mod_order),
+    T_INT((int)pusch_pdu->mcs_index),
+    T_INT((int)pusch_pdu->mcs_table),
+    T_INT((int)pusch_pdu->nrOfLayers),
+    T_INT((int)pusch_pdu->transform_precoding),
+    T_INT((int)pusch_pdu->dmrs_config_type),
+    T_INT((int)pusch_pdu->ul_dmrs_symb_pos),
+    T_INT((int)number_dmrs_symbols),
+    T_INT((int)dmrs_port),
+    T_INT((int)pusch_pdu->scid),
+    T_INT((int)frame_parms->nb_antennas_tx),
+    T_INT((int)(tb_size << 3)),
+    T_BUFFER(data, tb_size));
+}
+
+void log_ul_scrambled_tx_bits(int frame,
+                             int slot,
+                             const NR_DL_FRAME_PARMS *frame_parms,
+                             const nfapi_nr_ue_pusch_pdu_t *pusch_pdu,
+                             int number_dmrs_symbols,
+                             int dmrs_port,
+                             const uint8_t *data,
+                             int number_of_bits)
+{
+  int subcarrier_spacing_index = frame_parms->subcarrier_spacing / 15000 - 1;
+  T(T_UE_PHY_UL_SCRAMBLED_TX_BITS,
+    T_INT((int)frame),
+    T_INT((int)slot),
+    T_INT((int)frame_parms->frame_type),
+    T_INT((int)frame_parms->freq_range),
+    T_INT((int)subcarrier_spacing_index),
+    T_INT((int)pusch_pdu->cyclic_prefix),
+    T_INT((int)frame_parms->symbols_per_slot),
+    T_INT((int)frame_parms->Nid_cell),
+    T_INT((int)pusch_pdu->rnti),
+    T_INT((int)pusch_pdu->rb_size),
+    T_INT((int)pusch_pdu->rb_start),
+    T_INT((int)pusch_pdu->start_symbol_index),
+    T_INT((int)pusch_pdu->nr_of_symbols),
+    T_INT((int)pusch_pdu->qam_mod_order),
+    T_INT((int)pusch_pdu->mcs_index),
+    T_INT((int)pusch_pdu->mcs_table),
+    T_INT((int)pusch_pdu->nrOfLayers),
+    T_INT((int)pusch_pdu->transform_precoding),
+    T_INT((int)pusch_pdu->dmrs_config_type),
+    T_INT((int)pusch_pdu->ul_dmrs_symb_pos),
+    T_INT((int)number_dmrs_symbols),
+    T_INT((int)dmrs_port),
+    T_INT((int)pusch_pdu->scid),
+    T_INT((int)frame_parms->nb_antennas_tx),
+    T_INT((int)number_of_bits),
+    T_BUFFER(data, number_of_bits / 8));
+}
+
+#endif /* T_TRACER */

common/utils/T/T_messages_creator.h

@@ -0,0 +1,195 @@
+/*
+ * SPDX-License-Identifier: LicenseRef-CSSL-1.0
+ */
+
+/*!
+ * \brief Helper functions for creating T-Tracer UL PHY trace messages, it is used by data recording application
+ */
+
+#ifndef T_MESSAGES_CREATOR_H
+#define T_MESSAGES_CREATOR_H
+
+#if T_TRACER
+
+#include <stdint.h>
+#include "common/platform_types.h"
+#include "common/utils/nr/nr_common.h"
+#include "PHY/defs_nr_common.h"
+#include "nfapi_nr_interface_scf.h"
+#include "fapi_nr_ue_interface.h"
+
+/**
+ * @brief Log PUSCH UL DMRS using T-Tracer
+ *
+ * This function creates and sends a T_GNB_PHY_UL_FD_DMRS message containing
+ * PUSCH DMRS symbols in frequency domain.
+ *
+ * @param frame Frame number
+ * @param slot Slot number
+ * @param frame_parms Pointer to frame parameters structure
+ * @param rel15_ul Pointer to PUSCH PDU structure
+ * @param number_dmrs_symbols Number of DMRS symbols
+ * @param dmrs_port DMRS port number
+ * @param data Pointer to DMRS data buffer (c16_t complex samples)
+ * @param data_len Size of the data buffer in bytes
+ */
+void log_ul_fd_dmrs(int frame,
+                    int slot,
+                    const NR_DL_FRAME_PARMS *frame_parms,
+                    const nfapi_nr_pusch_pdu_t *rel15_ul,
+                    int number_dmrs_symbols,
+                    int dmrs_port,
+                    const c16_t *data,
+                    int data_len);
+
+/**
+ * @brief Log PUSCH UL channel estimates at DMRS positions using T-Tracer
+ *
+ * This function creates and sends a T_GNB_PHY_UL_FD_CHAN_EST_DMRS_POS message
+ * containing channel estimates at DMRS positions in frequency domain.
+ *
+ * @param frame Frame number
+ * @param slot Slot number
+ * @param frame_parms Pointer to frame parameters structure
+ * @param rel15_ul Pointer to PUSCH PDU structure
+ * @param number_dmrs_symbols Number of DMRS symbols
+ * @param dmrs_port DMRS port number
+ * @param data Pointer to channel estimate data buffer (c16_t complex samples)
+ * @param data_len Size of the data buffer in bytes
+ */
+void log_ul_fd_chan_est_dmrs_pos(int frame,
+                                int slot,
+                                const NR_DL_FRAME_PARMS *frame_parms,
+                                const nfapi_nr_pusch_pdu_t *rel15_ul,
+                                int number_dmrs_symbols,
+                                int dmrs_port,
+                                const c16_t *data,
+                                int data_len);
+
+/**
+ * @brief Log PUSCH UL IQ data using T-Tracer
+ *
+ * This function creates and sends a T_GNB_PHY_UL_FD_PUSCH_IQ message
+ * containing PUSCH IQ samples in frequency domain.
+ *
+ * @param frame Frame number
+ * @param slot Slot number
+ * @param frame_parms Pointer to frame parameters structure
+ * @param rel15_ul Pointer to PUSCH PDU structure
+ * @param number_dmrs_symbols Number of DMRS symbols
+ * @param dmrs_port DMRS port number
+ * @param data Pointer to PUSCH IQ data buffer (c16_t complex samples)
+ * @param data_len Size of the data buffer in bytes
+ */
+void log_ul_fd_pusch_iq(int frame,
+                        int slot,
+                        const NR_DL_FRAME_PARMS *frame_parms,
+                        const nfapi_nr_pusch_pdu_t *rel15_ul,
+                        int number_dmrs_symbols,
+                        int dmrs_port,
+                        const c16_t *data,
+                        int data_len);
+
+/**
+ * @brief Log PUSCH UL interpolated channel estimates using T-Tracer
+ *
+ * This function creates and sends a T_GNB_PHY_UL_FD_CHAN_EST_DMRS_INTERPL message
+ * containing interpolated channel estimates across all subcarriers in frequency domain.
+ *
+ * @param frame Frame number
+ * @param slot Slot number
+ * @param frame_parms Pointer to frame parameters structure
+ * @param rel15_ul Pointer to PUSCH PDU structure
+ * @param number_dmrs_symbols Number of DMRS symbols
+ * @param dmrs_port DMRS port number
+ * @param data Pointer to interpolated channel estimate data buffer (c16_t complex samples)
+ * @param data_len Size of the data buffer in bytes
+ */
+void log_ul_fd_chan_est_dmrs_interpl(int frame,
+                                    int slot,
+                                    const NR_DL_FRAME_PARMS *frame_parms,
+                                    const nfapi_nr_pusch_pdu_t *rel15_ul,
+                                    int number_dmrs_symbols,
+                                    int dmrs_port,
+                                    const c16_t *data,
+                                    int data_len);
+
+/**
+ * @brief Log PUSCH UL received payload bits using T-Tracer
+ *
+ * This function creates and sends a T_GNB_PHY_UL_PAYLOAD_RX_BITS message
+ * containing the decoded transport block payload data.
+ *
+ * @param frame Frame number
+ * @param slot Slot number
+ * @param frame_parms Pointer to frame parameters structure
+ * @param rel15_ul Pointer to PUSCH PDU structure
+ * @param number_dmrs_symbols Number of DMRS symbols
+ * @param dmrs_port DMRS port number
+ * @param data Pointer to decoded transport block data (uint8_t bytes)
+ * @param tb_size Transport block size in bytes
+ */
+void log_ul_payload_rx_bits(int frame,
+                           int slot,
+                           const NR_DL_FRAME_PARMS *frame_parms,
+                           const nfapi_nr_pusch_pdu_t *rel15_ul,
+                           int number_dmrs_symbols,
+                           int dmrs_port,
+                           const uint8_t *data,
+                           int tb_size);
+
+/**
+ * @brief Log UE PUSCH UL transmitted payload bits using T-Tracer
+ *
+ * This function creates and sends a T_UE_PHY_UL_PAYLOAD_TX_BITS message
+ * containing the transport block payload data before encoding.
+ * Note: subcarrier_spacing is derived from frame_parms->subcarrier_spacing
+ * and nb_antennas_tx is used (UE transmit side).
+ *
+ * @param frame Frame number
+ * @param slot Slot number
+ * @param frame_parms Pointer to frame parameters structure
+ * @param pusch_pdu Pointer to UE PUSCH PDU structure
+ * @param number_dmrs_symbols Number of DMRS symbols
+ * @param dmrs_port DMRS port number
+ * @param data Pointer to transport block payload data (uint8_t bytes)
+ * @param tb_size Transport block size in bytes
+ */
+void log_ul_payload_tx_bits(int frame,
+                           int slot,
+                           const NR_DL_FRAME_PARMS *frame_parms,
+                           const nfapi_nr_ue_pusch_pdu_t *pusch_pdu,
+                           int number_dmrs_symbols,
+                           int dmrs_port,
+                           const uint8_t *data,
+                           int tb_size);
+
+/**
+ * @brief Log UE PUSCH UL scrambled transmit bits using T-Tracer
+ *
+ * This function creates and sends a T_UE_PHY_UL_SCRAMBLED_TX_BITS message
+ * containing the scrambled codeword bits after scrambling.
+ * Note: subcarrier_spacing is derived from frame_parms->subcarrier_spacing
+ * and nb_antennas_tx is used (UE transmit side).
+ *
+ * @param frame Frame number
+ * @param slot Slot number
+ * @param frame_parms Pointer to frame parameters structure
+ * @param pusch_pdu Pointer to UE PUSCH PDU structure
+ * @param number_dmrs_symbols Number of DMRS symbols
+ * @param dmrs_port DMRS port number
+ * @param data Pointer to scrambled codeword data (uint8_t bytes)
+ * @param number_of_bits Number of scrambled bits
+ */
+void log_ul_scrambled_tx_bits(int frame,
+                             int slot,
+                             const NR_DL_FRAME_PARMS *frame_parms,
+                             const nfapi_nr_ue_pusch_pdu_t *pusch_pdu,
+                             int number_dmrs_symbols,
+                             int dmrs_port,
+                             const uint8_t *data,
+                             int number_of_bits);
+
+#endif /* T_TRACER */
+
+#endif /* T_MESSAGES_CREATOR_H */

common/utils/T/check_vcd.c

@@ -27,6 +27,10 @@
  */
 void exit_function(const char *file, const char *function, const int line, const char *s, const int assert)
 {
+  UNUSED(file);
+  UNUSED(function);
+  UNUSED(line);
+  UNUSED(s);
   if (assert) {
     abort();
   } else {

common/utils/T/tracer/enb.c

@@ -428,7 +428,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database,
   for (i = 0; i < 8; i++)
     timeline_set_subline_background_color(g, timeline_plot, i,
         new_color(g, i==0 || i==4 ? "#aaf" : "#eee"));
-  timeview = new_view_time(3600, 10, g, timeline_plot);
+  timeview = new_view_time(10, g, timeline_plot);
   /* DL tick logging */
   timelog = new_timelog(h, database, "ENB_PHY_DL_TICK");
   subview = new_subview_time(timeview, 0, new_color(g, "#77c"), 3600*1000);

common/utils/T/tracer/filter/filter.c

@@ -41,6 +41,7 @@ int eval_eq(struct filter *f, event e)
 
 int eval_int(struct filter *f, event e)
 {
+  UNUSED(e);
   return f->v.v;
 }
 
@@ -152,9 +153,9 @@ filter *filter_evarg(void *database, char *event_name, char *varname)
   return ret;
 }
 
-filter *filter_evfun(void *database, int (*fun)(void *priv, int v),
-    void *priv, filter *x)
+filter *filter_evfun(void *database, int (*fun)(void *priv, int v), void *priv, filter *x)
 {
+  UNUSED(database);
   struct filter *ret = calloc(1, sizeof(struct filter));
   if (ret == NULL) abort();
   ret->eval = eval_evfun;

common/utils/T/tracer/filter/filter.h

@@ -13,11 +13,8 @@ filter *filter_and(filter *a, filter *b);
 filter *filter_eq(filter *a, filter *b);
 filter *filter_int(int v);
 filter *filter_evarg(void *database, char *event_name, char *varname);
-filter *filter_evfun(void *database, int (*fun)(void *priv, int v),
-    void *priv, filter *x);
-
+filter *filter_evfun(void *database, int (*fun)(void *priv, int v), void *priv, filter *x);
 int filter_eval(filter *f, event e);
-
 void free_filter(filter *f);
 
 #endif /* _FILTER_H_ */

common/utils/T/tracer/handler.c

@@ -52,8 +52,7 @@ event_handler *new_handler(void *database)
   return ret;
 }
 
-unsigned long register_handler_function(event_handler *_h, int event_id,
-    void (*f)(void *, event), void *p)
+unsigned long register_handler_function(event_handler *_h, int event_id, void (*f)(void *, event), void *p)
 {
   struct _event_handler *h = _h;
   unsigned long ret = h->next_id;
@@ -78,9 +77,11 @@ unsigned long register_handler_function(event_handler *_h, int event_id,
   return ret;
 }
 
-void remove_handler_function(event_handler *h, int event_id,
-    unsigned long handler_id)
+void remove_handler_function(event_handler *h, int event_id, unsigned long handler_id)
 {
+  UNUSED(h);
+  UNUSED(event_id);
+  UNUSED(handler_id);
   printf("%s:%d: TODO\n", __FILE__, __LINE__);
   abort();
 }

common/utils/T/tracer/handler.h

@@ -11,10 +11,7 @@ typedef void event_handler;
 
 event_handler *new_handler(void *database);
 void handle_event(event_handler *h, event e);
-
-unsigned long register_handler_function(event_handler *_h, int event_id,
-    void (*f)(void *, event), void *p);
-void remove_handler_function(event_handler *h, int event_id,
-    unsigned long handler_id);
+unsigned long register_handler_function(event_handler *_h, int event_id, void (*f)(void *, event), void *p);
+void remove_handler_function(event_handler *h, int event_id, unsigned long handler_id);
 
 #endif /* _HANDLER_H_ */

common/utils/T/tracer/logger/textlog.c

@@ -7,7 +7,7 @@
 #include "handler.h"
 #include "database.h"
 #include "view/view.h"
-#include "utils.h"
+#include "../utils.h"
 #include "filter/filter.h"
 #include <stdlib.h>
 #include <string.h>

common/utils/T/tracer/macpdu2wireshark.c

@@ -406,7 +406,7 @@ void sr(void *_d, event e)
 
 void trace_nr(struct timespec sending_time, ev_data *d, int direction,
         int rnti_type, int rnti, int frame, int slot, int harq_pid, void *buf,
-        int bufsize, int preamble)
+        int bufsize)
 {
   ssize_t ret;
   int i;
@@ -475,7 +475,7 @@ void nr_ul(void *_d, event e)
            NR_C_RNTI, e.e[d->nr_ul_rnti].i,
            e.e[d->nr_ul_frame].i, e.e[d->nr_ul_slot].i,
            e.e[d->nr_ul_harq_pid].i, e.e[d->nr_ul_data].b,
-           e.e[d->nr_ul_data].bsize, NO_PREAMBLE);
+           e.e[d->nr_ul_data].bsize);
 }
 
 void nr_dl(void *_d, event e)
@@ -494,7 +494,7 @@ void nr_dl(void *_d, event e)
            e.e[d->nr_dl_rnti].i != 0xffff ? NR_C_RNTI : NR_SI_RNTI,
            e.e[d->nr_dl_rnti].i, e.e[d->nr_dl_frame].i, e.e[d->nr_dl_slot].i,
            e.e[d->nr_dl_harq_pid].i, e.e[d->nr_dl_data].b,
-           e.e[d->nr_dl_data].bsize, NO_PREAMBLE);
+           e.e[d->nr_dl_data].bsize);
 }
 
 void nr_dl_retx(void *_d, event e)
@@ -505,7 +505,7 @@ void nr_dl_retx(void *_d, event e)
            NR_C_RNTI, e.e[d->nr_dl_retx_rnti].i,
            e.e[d->nr_dl_retx_frame].i, e.e[d->nr_dl_retx_slot].i,
            e.e[d->nr_dl_retx_harq_pid].i, e.e[d->nr_dl_retx_data].b,
-           e.e[d->nr_dl_retx_data].bsize, NO_PREAMBLE);
+           e.e[d->nr_dl_retx_data].bsize);
 }
 
 void nr_mib(void *_d, event e)
@@ -520,7 +520,7 @@ void nr_mib(void *_d, event e)
 
   trace_nr(e.sending_time, d, NR_DIRECTION_DOWNLINK, NR_NO_RNTI, 0,
            e.e[d->nr_mib_frame].i, e.e[d->nr_mib_slot].i, 0 /* harq pid */,
-           e.e[d->nr_mib_data].b, e.e[d->nr_mib_data].bsize, NO_PREAMBLE);
+           e.e[d->nr_mib_data].b, e.e[d->nr_mib_data].bsize);
 }
 
 void nr_ue_mib(void *_d, event e)
@@ -535,7 +535,7 @@ void nr_ue_mib(void *_d, event e)
 
   trace_nr(e.sending_time, d, NR_DIRECTION_DOWNLINK, NR_NO_RNTI, 0,
            e.e[d->nr_ue_mib_frame].i, e.e[d->nr_ue_mib_slot].i, 0 /* harq pid */,
-           e.e[d->nr_ue_mib_data].b, e.e[d->nr_ue_mib_data].bsize, NO_PREAMBLE);
+           e.e[d->nr_ue_mib_data].b, e.e[d->nr_ue_mib_data].bsize);
 }
 
 void nr_rar(void *_d, event e)
@@ -545,7 +545,7 @@ void nr_rar(void *_d, event e)
   trace_nr(e.sending_time, d, NR_DIRECTION_DOWNLINK,
            NR_RA_RNTI, e.e[d->nr_rar_rnti].i,
            e.e[d->nr_rar_frame].i, e.e[d->nr_rar_slot].i, 0 /* harq pid */,
-           e.e[d->nr_rar_data].b, e.e[d->nr_rar_data].bsize, NO_PREAMBLE);
+           e.e[d->nr_rar_data].b, e.e[d->nr_rar_data].bsize);
 }
 
 void nr_ue_ul(void *_d, event e)
@@ -556,7 +556,7 @@ void nr_ue_ul(void *_d, event e)
            NR_C_RNTI, e.e[d->nr_ue_ul_rnti].i,
            e.e[d->nr_ue_ul_frame].i, e.e[d->nr_ue_ul_slot].i,
            e.e[d->nr_ue_ul_harq_pid].i, e.e[d->nr_ue_ul_data].b,
-           e.e[d->nr_ue_ul_data].bsize, NO_PREAMBLE);
+           e.e[d->nr_ue_ul_data].bsize);
 }
 
 void nr_ue_dl(void *_d, event e)
@@ -575,7 +575,7 @@ void nr_ue_dl(void *_d, event e)
            e.e[d->nr_ue_dl_rnti].i != 0xffff ? NR_C_RNTI : NR_SI_RNTI,
            e.e[d->nr_ue_dl_rnti].i, e.e[d->nr_ue_dl_frame].i,
            e.e[d->nr_ue_dl_slot].i, e.e[d->nr_ue_dl_harq_pid].i,
-           e.e[d->nr_ue_dl_data].b, e.e[d->nr_ue_dl_data].bsize, NO_PREAMBLE);
+           e.e[d->nr_ue_dl_data].b, e.e[d->nr_ue_dl_data].bsize);
 }
 
 void nr_ue_rar(void *_d, event e)
@@ -584,8 +584,7 @@ void nr_ue_rar(void *_d, event e)
   trace_nr(e.sending_time, d, DIRECTION_DOWNLINK,
            RA_RNTI, e.e[d->nr_ue_rar_rnti].i,
            e.e[d->nr_ue_rar_frame].i, e.e[d->nr_ue_rar_slot].i, 0,
-           e.e[d->nr_ue_rar_data].b, e.e[d->nr_ue_rar_data].bsize,
-           NO_PREAMBLE);
+           e.e[d->nr_ue_rar_data].b, e.e[d->nr_ue_rar_data].bsize);
 }
 
 /****************************************************************************/
@@ -961,7 +960,7 @@ static int sock = -1;
 
 void force_stop(int x)
 {
-  printf("\ngently quit...\n");
+  printf("\ngently quit(%d)...\n", x);
   close(sock);
   sock = -1;
   run = 0;

common/utils/T/tracer/record.c

@@ -39,7 +39,7 @@ static int socket = -1;
 
 void force_stop(int x)
 {
-  printf("\ngently quit...\n");
+  printf("\ngently quit (%d)...\n", x);
   close(socket);
   socket = -1;
   run = 0;

common/utils/T/tracer/record_db.cpp

@@ -249,7 +249,7 @@ static int socket_fd = -1;
 
 void force_stop(int x)
 {
-  logi("gently quit...");
+  logi("gently quit %d", x);
   close(socket_fd);
   socket_fd = -1;
   run = 0;
@@ -785,12 +785,7 @@ uint8_t should_insert(EventBuffer &buf)
   return 0;
 }
 
-int insert_event(clickhouse_config_t *ch,
-                 void *database,
-                 int event_id,
-                 const char *event_data,
-                 int data_length,
-                 std::chrono::high_resolution_clock::time_point t_start)
+int insert_event(clickhouse_config_t *ch, int event_id, const char *event_data, int data_length)
 {
   auto t_fn_start = std::chrono::high_resolution_clock::now();
 
@@ -1270,14 +1265,12 @@ int main(int n, char **v)
     if (fullread(socket_fd, v + vpos, length) == -1)
       goto read_error;
 
-    auto t_start = std::chrono::high_resolution_clock::now();
-
     if (type == -1) {
       append_received_config_chunk(v + vpos, length);
     } else if (type == -2) {
       verify_config();
     } else if (type >= 0 && type < number_of_events && is_on[type]) {
-      if (insert_event(&ch_config, database, type, v + vpos, length, t_start) != 0) {
+      if (insert_event(&ch_config, type, v + vpos, length) != 0) {
         loge("Failed to insert event type {}", type);
       }
     }