assertion in case sn_FieldLength is absent at setup

improve handling of integrityProtAlgorithm, including rejecting the scenario where it is not present
fix potential segfaults according to issue #1049
2026-07-14 05:00:31 +00:00 · 2026-01-27 11:47:35 +01:00 · 2026-01-27 09:45:48 +01:00 · 2026-01-26 17:43:35 +01:00
788 changed files with 16677 additions and 24256 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -20,14 +20,6 @@ GRTAGS
 GTAGS
 tags

-# Package conffiles
-
-tools/packages/oai-lte/conffiles
-tools/packages/oai-nr/conffiles
-tools/packages/liboai-common/conffiles
-tools/packages/liboai-usrp/conffiles
-
-
 # others
 nfapi_nr_interface_scf
 *.log
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,39 +22,6 @@
 cmake_minimum_required (VERSION 3.16)
 project (OpenAirInterface LANGUAGES C CXX)
 set(CMAKE_CXX_STANDARD 17)
-set(OAI_VERSION 2.4.0)
-
-option(CUDA_ENABLE "Enable CUDA accelerated channel simulation" OFF)
-if(CUDA_ENABLE)
-    find_package(CUDA REQUIRED)
-    find_package(CUDAToolkit REQUIRED)
-    message(STATUS "CUDA explicitly enabled, building with GPU acceleration support.")
-
-    enable_language(CUDA)
-
-    if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
-        set(CMAKE_CUDA_ARCHITECTURES 90)
-    endif()
-
-    option(USE_UNIFIED_MEMORY "Enable CUDA Unified Memory path" OFF)
-    option(USE_ATS_MEMORY "Enable ATS Hybrid Memory path" ON)
-
-    if(USE_UNIFIED_MEMORY AND USE_ATS_MEMORY)
-        message(FATAL_ERROR "Cannot enable both USE_UNIFIED_MEMORY and USE_ATS_MEMORY at the same time.")
-    endif()
-
-    if(USE_UNIFIED_MEMORY)
-        add_compile_definitions(USE_UNIFIED_MEMORY)
-        message(STATUS "CUDA Unified Memory path enabled.")
-    elseif(USE_ATS_MEMORY)
-        add_compile_definitions(USE_ATS_MEMORY)
-        message(STATUS "CUDA ATS Hybrid Memory path enabled.")
-    else()
-        message(STATUS "CUDA Explicit Copy path enabled (default ATS was overridden).")
-    endif()
-
-    add_compile_definitions(ENABLE_CUDA)
-endif()

 #########################################################
 # Base directories, compatible with legacy OAI building #
@@ -94,15 +61,6 @@ endif()
 ###################################
 include(FindPkgConfig)

-
-option(PACKAGING_RPM "By default will create debian packages, with this option willl create rpm packages" OFF)
-option(PACKAGING_NR "Will produce a package containing nr target, configuration files and docs" OFF)
-option(PACKAGING_LTE "Will produce a package containing lte target, configuration files and docs" OFF)
-option(PACKAGING_COMMON "Will produce a package containing common target, configuration files and docs" OFF)
-option(PACKAGING_USRP "Will produce a package containing usrp target, configuration files and docs" OFF)
-option(PACKAGING_PHYSIM "Will produce a package containing physim target, configuration files and docs" OFF)
-
-
 # Check if asn1c is installed, and check if it supports all options we need
 # a user can provide ASN1C_EXEC to override an asn1c to use (e.g., parallel
 # installation)
@@ -129,6 +87,8 @@ set (NFAPI_USER_DIR  ${OPENAIR_DIR}/nfapi/oai_integration)
 set (OPENAIR1_DIR    ${OPENAIR_DIR}/openair1)
 set (OPENAIR2_DIR    ${OPENAIR_DIR}/openair2)
 set (OPENAIR3_DIR    ${OPENAIR_DIR}/openair3)
+set (OPENAIR3_DIR    ${OPENAIR_DIR}/openair3)
+set (OPENAIR_CMAKE   ${OPENAIR_DIR}/cmake_targets)

 project (OpenAirInterface)

@@ -198,8 +158,6 @@ elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -gdwarf-2 -mcpu=neoverse-n1  -lgcc -lrt")
  elseif (CPUPART MATCHES "0xd49") # Neoverse-N2
    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -gdwarf-2 -mcpu=neoverse-n2 -ftree-vectorize -lgcc -lrt")
-  elseif (CPUPART MATCHES "0xd03") # Cortex-A53
-    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -gdwarf-2 -mcpu=cortex-a53 -lgcc -lrt")
  else ()
    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -gdwarf-2 -mcpu=native -lgcc -lrt")
  endif()
@@ -208,12 +166,7 @@ else()
 endif()

 if (NOT CROSS_COMPILE)
-  if (CPUPART MATCHES "0xd03")
-    # Cortex-A53 does not support ARMv8.2-A extensions
-    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -march=armv8-a+simd")
-  else()
-    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -march=native")
-  endif()
+  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -march=native")
 else ()
  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -march=armv8.2-a")
 endif()
@@ -269,16 +222,9 @@ endif()

 add_definitions("-DASN_DISABLE_OER_SUPPORT -DHAVE_CONFIG_H -DHAVE_CONFIG_H_")

-set(CMAKE_SKIP_BUILD_RPATH FALSE)
-set(CMAKE_BUILD_RPATH ${CMAKE_CURRENT_BINARY_DIR})
-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-set(CMAKE_INSTALL_RPATH "")
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
-
-if(PACKAGING_LTE OR PACKAGING_NR OR PACKAGING_COMMON OR PACKAGING_USRP OR PACKAGING_PHYSIM)
-  set(CMAKE_SKIP_INSTALL_RPATH TRUE)
-endif()
-
+#########################
+set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -ggdb2 -Wl,-rpath -Wl,${CMAKE_CURRENT_BINARY_DIR}")
+#########################
 # set a flag for changes in the source code
 # these changes are related to hardcoded path to include .h files
 set(debugOpt "-ggdb2 -DMALLOC_CHECK_=3 -fno-delete-null-pointer-checks")
@@ -321,22 +267,6 @@ if(GIT_FOUND)
  )
 endif()

-option(USE_UNIFIED_MEMORY "Enable CUDA Unified Memory path instead of explicit copies" OFF)
-
-option(USE_ATS_MEMORY "Enable Hybrid ATS (CPU->GPU) and Explicit Copy (GPU->CPU) path" OFF)
-
-if(USE_UNIFIED_MEMORY AND USE_ATS_MEMORY)
-  message(FATAL_ERROR "Cannot enable both USE_UNIFIED_MEMORY and USE_ATS_MEMORY at the same time.")
-endif()
-
-if(USE_UNIFIED_MEMORY)
-  add_compile_definitions(USE_UNIFIED_MEMORY)
-  message(STATUS "CUDA Unified Memory path enabled.")
-elseif(USE_ATS_MEMORY)
-  add_compile_definitions(USE_ATS_MEMORY)
-  message(STATUS "CUDA ATS Hybrid Memory path enabled.")
-endif()
-
 # Debug related options
 #########################################
 # asn1c skeletons have hardcoded this flag to make customized debug logs
@@ -352,7 +282,7 @@ add_boolean_option(TRACY_ENABLE OFF "Enable tracy instrumentation" ON)
 if (TRACY_ENABLE)
  # the tracy version here should match the tracy server version
  # below is latest release as of this commit
-  CPMAddPackage("gh:wolfpld/tracy#v0.13.1")
+  CPMAddPackage("gh:wolfpld/tracy#0.12.2")
 endif()

 set (OCP_ITTI ${OPENAIR_DIR}/common/utils/ocp_itti)
@@ -397,7 +327,7 @@ target_link_libraries(lte_rrc PRIVATE nr_rrc)
 #NR RRC
 #######
 add_library(nr_rrc ${OPENAIR2_DIR}/RRC/NR/MESSAGES/asn1_msg.c)
-target_link_libraries(nr_rrc PUBLIC asn1_nr_rrc asn1_lte_rrc rrc_cell_management)
+target_link_libraries(nr_rrc PUBLIC asn1_nr_rrc asn1_lte_rrc)

 # S1AP
 ##############
@@ -434,9 +364,7 @@ add_library(ngap
  ${NGAP_DIR}/ngap_gNB_handlers.c
  ${NGAP_DIR}/ngap_gNB_itti_messaging.c
  ${NGAP_DIR}/ngap_gNB_management_procedures.c
-  ${NGAP_DIR}/ngap_gNB_paging.c
  ${NGAP_DIR}/ngap_gNB_nas_procedures.c
-  ${NGAP_DIR}/ngap_gNB_pdu_session_management.c
  ${NGAP_DIR}/ngap_gNB_nnsf.c
  ${NGAP_DIR}/ngap_gNB_overload.c
  ${NGAP_DIR}/ngap_gNB_trace.c
@@ -444,9 +372,6 @@ add_library(ngap
  )
 target_link_libraries(ngap PUBLIC asn1_ngap)
 target_link_libraries(ngap PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
-if(ENABLE_TESTS)
-  target_compile_definitions(ngap PRIVATE ENABLE_TESTS)
-endif()

 #M2AP
 ##############
@@ -537,7 +462,7 @@ add_library(f1ap
            ${F1AP_DIR}/f1ap_itti_messaging.c)
 target_include_directories(f1ap PUBLIC F1AP_DIR)
 target_link_libraries(f1ap PUBLIC asn1_f1ap GTPV1U)
-target_link_libraries(f1ap PRIVATE ngap nr_rrc ds f1ap_lib)
+target_link_libraries(f1ap PRIVATE ngap nr_rrc HASHTABLE f1ap_lib)
 target_include_directories(f1ap PRIVATE ${F1AP_DIR}/lib)
 if(E2_AGENT)
  target_compile_definitions(f1ap PRIVATE E2_AGENT)
@@ -549,10 +474,8 @@ endif()

 # Hardware dependant options
 ###################################
-set(NB_ANTENNAS_RX "4" CACHE STRING "Number of antennas in reception")
-set_property(CACHE NB_ANTENNAS_RX PROPERTY STRINGS "1" "2" "4" "8")
-set(NB_ANTENNAS_TX "4" CACHE STRING "Number of antennas in transmission")
-set_property(CACHE NB_ANTENNAS_TX PROPERTY STRINGS "1" "2" "4" "8")
+add_list1_option(NB_ANTENNAS_RX "4" "Number of antennas in reception" "1" "2" "4")
+add_list1_option(NB_ANTENNAS_TX "4" "Number of antennas in transmission" "1" "2" "4")

 set (CONFIG_ROOTDIR ${OPENAIR_DIR}/common/config)
 add_library(config_internals OBJECT
@@ -577,6 +500,8 @@ target_link_libraries(params_libconfig PRIVATE config_internals ${libconfig_LIBR
 add_library(shlib_loader OBJECT common/utils/load_module_shlib.c)
 target_link_libraries(shlib_loader PRIVATE CONFIG_LIB)

+include_directories ("${OPENAIR_DIR}/radio/COMMON")
+
 ##############################################################
 #    ???!!! TO BE DOCUMENTED OPTIONS !!!???
 ##############################################################
@@ -655,6 +580,7 @@ include_directories("${OPENAIR3_DIR}/S1AP")
 include_directories("${OPENAIR2_DIR}/X2AP")
 include_directories("${OPENAIR2_DIR}/M2AP")
 include_directories("${OPENAIR2_DIR}/F1AP")
+include_directories("${OPENAIR3_DIR}/ocp-gtpu")
 include_directories("${OPENAIR3_DIR}/M3AP")
 include_directories("${OPENAIR3_DIR}/MME_APP")
 include_directories("${OPENAIR_DIR}/radio/COMMON")
@@ -676,6 +602,12 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/common/utils/T
 # set the T_LIB name to T if the target exists, otherwise leave empty
 set(T_LIB $<TARGET_NAME_IF_EXISTS:T>)

+add_library(HASHTABLE
+  ${OPENAIR_DIR}/common/utils/hashtable/hashtable.c
+  ${OPENAIR_DIR}/common/utils/hashtable/obj_hashtable.c
+)
+include_directories(${OPENAIR_DIR}/common/utils/hashtable)
+
 add_library(UTIL
  ${OPENAIR_DIR}/common/utils/LOG/vcd_signal_dumper.c
  ${OPENAIR2_DIR}/UTIL/OPT/probe.c
@@ -833,6 +765,24 @@ include_directories(${NFAPI_USER_DIR})

 # Layer 1
 #############################
+set(PHY_POLARSRC
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_init.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_bitwise_operations.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_crc_byte.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_interleaving_pattern.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_kernal_operation.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_kronecker_power_matrices.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_matrix_and_array.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_procedures.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_sequence_pattern.c
+)
+set(PHY_SMALLBLOCKSRC
+  ${OPENAIR1_DIR}/PHY/CODING/nrSmallBlock/encodeSmallBlock.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrSmallBlock/decodeSmallBlock.c
+)
 set(PHY_TURBOIF
  ${OPENAIR1_DIR}/PHY/CODING/coding_load.c
 )
@@ -843,6 +793,8 @@ set(PHY_NRLDPC_CODINGIF

 add_library(dfts MODULE ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts.c ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts_neon.c)

+add_library(crc_byte OBJECT ${OPENAIR1_DIR}/PHY/CODING/crc_byte.c)
+
 set(PHY_SRC_COMMON
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools_common.c
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/lte_mcs.c
@@ -932,6 +884,7 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/sss_gen.c
  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/linear_preprocessing_rec.c
  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_decoding.c
  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c
  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/uci_tools_ue.c
@@ -1010,6 +963,8 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/TOOLS/dB_routines.c
  ${OPENAIR1_DIR}/PHY/TOOLS/sqrt.c
  ${OPENAIR1_DIR}/PHY/TOOLS/oai_arith_operations.c
+  ${PHY_POLARSRC}
+  ${PHY_SMALLBLOCKSRC}
  ${PHY_NRLDPC_CODINGIF}
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/pucch_rx.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/srs_rx.c
@@ -1059,6 +1014,8 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/TOOLS/sqrt.c
  ${OPENAIR1_DIR}/PHY/TOOLS/oai_arith_operations.c
  ${OPENAIR1_DIR}/PHY/INIT/nr_init_ue.c
+  ${PHY_POLARSRC}
+  ${PHY_SMALLBLOCKSRC}
  ${PHY_NRLDPC_CODINGIF}
  )

@@ -1077,21 +1034,29 @@ add_dependencies(PHY_COMMON dfts)
 add_library(PHY ${PHY_SRC})
 target_link_libraries(PHY PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

+pkg_check_modules(blas REQUIRED blas)
+pkg_check_modules(lapacke REQUIRED lapacke)
+
 add_library(PHY_UE ${PHY_SRC_UE})
 target_link_libraries(PHY_UE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)
+# RHEL needs also cblas, but Ubuntu does not have it. So `cblas_LIBRARIES` and
+# `cblas_INCLUDE_DIRS` will be empty for Ubuntu, a no-op
+pkg_check_modules(cblas cblas)
+target_link_libraries(PHY_UE PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES})
+target_include_directories(PHY_UE PRIVATE ${blas_INCLUDE_DIRS} ${cblas_INCLUDE_DIRS} ${lapacke_INCLUDE_DIRS})

 add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})
 target_link_libraries(PHY_NR_COMMON PUBLIC UTIL)

 add_library(PHY_NR ${PHY_NR_SRC})
-target_link_libraries(PHY_NR nr_phy_common nr_common nr_fapi_p5 polar smallblock)
+target_link_libraries(PHY_NR nr_phy_common nr_common nr_fapi_p5)

 add_library(PHY_NR_NO_AVX_256 ${PHY_NR_SRC})
 target_link_libraries(PHY_NR_NO_AVX_256 nr_phy_common nr_common)
 target_compile_definitions(PHY_NR_NO_AVX_256 PUBLIC USE_128BIT)

 add_library(PHY_NR_UE ${PHY_NR_UE_SRC})
-target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs nr_phy_common nr_common UTIL polar smallblock)
+target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs nr_phy_common nr_common UTIL)

 add_library(PHY_RU ${PHY_SRC_RU})
 target_link_libraries(PHY_RU PRIVATE asn1_lte_rrc_hdrs UTIL)
@@ -1155,7 +1120,7 @@ set(L2_SRC
  ${RRC_DIR}/rrc_eNB_S1AP.c
  ${RRC_DIR}/rrc_eNB_M2AP.c
  ${RRC_DIR}/rrc_eNB_UE_context.c
-  ${RRC_DIR}/rrc_eNB_GTPV1U.c
+  ${NR_RRC_DIR}/rrc_gNB_UE_context.c
  ${RRC_DIR}/rrc_common.c
  ${RRC_DIR}/L2_interface.c
  ${RRC_DIR}/L2_interface_common.c
@@ -1221,7 +1186,6 @@ set(NR_L2_SRC_UE
  ${NR_UE_RRC_DIR}/L2_interface_ue.c
  ${NR_UE_RRC_DIR}/main_ue.c
  ${NR_UE_RRC_DIR}/rrc_UE.c
-  ${NR_UE_RRC_DIR}/verify_RRC.c
  ${NR_UE_RRC_DIR}/rrc_timers_and_constants.c
  ${NR_UE_RRC_DIR}/rrc_sl_preconfig.c
  )
@@ -1402,6 +1366,15 @@ include_directories("${OPENAIR1_DIR}/SCHED_NR_UE")
 # CN libs
 ##########################

+add_library (GTPV1U
+  ${RRC_DIR}/rrc_eNB_GTPV1U.c
+  ${OPENAIR3_DIR}/ocp-gtpu/gtp_itf.cpp
+  ${OPENAIR3_DIR}/ocp-gtpu/gtpu_extensions.c
+  )
+target_link_libraries(GTPV1U PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+target_link_libraries(GTPV1U PRIVATE SIMU ds)
+include_directories(${OPENAIR3_DIR}/ocp-gtp)
+
 set (MME_APP_SRC
  ${OPENAIR3_DIR}/MME_APP/mme_app.c
  ${OPENAIR3_DIR}/MME_APP/mme_config.c
@@ -1699,17 +1672,6 @@ set (SIMUSRC
 add_library(SIMU STATIC ${SIMUSRC} )
 target_include_directories(SIMU PUBLIC ${OPENAIR1_DIR}/SIMULATION/TOOLS ${OPENAIR1_DIR}/SIMULATION/RF)

-option(CHANNEL_SSE "Enable SSE optimizations for channel simulation" OFF)
-if(CHANNEL_SSE)
-    message(STATUS "SSE-optimized channel simulation enabled.")
-    target_compile_definitions(SIMU PRIVATE CHANNEL_SSE)
-endif()
-
-if(CUDA_FOUND)
-  set_property(TARGET SIMU PROPERTY CUDA_ARCHITECTURES ${CMAKE_CUDA_ARCHITECTURES})
-  set_property(TARGET SIMU PROPERTY LINKER_LANGUAGE CXX)
-endif()
-
 include_directories("${NFAPI_DIR}/nfapi/public_inc")
 include_directories("${NFAPI_DIR}/common/public_inc")
 include_directories("${NFAPI_DIR}/pnf/public_inc")
@@ -1740,9 +1702,12 @@ add_executable(lte-softmodem
  ${OPENAIR_DIR}/executables/lte-ru.c
  ${OPENAIR_DIR}/executables/ru_control.c
  ${OPENAIR_DIR}/executables/lte-softmodem.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${OPENAIR2_DIR}/ENB_APP/NB_IoT_interface.c
  ${OPENAIR_DIR}/executables/create_tasks.c
  ${OPENAIR_DIR}/executables/create_tasks_mbms.c
+  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
+  ${OPENAIR_DIR}/radio/COMMON/record_player.c
  ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
  ${PHY_INTERFACE_DIR}/queue_t.c
  ${OPENAIR_DIR}/common/utils/lte/ue_power.c
@@ -1753,14 +1718,15 @@ add_dependencies(lte-softmodem oai_iqplayer)

 target_link_libraries(lte-softmodem PRIVATE
  -Wl,--start-group
-  lte_rrc nr_rrc s1ap m2ap x2ap m3ap GTPV1U SECURITY UTIL SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
+  lte_rrc nr_rrc s1ap m2ap x2ap m3ap GTPV1U SECURITY UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
  PHY_COMMON PHY PHY_RU  L2 L2_LTE NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
-  ${NAS_UE_LIB} ITTI SIMU radio_common softmodem_common
+  ${NAS_UE_LIB} ITTI SIMU shlib_loader
  -Wl,--end-group z dl)

 target_link_libraries(lte-softmodem PRIVATE pthread m CONFIG_LIB rt)
 target_link_libraries(lte-softmodem PRIVATE ${T_LIB})
 target_link_libraries(lte-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+target_link_libraries(lte-softmodem PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES} ${lapack_LIBRARIES})

 if(E2_AGENT)
  target_link_libraries(lte-softmodem PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
@@ -1770,13 +1736,16 @@ endif()
 add_executable(oairu
  ${OPENAIR_DIR}/executables/lte-ru.c
  ${OPENAIR_DIR}/executables/ru_control.c
+  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
+  ${OPENAIR_DIR}/radio/COMMON/record_player.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${OPENAIR_DIR}/openair1/SCHED/phy_procedures_lte_common.c
  ${OPENAIR_DIR}/executables/main_ru.c
  ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
 )
 target_link_libraries(oairu PRIVATE
  -Wl,--start-group
-  SCHED_RU_LIB PHY_COMMON PHY_RU UTIL radio_common softmodem_common
+  SCHED_RU_LIB PHY_COMMON PHY_RU UTIL shlib_loader
  -Wl,--end-group z dl)

 target_link_libraries(oairu PRIVATE pthread m CONFIG_LIB rt ${T_LIB})
@@ -1793,7 +1762,10 @@ target_link_libraries(lte-softmodem PRIVATE
 add_executable(lte-uesoftmodem
  ${OPENAIR_DIR}/executables/lte-ue.c
  ${OPENAIR_DIR}/executables/lte-uesoftmodem.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${OPENAIR_DIR}/executables/create_tasks_ue.c
+  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
+  ${OPENAIR_DIR}/radio/COMMON/record_player.c
  ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
  ${OPENAIR_DIR}/common/utils/lte/ue_power.c
  ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
@@ -1803,35 +1775,20 @@ add_executable(lte-uesoftmodem
 target_link_libraries(lte-uesoftmodem PRIVATE
  -Wl,--start-group
  lte_rrc nr_rrc s1ap x2ap m2ap m3ap
-  SECURITY UTIL SCTP_CLIENT MME_APP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON
+  SECURITY UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON
  PHY_UE PHY_RU L2_UE L2_LTE SIMU NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
-  ${NAS_UE_LIB} ITTI radio_common softmodem_common
+  ${NAS_UE_LIB} ITTI shlib_loader
  -Wl,--end-group z dl)

 target_link_libraries(lte-uesoftmodem PRIVATE pthread m CONFIG_LIB rt)
 target_link_libraries(lte-uesoftmodem PRIVATE ${T_LIB})
 target_link_libraries(lte-uesoftmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+target_link_libraries(lte-uesoftmodem PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES} ${lapack_LIBRARIES})

 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(lte-uesoftmodem PRIVATE
                      asn1_lte_rrc asn1_s1ap asn1_m2ap asn1_m3ap asn1_x2ap)

-# nr RRU
-add_executable(nr-oru
-  ${OPENAIR_DIR}/executables/nr-ru.c
-  ${OPENAIR_DIR}/openair1/PHY/INIT/nr_parms.c
-  ${OPENAIR_DIR}/openair1/SCHED_NR/phy_frame_config_nr.c
-  ${OPENAIR_DIR}/openair1/SCHED_NR/nr_prach_procedures.c
-  ${OPENAIR_DIR}/openair1/SCHED/phy_procedures_lte_common.c
-  ${OPENAIR_DIR}/executables/main_nr_ru.c
-)
-target_link_libraries(nr-oru PRIVATE
-  UTIL SCHED_RU_LIB PHY_COMMON PHY_RU PHY_NR shlib_loader z dl
-  radio_common softmodem_common)
-target_link_libraries(nr-oru PRIVATE pthread m CONFIG_LIB rt ${T_LIB} utils
-  barrier actor)
-target_link_libraries(nr-oru PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs nr_phy_common time_management)
-
 # nr-softmodem
 ###################################################

@@ -1842,6 +1799,9 @@ add_executable(nr-softmodem
  ${OPENAIR_DIR}/executables/nr-gnb.c
  ${OPENAIR_DIR}/executables/nr-ru.c
  ${OPENAIR_DIR}/executables/nr-softmodem.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
+  ${OPENAIR_DIR}/radio/COMMON/record_player.c
  ${OPENAIR_DIR}/common/utils/lte/ue_power.c
  ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
  ${PHY_INTERFACE_DIR}/queue_t.c
@@ -1850,11 +1810,11 @@ add_executable(nr-softmodem

 target_link_libraries(nr-softmodem PRIVATE
  -Wl,--start-group
-  UTIL SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU GTPV1U SECURITY
+  UTIL HASHTABLE SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU GTPV1U SECURITY
  ITTI ${NAS_UE_LIB} lte_rrc nr_rrc
  ngap s1ap L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB SIMU
-  x2ap f1ap m2ap m3ap e1ap radio_common
-  time_management softmodem_common
+  x2ap f1ap m2ap m3ap e1ap shlib_loader
+  time_management
  -Wl,--end-group z dl)

 target_link_libraries(nr-softmodem PRIVATE pthread m CONFIG_LIB rt)
@@ -1884,6 +1844,7 @@ target_link_libraries(nr-softmodem PRIVATE

 add_executable(nr-cuup
  executables/nr-cuup.c
+  executables/softmodem-common.c
  ${NR_RRC_DIR}/rrc_gNB_UE_context.c
  ${OPENAIR2_DIR}/E1AP/e1ap_setup.c
  ${NR_PDCP_SRC}
@@ -1893,9 +1854,9 @@ add_executable(nr-cuup
 target_link_libraries(nr-cuup PRIVATE
                      CONFIG_LIB ITTI SCTP_CLIENT
                      GTPV1U e1ap f1ap
-                      time_management softmodem_common
+                      time_management
                      alg
-                      z dl pthread ${T_LIB})
+                      z dl pthread shlib_loader ${T_LIB})
 target_link_libraries(nr-cuup PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 if(E2_AGENT)
  target_link_libraries(nr-cuup PRIVATE e2_agent e2_agent_arg e2_ran_func_cuup)
@@ -1911,7 +1872,11 @@ add_executable(nr-uesoftmodem
  ${OPENAIR_DIR}/executables/nr-uesoftmodem.c
  ${OPENAIR_DIR}/executables/position_interface.c
  ${OPENAIR_DIR}/executables/nr-ue.c
-  ${OPENAIR_DIR}/executables/nr-ue-ru.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
+  ${OPENAIR_DIR}/radio/COMMON/record_player.c
+  ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+  ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common_tdd.c
  ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c
  ${NFAPI_USER_DIR}/nfapi.c
  ${PHY_INTERFACE_DIR}/queue_t.c
@@ -1919,10 +1884,10 @@ add_executable(nr-uesoftmodem

 target_link_libraries(nr-uesoftmodem PRIVATE
  -Wl,--start-group
-  nr_rrc SECURITY UTIL SCHED_RU_LIB SCHED_NR_UE_LIB
+  nr_rrc SECURITY UTIL HASHTABLE SCHED_RU_LIB SCHED_NR_UE_LIB
  PHY_COMMON PHY_NR_COMMON PHY_NR_UE NR_L2_UE MAC_NR_COMMON NFAPI_LIB
-  ITTI SIMU radio_common
-  time_management softmodem_common
+  ITTI SIMU shlib_loader
+  time_management
  -Wl,--end-group z dl)

 target_link_libraries(nr-uesoftmodem PRIVATE pthread m CONFIG_LIB rt nr_ue_phy_meas)
@@ -1955,10 +1920,10 @@ target_link_libraries(nr-uesoftmodem PRIVATE
 add_executable(rftest
  ${OPENAIR_DIR}/openair1/PHY/TOOLS/calibration_test.c
  ${OPENAIR_DIR}/openair1/PHY/TOOLS/calibration_scope.c
+  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
 )
-target_link_libraries(rftest PRIVATE
-  minimal_lib PHY_NR_COMMON UTIL forms pthread dl m ${T_LIB}
-  radio_common softmodem_common)
+target_link_libraries(rftest PRIVATE minimal_lib PHY_NR_COMMON UTIL forms pthread dl m ${T_LIB} shlib_loader)
 target_link_libraries(rftest PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

 add_executable(polartest
@@ -1975,7 +1940,7 @@ add_executable(smallblocktest

 target_link_libraries(smallblocktest PRIVATE
  -Wl,--start-group UTIL SIMU PHY_NR PHY_COMMON PHY_NR_COMMON -Wl,--end-group
-  m pthread dl ${T_LIB}
+  m pthread dl shlib_loader ${T_LIB}
 )


@@ -1985,7 +1950,7 @@ add_executable(ldpctest
 )
 target_link_libraries(ldpctest PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON -Wl,--end-group
-  m pthread dl ${T_LIB}
+  m pthread dl shlib_loader ${T_LIB}
  # link 'check_crc' to make it resolved in the LDPC coding libraries
  # 'check_crc' is not used in ldpctest so it is not linked in the executable by default
  # --whole-archive links 'check_crc' in the executable even though it is note used, see 'man ld'
@@ -1998,53 +1963,54 @@ target_link_libraries(physim_common PRIVATE UTIL)
 add_executable(nr_dlschsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c)
 target_link_libraries(nr_dlschsim PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl physim_common
+  m pthread ${T_LIB} ITTI dl shlib_loader physim_common
  )
 target_link_libraries(nr_dlschsim PRIVATE asn1_nr_rrc_hdrs)

 add_executable(nr_pbchsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c)
 target_link_libraries(nr_pbchsim PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl physim_common
+  m pthread ${T_LIB} ITTI dl shlib_loader physim_common
 )
 target_link_libraries(nr_pbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 add_executable(nr_psbchsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/psbchsim.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${NFAPI_USER_DIR}/nfapi.c
  ${NFAPI_USER_DIR}/gnb_ind_vars.c
  ${PHY_INTERFACE_DIR}/queue_t.c
  )
 target_link_libraries(nr_psbchsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON CONFIG_LIB L2_NR -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl physim_common softmodem_common
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON CONFIG_LIB L2_NR -lz -Wl,--end-group
+  m pthread ${T_LIB} ITTI dl shlib_loader physim_common
  )
 target_link_libraries(nr_psbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 add_executable(nr_pucchsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pucchsim.c)
 target_link_libraries(nr_pucchsim PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl physim_common
+  m pthread ${T_LIB} ITTI dl shlib_loader physim_common
 )
 target_link_libraries(nr_pucchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 add_executable(nr_dlsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlsim.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${NFAPI_USER_DIR}/nfapi.c
  ${NFAPI_USER_DIR}/gnb_ind_vars.c
  ${PHY_INTERFACE_DIR}/queue_t.c
  )
 target_link_libraries(nr_dlsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR x2ap SECURITY ngap -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl nr_ue_phy_meas physim_common
-  softmodem_common
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
+  m pthread ${T_LIB} ITTI dl shlib_loader nr_ue_phy_meas physim_common
  )
 target_link_libraries(nr_dlsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 add_executable(nr_prachsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/prachsim.c)
 target_link_libraries(nr_prachsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_RU PHY_NR_UE MAC_NR_COMMON SCHED_NR_LIB CONFIG_LIB -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl physim_common)
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_RU PHY_NR_UE MAC_NR_COMMON SCHED_NR_LIB CONFIG_LIB -lz -Wl,--end-group
+  m pthread ${T_LIB} ITTI dl shlib_loader physim_common)
 target_link_libraries(nr_prachsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 add_executable(nr_ulschsim
@@ -2053,48 +2019,41 @@ add_executable(nr_ulschsim
  )
 target_link_libraries(nr_ulschsim PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl physim_common
+  m pthread ${T_LIB} ITTI dl shlib_loader physim_common
 )
 target_link_libraries(nr_ulschsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 add_executable(nr_ulsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulsim.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${NFAPI_USER_DIR}/nfapi.c
  ${NFAPI_USER_DIR}/gnb_ind_vars.c
  ${PHY_INTERFACE_DIR}/queue_t.c
  )

 target_link_libraries(nr_ulsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR x2ap SECURITY ngap -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl nr_ue_phy_meas physim_common softmodem_common
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
+  m pthread ${T_LIB} ITTI dl shlib_loader nr_ue_phy_meas physim_common
  )
 target_link_libraries(nr_ulsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 add_executable(nr_srssim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/srssim.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${NFAPI_USER_DIR}/nfapi.c
  ${NFAPI_USER_DIR}/gnb_ind_vars.c
  ${PHY_INTERFACE_DIR}/queue_t.c
  )

 target_link_libraries(nr_srssim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON -Wl,--end-group
-  m pthread ITTI dl nr_ue_phy_meas physim_common softmodem_common
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc L2_NR -lz -Wl,--end-group
+  m pthread ITTI dl nr_ue_phy_meas physim_common
  )

-if(CUDA_ENABLE)
-  if (TARGET oai_cuda_lib)
-      target_link_libraries(nr_dlsim PRIVATE oai_cuda_lib)
-      target_link_libraries(nr_ulsim PRIVATE oai_cuda_lib)
-
-      target_compile_definitions(nr_dlsim PRIVATE ENABLE_CUDA)
-      target_compile_definitions(nr_ulsim PRIVATE ENABLE_CUDA)
-  endif()
-endif()
-
 # these simulators do not compile:
 # dlsim_tm7 pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim
 foreach(myExe dlsim ulsim)
+
  add_executable(${myExe}
    ${OPENAIR1_DIR}/SIMULATION/LTE_PHY/${myExe}.c
    ${OPENAIR_DIR}/common/utils/lte/ue_power.c
@@ -2104,7 +2063,7 @@ foreach(myExe dlsim ulsim)
    )
  target_link_libraries (${myExe} PRIVATE
    -Wl,--start-group SIMU UTIL SCHED_LIB SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_NR_COMMON PHY PHY_UE PHY_RU ITTI -Wl,--end-group
-    pthread m rt CONFIG_LIB ${T_LIB} dl
+    pthread m rt CONFIG_LIB ${T_LIB} dl shlib_loader
    )
  target_link_libraries(${myExe} PRIVATE asn1_lte_rrc_hdrs)
  add_dependencies(${myExe} coding)
@@ -2143,7 +2102,7 @@ if (${T_TRACER})
        #all "add_library" definitions
        ITTI lte_rrc nr_rrc s1ap x2ap m2ap m3ap f1ap
        params_libconfig
-        oai_eth_transpro UTIL
+        oai_eth_transpro HASHTABLE UTIL
        SECURITY SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB
        NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
        MISC_NFAPI_LTE_LIB
@@ -2196,7 +2155,6 @@ if(ENABLE_TESTS)
 endif()

 add_subdirectory(common)
-add_subdirectory(executables)
 add_subdirectory(doc)
 add_subdirectory(nfapi)
 add_subdirectory(openair1)
@@ -2204,13 +2162,3 @@ add_subdirectory(openair2)
 add_subdirectory(openair3)
 add_subdirectory(radio)
 add_subdirectory(tests)
-
-if(TARGET oai_cuda_lib)
-    message(STATUS "CUDA library 'oai_cuda_lib' found, linking to targets...")
-    target_link_libraries(nr_dlsim PRIVATE oai_cuda_lib)
-    target_link_libraries(nr_ulsim PRIVATE oai_cuda_lib)
-endif()
-
-if(PACKAGING_LTE OR PACKAGING_NR OR PACKAGING_COMMON OR PACKAGING_USRP OR PACKAGING_PHYSIM)
-  include("tools/packages/packages.cmake")
-endif()
--- a/ci-scripts/Jenkinsfile-GitLab-Container
+++ b/ci-scripts/Jenkinsfile-GitLab-Container
@@ -334,29 +334,6 @@ pipeline {
            }
          }
        }
-        stage ("Channel-Simulation") {
-          when { expression {do5Gtest || do5GUeTest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-Channel-Simulation', 'Channel-Simulation')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                channelSimStatus = finalizeSlaveJob('RAN-Channel-Simulation')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += channelSimStatus
-              }
-            }
-          }
-        }
        stage ("PhySim-Cluster-4G") {
          when { expression {do4Gtest} }
          steps {
@@ -726,11 +703,11 @@ pipeline {
            }
          }
        }
-        stage ("SA-Multi-Antenna-CN5G") {
+        stage ("SA-2x2-Module-CN5G") {
          when { expression {do5Gtest} }
          steps {
            script {
-              triggerSlaveJob ('RAN-SA-Multi-Antenna-CN5G', 'SA-Multi-Antenna-CN5G')
+              triggerSlaveJob ('RAN-SA-2x2-Module-CN5G', 'SA-2x2-Module-CN5G')
            }
          }
          post {
@@ -738,13 +715,13 @@ pipeline {
              script {
                // Using a unique variable name for each test stage to avoid overwriting on a global variable
                // due to parallel-time concurrency
-                saMultiAntennaStatus = finalizeSlaveJob('RAN-SA-Multi-Antenna-CN5G')
+                saTDD2x2Status = finalizeSlaveJob('RAN-SA-2x2-Module-CN5G')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += saMultiAntennaStatus
+                failingStages += saTDD2x2Status
              }
            }
          }
--- a/ci-scripts/args_parse.py
+++ b/ci-scripts/args_parse.py
@@ -33,6 +33,7 @@
 #-----------------------------------------------------------
 import sys		# arg
 import re		# reg
+import yaml
 import constants as CONST

 #-----------------------------------------------------------
@@ -43,7 +44,6 @@ import constants as CONST
 def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER):

    force_local = False
-    date_fmt = None
    while len(argvs) > 1:
        myArgv = argvs.pop(1)	# 0th is this file's name

@@ -56,9 +56,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER):


 	    #consider inline parameters
-        elif re.match(r'^\-\-datefmt=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match(r'^\-\-datefmt=(.+)$', myArgv, re.IGNORECASE)
-            date_fmt = matchReg.group(1)
        elif re.match(r'^\-\-mode=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match(r'^\-\-mode=(.+)$', myArgv, re.IGNORECASE)
            mode = matchReg.group(1)
@@ -161,6 +158,9 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER):
        elif re.match(r'^\-\-OCRegistry=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match(r'^\-\-OCRegistry=(.+)$', myArgv, re.IGNORECASE)
            CLUSTER.OCRegistry = matchReg.group(1)
+        elif re.match(r'^\-\-BuildId=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match(r'^\-\-BuildId=(.+)$', myArgv, re.IGNORECASE)
+            RAN.BuildId = matchReg.group(1)
        elif re.match(r'^\-\-FlexRicTag=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match(r'^\-\-FlexRicTag=(.+)$', myArgv, re.IGNORECASE)
            CONTAINERS.flexricTag = matchReg.group(1)
@@ -168,4 +168,4 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER):
            HELP.GenericHelp(CONST.Version)
            sys.exit('Invalid Parameter: ' + myArgv)

-    return mode, force_local, date_fmt
+    return mode, force_local
--- a/ci-scripts/cls_analysis.py
+++ b/ci-scripts/cls_analysis.py
@@ -22,15 +22,10 @@

 import re
 import os
-import logging
-import yaml
-import signal

 import xml.etree.ElementTree as ET
 import json

-import importlib, inspect
-
 class Analysis():

 	def _get_test_description(properties):
@@ -114,134 +109,3 @@ class Analysis():
 		test_summary['Nbpass'] =  nb_tests - nb_failed
 		test_summary['Nbfail'] =  nb_failed
 		return nb_failed == 0, test_summary, test_result
-
-	def analyze_rt_stats(thresholds, L1_stats, MAC_stats):
-		with open(thresholds, 'r') as f:
-			datalog_rt_stats = yaml.load(f, Loader=yaml.FullLoader)
-
-		rt_keys = datalog_rt_stats['Ref']
-		real_time_stats = {}
-		for sf in [L1_stats, MAC_stats]:
-			with open(sf, 'r') as f:
-				for line in f.readlines():
-					for k in rt_keys:
-						result = re.search(k, line)
-						if result is not None:
-							tmp = re.match(rf'^.*?(\b{k}\b.*)', line.rstrip())
-							if tmp is not None:
-								real_time_stats[k] = tmp.group(1)
-
-		# datalog_rt_stats format must align with HTML.CreateHtmlDataLogTable()
-		datalog_rt_stats['Data']={}
-		for k in real_time_stats:
-			tmp = re.match(r'^(?P<metric>.*):\s+(?P<avg>\d+\.\d+) us;\s+(?P<count>\d+);\s+(?P<max>\d+\.\d+) us;', real_time_stats[k])
-			if tmp is not None:
-				metric = tmp.group('metric')
-				avg = float(tmp.group('avg'))
-				max = float(tmp.group('max'))
-				count = int(tmp.group('count'))
-				datalog_rt_stats['Data'][metric] = ["{:.0f}".format(avg),"{:.0f}".format(max),"{:d}".format(count),"{:.2f}".format(avg / datalog_rt_stats['Ref'][metric])]
-
-		success = True
-		for k in datalog_rt_stats['Data']:
-			valnorm = float(datalog_rt_stats['Data'][k][3])
-			dev = datalog_rt_stats['DeviationThreshold'][k]
-			if valnorm > 1.0 + dev or valnorm < 1.0 - dev: # condition for fail: avg/ref deviates by more than "deviation threshold"
-				logging.debug(f'\u001B[1;30;43m normalized metric {k}={valnorm} deviates by more than {dev}\u001B[0m')
-				success = False
-		return success, datalog_rt_stats
-
-
-# returns tuple of (service, analyzer, option string)
-def _lookupServiceAnalyzerOpt(s, analyzers):
-	res = s.split("=", 2)
-	name = res[0]
-	if len(res) == 1:
-		return res[0], analyzers["Default"], None
-	opt = res[2] if len(res) > 2 else None
-	func = res[1]
-	a = analyzers[func] if func in analyzers else None
-	return name, a, opt
-
-# groups requested service analysis (service=func[=option]) on per service
-# basis and looks up analyzer func. If log analysis is requested, will always
-# run Default log analysis
-def _groupServices(to_analyze):
-	req_analysis = {}
-	# get content of cls_loganalysis module, then get all analyzers (classes) in this module
-	mod = importlib.import_module("cls_loganalysis")
-	analyzers = {name:cl for name, cl in inspect.getmembers(mod, inspect.isclass)}
-	for req in to_analyze:
-		s, func, opt = _lookupServiceAnalyzerOpt(req, analyzers)
-		logging.debug(f"requested check '{req}' => service {s}, function {func.__name__}, options '{opt}'")
-		# always put default analyzer first
-		l = req_analysis[s] if s in req_analysis else [(analyzers["Default"], None, "default")]
-		if func is not analyzers["Default"]:
-			l.append((func, opt, req))
-		req_analysis[s] = l
-	return req_analysis
-
-def _describe_exit_code(code):
-	if code > 128:
-		sig = code - 128
-		try:
-			return f"terminated by signal {sig} ({signal.Signals(sig).name})"
-		except ValueError:
-			return f"terminated by unknown signal {sig}"
-	else:
-		return f"custom exit code"
-
-def AnalyzeServices(HTML, service_desc, to_analyze):
-	success = True
-	# hack: we want to give as a description "log analysis", but the description
-	# is set outside, so retain what was set before
-	orig_html_desc = HTML.desc
-	# group analysis on a per-service basis, then iterate
-	for serv, list_analysis in _groupServices(to_analyze).items():
-		HTML.desc = f"Log analysis for service {serv}"
-		if serv not in service_desc:
-			success = False
-			logging.error(f"requested service {serv} not in list of services")
-			HTML.CreateHtmlTestRowQueue("N/A", 'KO', ["service not detected"])
-			continue
-		# pre-initialize with return code
-		rc = service_desc[serv]["returncode"]
-		logging.info(f"analyze service {serv}: return code {rc}")
-		service_success = True # TODO rc == 0: too many functions (eNB, lteUE, RIC, nrUE) fail non-zero
-		logs = []
-		if rc != 0:
-			logs.append(f"=> return code {rc}, likely " + _describe_exit_code(rc) + " [ignored by CI]")
-		# skip if the file is too big
-		logfile = service_desc[serv]["logfile"]
-		filename = os.path.basename(logfile)
-		b = os.path.getsize(logfile)
-		logging.debug(f"using logfile {logfile} of size {b} bytes")
-		if b > 10 * 1024 * 1024:
-			success = False
-			logs.append(f"logfile too big (>10MB)")
-			logging.error(logs)
-			HTML.CreateHtmlTestRowQueue(filename, 'KO', ["\n".join(logs)])
-			continue
-		# run each analyzer with its options on the logfile
-		for (func, opt, desc) in list_analysis:
-			if func is None:
-				service_success = False
-				logging.error(f"request analysis function for desc {desc} not found")
-				HTML.CreateHtmlTestRowQueue(serv, 'KO', [f"no analysis function for {desc}"])
-				continue
-			result, l = func.run(logfile, opt)
-			logging.info(f"service {serv}: analysis with func {func}, result {result}, logs '{l}'")
-			service_success = service_success and result
-			if not result:
-				logs.append(f"=> {func.__name__} check (options '{opt}') FAILED")
-				logs.append(l)
-		logs = '\n'.join(logs)
-		if not service_success:
-			logging.error(l)
-		else:
-			logging.info(l)
-		all_funcs = ", ".join([f.__name__ for (f, _, _) in list_analysis])
-		HTML.CreateHtmlTestRowQueue(f"Check {all_funcs} on {filename}", 'OK' if service_success else 'KO', [logs])
-		success = success and service_success
-	HTML.desc = orig_html_desc
-	return success
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -31,17 +31,23 @@
 #-----------------------------------------------------------
 # Import
 #-----------------------------------------------------------
+import sys	      # arg
 import re	       # reg
 import logging
 import os
+import shutil
+import time
+from zipfile import ZipFile

 #-----------------------------------------------------------
 # OAI Testing modules
 #-----------------------------------------------------------
 import cls_cmd
+import helpreadme as HELP
 import constants as CONST
-import cls_analysis
+import cls_oaicitest
 from cls_ci_helper import archiveArtifact
+from collections import deque

 #-----------------------------------------------------------
 # Helper functions used here and in other classes
@@ -180,9 +186,62 @@ def GetDeployedServices(ssh, file):
 		else:
 			c = ret.stdout
 			logging.info(f'service {s} with container id {c}')
-			deployed_services.append((s, c))
+			deployed_services.append(s)
 	return deployed_services

+def CheckLogs(self, filename, HTML, RAN):
+	success = True
+	name = os.path.basename(filename)
+	if (any(sub in name for sub in ['oai_ue','oai-nr-ue','lte_ue'])):
+		logging.debug(f'\u001B[1m Analyzing UE logfile {filename} \u001B[0m')
+		logStatus = cls_oaicitest.OaiCiTest().AnalyzeLogFile_UE(filename, HTML, RAN)
+		opt = f"UE log analysis ({name})"
+		# usage of htmlUEFailureMsg/htmleNBFailureMsg is because Analyze log files
+		# abuse HTML to store their reports, and we here want to put custom options,
+		# which is not possible with CreateHtmlTestRow
+		# solution: use HTML templates, where we don't need different HTML write funcs
+		if (logStatus < 0):
+			HTML.CreateHtmlTestRowQueue(opt, 'KO', [HTML.htmlUEFailureMsg])
+			success = False
+		else:
+			HTML.CreateHtmlTestRowQueue(opt, 'OK', [HTML.htmlUEFailureMsg])
+		HTML.htmlUEFailureMsg = ""
+	elif 'nv-cubb' in name:
+		msg = 'Undeploy PNF/Nvidia CUBB'
+		HTML.CreateHtmlTestRow(msg, 'OK', CONST.ALL_PROCESSES_OK)
+	elif (any(sub in name for sub in ['enb','rru','rcc','cu','du','gnb','vnf'])):
+		logging.debug(f'\u001B[1m Analyzing XnB logfile {filename}\u001B[0m')
+		logStatus = RAN.AnalyzeLogFile_eNB(filename, HTML, self.ran_checkers)
+		opt = f"xNB log analysis ({name})"
+		if (logStatus < 0):
+			HTML.CreateHtmlTestRowQueue(opt, 'KO', [HTML.htmleNBFailureMsg])
+			success = False
+		else:
+			HTML.CreateHtmlTestRowQueue(opt, 'OK', [HTML.htmleNBFailureMsg])
+		HTML.htmleNBFailureMsg = ""
+	elif 'xapp' in name:
+		opt = f"Undeploy {name}"
+		with open(f'{filename}', "r") as f:
+			last_line = deque(f, maxlen=1).pop()
+		if ('Test xApp run SUCCESSFULLY' in last_line):
+			HTML.CreateHtmlTestRowQueue(opt, 'OK', ["xApp run successfully"])
+		else:
+			HTML.CreateHtmlTestRowQueue(opt, 'KO', ["xApp didn't run successfully"])
+			success = False
+	elif 'RIC' in name:
+		opt = f"Undeploy {name}"
+		with open(f'{filename}', 'r') as f:
+			last_line = deque(f, maxlen=1).pop()
+		if ('Removing E2 Node' in last_line):
+			HTML.CreateHtmlTestRowQueue(opt, 'OK', ["nearRT-RIC run successfully"])
+		else:
+			HTML.CreateHtmlTestRowQueue(opt, 'KO', ["nearRT-RIC didn't run successfully"])
+			success = False
+	else:
+		logging.info(f"Skipping analysis of log '{filename}': no submatch for xNB/UE")
+	logging.debug(f"log check: file {filename} passed analysis {success}")
+	return success
+
 #-----------------------------------------------------------
 # Class Declaration
 #-----------------------------------------------------------
@@ -207,6 +266,8 @@ class Containerize():
 		self.dockerfileprefix = ''
 		self.host = ''

+		#checkers from xml
+		self.ran_checkers={}
 		self.num_attempts = 1

 		self.flexricTag = ''
@@ -263,7 +324,6 @@ class Containerize():
 				imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('ran-build-fhi72', 'build.fhi72', 'ran-build-fhi72', ''))
 				imageNames.append(('oai-gnb', 'gNB.fhi72', 'oai-gnb-fhi72', ''))
-				imageNames.append(('oai-nr-oru', 'nrORU.fhi72', 'oai-nr-oru', ''))
 		result = re.search('build_cross_arm64', self.imageKind)
 		if result is not None:
 			self.dockerfileprefix = '.ubuntu.cross-arm64'
@@ -311,16 +371,12 @@ class Containerize():
 		for image,pattern,name,option in imageNames:
 			cmd.run(f"{self.cli} 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}")
 			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)
+			cmd.run(f"{self.cli} build {self.cliBuildOptions} --target {baseImage} --tag {baseImage}:{baseTag} --file docker/Dockerfile.base{self.dockerfileprefix} . &> {logfile}", timeout=1600)
 			t = ("ran-base", archiveArtifact(cmd, ctx, logfile))
 			log_files.append(t)

@@ -356,20 +412,18 @@ class Containerize():
 			# target images should use the proper ran-build image
 			if image != 'ran-build' and "-asan" in name:
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build-asan:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
-			elif "fhi72" in name or name == "oai-nr-oru":
+			elif "fhi72" in name:
 				cmd.run(f'sed -i -e "s#ran-build-fhi72:latest#ran-build-fhi72:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			elif image != 'ran-build':
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			if image == 'oai-gnb-aerial':
-				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2026.01.07.tar.gz .')
+				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2025.10.09.tar.gz .')
 			logfile = f'{lSourcePath}/cmake_targets/log/{name}.docker.log'
-			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)
 			t = (name, archiveArtifact(cmd, ctx, logfile))
 			log_files.append(t)
 			if image == 'oai-gnb-aerial':
-				cmd.run('rm -f nvipc_src.2026.01.07.tar.gz')
+				cmd.run('rm -f nvipc_src.2025.10.09.tar.gz')
 			# check the status of the build
 			ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {name}:{imageTag}")
 			if ret.returncode != 0:
@@ -391,7 +445,7 @@ class Containerize():
 					allImagesSize[name] = 'unknown'
 			# Now pruning dangling images in between target builds
 			cmd.run(f"{self.cli} 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")
@@ -735,7 +789,7 @@ class Containerize():
 		wd_yaml = f'{wd}/docker-compose.y*ml'
 		with cls_cmd.getConnection(node) as ssh:
 			ExistEnvFilePrint(ssh, wd)
-			services = [s for s, _ in GetDeployedServices(ssh, wd_yaml)]
+			services = GetDeployedServices(ssh, wd_yaml)
 			success = []
 			fail = []
 			for s in reqServices:
@@ -753,7 +807,7 @@ class Containerize():
 			HTML.CreateHtmlTestRowQueue(self.services, 'KO', [f'Failed stopping {" ".join(fail)}, succeeded {" ".join(success)}'])
 		return success

-	def UndeployObject(self, ctx, node, HTML, to_analyze):
+	def UndeployObject(self, ctx, node, HTML, RAN):
 		lSourcePath = self.eNBSourceCodePath
 		logging.info(f'\u001B[1m Undeploying all objects from server {node}\u001B[0m')
 		yaml = self.yamlPath.strip('/')
@@ -762,49 +816,23 @@ class Containerize():
 		with cls_cmd.getConnection(node) as ssh:
 			ExistEnvFilePrint(ssh, wd)
 			services = GetDeployedServices(ssh, wd_yaml)
-			all_logs = True
+			copyin_res = None
 			ssh.run(f'docker compose -f {wd_yaml} stop')
 			if services is not None:
-				service_desc = {}
-				for s, c in services:
-					ret = ssh.run(f'docker inspect {c} --format="{{{{.State.ExitCode}}}}"')
-					rc = int(ret.stdout.strip())
-					f = CopyinServiceLog(ssh, lSourcePath, s, wd_yaml, ctx)
-					all_logs = all_logs and f is not None
-					service_desc[s] = {'returncode': rc, 'logfile': f}
+				copyin_res = [CopyinServiceLog(ssh, lSourcePath, s, wd_yaml, ctx) for s in services]
 			else:
 				logging.warning('could not identify services to stop => no log file')
 			ssh.run(f'docker compose -f {wd_yaml} down -v')
-			HTML.CreateHtmlTestRowQueue(node, 'OK', ['Undeployment successful'])
 			ssh.run(f'rm {wd}/.env')
-		if not all_logs:
+		if not copyin_res:
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ['Could not copy logfile(s)'])
-			logging.error(f"could not copy all files: {all_logs=} {services=}")
+			logging.error(f"could not copy all files: {copyin_res=} {services=}")
 			success = False
 		else:
-			success = cls_analysis.AnalyzeServices(HTML, service_desc, to_analyze)
+			log_results = [CheckLogs(self, f, HTML, RAN) for f in copyin_res]
+			success = all(log_results)
 		if success:
 			logging.info('\u001B[1m Undeploying objects Pass\u001B[0m')
 		else:
 			logging.error('\u001B[1m Undeploying objects Failed\u001B[0m')
 		return success
-
-	def AnalyzeRTStatsObject(self, HTML, node, ctx, thresholds):
-		logging.info(f'Analyzing realtime stats from server: {node}')
-		yaml = self.yamlPath.strip('/')
-		wd = f'{self.eNBSourceCodePath}/{yaml}'
-		wd_yaml = f'{wd}/docker-compose.y*ml'
-
-		with cls_cmd.getConnection(node) as cmd:
-			services = GetDeployedServices(cmd, wd_yaml)
-			s, _ = services[0] # we simply assume something is deployed, if not Exception will report
-			# similar to BuildRunTests(), use docker cp to avoid problems with permissions
-			cmd.run(f'docker compose -f {wd_yaml} cp {s}:/opt/oai-gnb/nrL1_stats.log {wd}/')
-			l1_file = archiveArtifact(cmd, ctx, f"{wd}/nrL1_stats.log")
-			cmd.run(f'docker compose -f {wd_yaml} cp {s}:/opt/oai-gnb/nrMAC_stats.log {wd}/')
-			mac_file = archiveArtifact(cmd, ctx, f"{wd}/nrMAC_stats.log")
-
-		logging.info(f"check against thresholds from {thresholds}")
-		success, datalog_rt_stats = cls_analysis.Analysis.analyze_rt_stats(thresholds, l1_file, mac_file)
-		HTML.CreateHtmlDataLogTable(datalog_rt_stats)
-		return success
--- a/ci-scripts/cls_loganalysis.py
+++ b/ci-scripts/cls_loganalysis.py
@@ -1,161 +0,0 @@
-#/*
-# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# * contributor license agreements.  See the NOTICE file distributed with
-# * this work for additional information regarding copyright ownership.
-# * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# * except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# *	  http://www.openairinterface.org/?page_id=698
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# *-------------------------------------------------------------------------------
-# * For more information about the OpenAirInterface (OAI) Software Alliance:
-# *	  contact@openairinterface.org
-# */
-#---------------------------------------------------------------------
-
-import re
-import os
-import logging
-from collections import deque
-
-class Default:
-	def run(file, opt=None):
-		success = True
-		logs = []
-		with open(file, "r") as f:
-			for line in f.readlines():
-				result = re.search('[Aa]ssertion', line)
-				if result:
-					logs.append(line)
-					success = False
-		return success, "\n".join(logs)
-
-class ContainsString:
-	def run(file, needle):
-		with open(file, "r") as f:
-			for line in f.readlines():
-				if re.search(needle, line):
-					return True, ""
-		return False, f"could not find '{needle}' in logs"
-
-class LastLineContains:
-	def run(file, string):
-		with open(file, "r") as f:
-			last_line = deque(f, maxlen=1).pop()
-		success = string in last_line
-		log = "" if success else f"could not find '{string}' in last line"
-		return success, log
-
-class EndsWithBye:
-	def run(file, option):
-		# no option: we ignore any
-		with open(file, "r") as f:
-			n = 0
-			for line in reversed(f.readlines()):
-				if re.search(r'^Bye.\n', line, re.MULTILINE) is not None:
-					return True, ""
-				n = n + 1
-				if n > 50: # if not found in last 50 lines, assume it does not exist
-					break
-		return False, "No Bye. message found, did not stop properly"
-
-class RetxCheck():
-	def _parseList(s):
-		if not s:
-			return []
-		return [int(n) for n in s.split(",")]
-
-	def _get_ul_dl(s):
-		dl, ul = (None, None)
-		for o in s.split(";", 1):
-			if o.startswith("dl="):
-				dl = o[3:]
-			elif o.startswith("ul="):
-				ul = o[3:]
-			else:
-				raise ValueError(f"unrecognized option {s}: needs format '[ul=,dl=]X,Y,...[;ul=Z,V,...]'")
-		return dl, ul
-
-	def _parseRetxCheckers(options):
-		if not "=" in options:
-			dlul = RetxCheck._parseList(options)
-			return dlul, dlul
-		dl, ul = RetxCheck._get_ul_dl(options)
-		return RetxCheck._parseList(dl), RetxCheck._parseList(ul)
-
-	def _analyzeUeRetx(rounds, checkers, regex):
-		perc = list(0 for i in checkers) # results in %
-		stats = list(False for i in checkers) # status if succeeded
-		tmp = re.match(regex, rounds)
-		if tmp is None:
-			logging.error('_analyzeUeRetx: did not match regex for DL retx analysis')
-			return stats
-		retx_data = [float(x) for x in tmp.groups()]
-		for i in range(0, len(perc)):
-			#case where numerator > denumerator with denum ==0 is disregarded, cannot hapen in principle, will lead to 0%
-			perc[i] = 0 if (retx_data[i] == 0) else 100 * retx_data[i + 1] / retx_data[i]
-			#treating % > 100 , % > requirement
-			stats[i] = perc[i] <= 100 and perc[i] <= checkers[i]
-		return stats
-
-	def _filter_retx_rounds(l):
-		# map to round number if False, else None
-		l = [i+1 if x is False else None for i, x in enumerate(l)]
-		# filter out None
-		return [x for x in l if x is not None]
-
-	def run(file, options):
-		# aggregate statistics per UE
-		dlsch_ulsch_stats = {}
-		status = True
-		with open(file, "r") as f:
-			for line in f.readlines():
-				keys = {'dlsch_rounds','ulsch_rounds'}
-				for k in keys:
-					result = re.search(k, line)
-					if result is None:
-						continue
-					result = re.search('UE (?:RNTI )?([0-9a-f]{4})', line)
-					if result is None:
-						logging.error(f'did not find RNTI while matching key {k}')
-						status = False
-						continue
-					rnti = result.group(1)
-					if not rnti in dlsch_ulsch_stats:
-						dlsch_ulsch_stats[rnti] = {}
-					dlsch_ulsch_stats[rnti][k]=re.sub(r'^.*\]\s+', r'' , line.rstrip())
-
-		dl, ul = RetxCheck._parseRetxCheckers(options)
-		msgs = []
-		for ue in dlsch_ulsch_stats:
-			dlulstat = dlsch_ulsch_stats[ue]
-
-			for key in dlulstat:
-				msgs.append(dlulstat[key])
-
-			retx_dl = RetxCheck._analyzeUeRetx(dlulstat['dlsch_rounds'], dl, r'^.*dlsch_rounds\s+(\d+)\/(\d+)\/(\d+)\/(\d+),\s+dlsch_errors\s+(\d+)')
-			retx_ul = RetxCheck._analyzeUeRetx(dlulstat['ulsch_rounds'], ul, r'^.*ulsch_rounds\s+(\d+)\/(\d+)\/(\d+)\/(\d+),\s+ulsch_errors\s+(\d+)')
-
-			if False in retx_dl or False in retx_ul:
-				dlstr = RetxCheck._filter_retx_rounds(retx_dl)
-				ulstr = RetxCheck._filter_retx_rounds(retx_ul)
-				msg = f"UE {ue}: retx rounds"
-				if dlstr:
-					msg = f"{msg} DL {dlstr}"
-				if ulstr:
-					msg = f"{msg} UL {ulstr}"
-				msg = f"{msg} exceeded threshold"
-				msgs.append('!!! Failure: ' + msg)
-				logging.error(f'\u001B[1;37;41m {msg}\u001B[0m')
-				status = False
-			else:
-				msg = f"UE {ue} retransmissions within bounds"
-				logging.debug(msg)
-		return status, "\n".join(msgs)
--- a/ci-scripts/cls_oai_html.py
+++ b/ci-scripts/cls_oai_html.py
@@ -218,7 +218,7 @@ class HTMLManagement():
 				cmd = "sed -i -e 's/__STATE_" + self.htmlTabNames[0] + "__//' test_results.html"
 				subprocess.run(cmd, shell=True)
 			else:
-				cmd = "sed -i -e 's/__STATE_" + self.htmlTabNames[0] + r"__/<span class=\"glyphicon glyphicon-remove\"><\/span>/' test_results.html"
+				cmd = "sed -i -e 's/__STATE_" + self.htmlTabNames[0] + "__/<span class=\"glyphicon glyphicon-remove\"><\/span>/' test_results.html"
 				subprocess.run(cmd, shell=True)
 		self.htmlFooterCreated = False

--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -32,6 +32,7 @@
 #-----------------------------------------------------------
 # Import Libs
 #-----------------------------------------------------------
+import sys		# arg
 import re		# reg
 import time		# sleep
 import os
@@ -40,6 +41,7 @@ import concurrent.futures
 import json

 #import our libs
+import helpreadme as HELP
 import constants as CONST

 import cls_module
@@ -253,7 +255,7 @@ def Deploy_Physim(ctx, HTML, node, workdir, script, options):
 	logging.debug(f'Running physims on server {node} workdir {workdir}')
 	with cls_cmd.getConnection(node) as c:
 		sys_info = c.exec_script("scripts/sys-info.sh", 5)
-		ret = c.exec_script(script, 1500, options)
+		ret = c.exec_script(script, 1000, options)
 	logging.debug(f'"{script}" finished with code {ret.returncode}, output:\n{ret.stdout}')
 	HTML.CreateHtmlTestRowQueue('Query system info', 'OK', [sys_info.stdout])
 	with cls_cmd.getConnection(node) as ssh:
@@ -299,6 +301,7 @@ class OaiCiTest():
 		self.iperf_profile = ''
 		self.iperf_tcp_rate_target = ''
 		self.finalStatus = False
+		self.air_interface=''
 		self.ue_ids = []
 		self.svr_node = None
 		self.svr_id = None
@@ -576,6 +579,277 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', [f'{ue_header}\n{msg}'])
 		return success

+	def AnalyzeLogFile_UE(self, UElogFile,HTML,RAN):
+		if (not os.path.isfile(f'{UElogFile}')):
+			return -1
+		ue_log_file = open(f'{UElogFile}', 'r')
+		exitSignalReceived = False
+		foundAssertion = False
+		msgAssertion = ''
+		msgLine = 0
+		foundSegFault = False
+		foundRealTimeIssue = False
+		uciStatMsgCount = 0
+		pdcpDataReqFailedCount = 0
+		badDciCount = 0
+		f1aRetransmissionCount = 0
+		fatalErrorCount = 0
+		macBsrTimerExpiredCount = 0
+		rrcConnectionRecfgComplete = 0
+		no_cell_sync_found = False
+		mib_found = False
+		frequency_found = False
+		plmn_found = False
+		nrUEFlag = False
+		nrDecodeMib = 0
+		nrFoundDCI = 0
+		nrCRCOK = 0
+		mbms_messages = 0
+		nbPduSessAccept = 0
+		nbPduDiscard = 0
+		HTML.htmlUEFailureMsg=''
+		global_status = CONST.ALL_PROCESSES_OK
+		for line in ue_log_file.readlines():
+			result = re.search('nr_synchro_time|Starting NR UE soft modem', str(line))
+			sidelink = re.search('sl-mode', str(line))
+			if result is not None:
+				nrUEFlag = True
+			if sidelink is not None:
+				nrUEFlag = False
+			if nrUEFlag:
+				result = re.search('decode mib', str(line))
+				if result is not None:
+					nrDecodeMib += 1
+				result = re.search('found 1 DCIs', str(line))
+				if result is not None:
+					nrFoundDCI += 1
+				result = re.search('CRC OK', str(line))
+				if result is not None:
+					nrCRCOK += 1
+				result = re.search('Received PDU Session Establishment Accept', str(line))
+				if result is not None:
+					nbPduSessAccept += 1
+				result = re.search('warning: discard PDU, sn out of window', str(line))
+				if result is not None:
+					nbPduDiscard += 1
+				result = re.search('--nfapi STANDALONE_PNF --node-number 2', str(line))
+				if result is not None:
+					frequency_found = True
+			result = re.search('Exiting OAI softmodem', str(line))
+			if result is not None:
+				exitSignalReceived = True
+			result = re.search('System error|[Ss]egmentation [Ff]ault|======= Backtrace: =========|======= Memory map: ========', str(line))
+			if result is not None and not exitSignalReceived:
+				foundSegFault = True
+			result = re.search('[Cc]ore [dD]ump', str(line))
+			if result is not None and not exitSignalReceived:
+				foundSegFault = True
+			result = re.search('[Aa]ssertion', str(line))
+			if result is not None and not exitSignalReceived:
+				foundAssertion = True
+			result = re.search('LLL', str(line))
+			if result is not None and not exitSignalReceived:
+				foundRealTimeIssue = True
+			if foundAssertion and (msgLine < 3):
+				msgLine += 1
+				msgAssertion += str(line)
+			result = re.search('uci->stat', str(line))
+			if result is not None and not exitSignalReceived:
+				uciStatMsgCount += 1
+			result = re.search('PDCP data request failed', str(line))
+			if result is not None and not exitSignalReceived:
+				pdcpDataReqFailedCount += 1
+			result = re.search('bad DCI 1', str(line))
+			if result is not None and not exitSignalReceived:
+				badDciCount += 1
+			result = re.search('Format1A Retransmission but TBS are different', str(line))
+			if result is not None and not exitSignalReceived:
+				f1aRetransmissionCount += 1
+			result = re.search('FATAL ERROR', str(line))
+			if result is not None and not exitSignalReceived:
+				fatalErrorCount += 1
+			result = re.search('MAC BSR Triggered ReTxBSR Timer expiry', str(line))
+			if result is not None and not exitSignalReceived:
+				macBsrTimerExpiredCount += 1
+			result = re.search('Generating RRCConnectionReconfigurationComplete', str(line))
+			if result is not None:
+				rrcConnectionRecfgComplete += 1
+			# No cell synchronization found, abandoning
+			result = re.search('No cell synchronization found, abandoning', str(line))
+			if result is not None:
+				no_cell_sync_found = True
+			if RAN.eNBmbmsEnables[0]:
+				result = re.search('TRIED TO PUSH MBMS DATA', str(line))
+				if result is not None:
+					mbms_messages += 1
+			result = re.search(r"MIB Information => ([a-zA-Z]{1,10}), ([a-zA-Z]{1,10}), NidCell (?P<nidcell>\d{1,3}), N_RB_DL (?P<n_rb_dl>\d{1,3}), PHICH DURATION (?P<phich_duration>\d), PHICH RESOURCE (?P<phich_resource>.{1,4}), TX_ANT (?P<tx_ant>\d)", str(line))
+			if result is not None and (not mib_found):
+				try:
+					mibMsg = "MIB Information: " + result.group(1) + ', ' + result.group(2)
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					mibMsg = "    nidcell = " + result.group('nidcell')
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					mibMsg = "    n_rb_dl = " + result.group('n_rb_dl')
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					mibMsg = "    phich_duration = " + result.group('phich_duration')
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					mibMsg = "    phich_resource = " + result.group('phich_resource')
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					mibMsg = "    tx_ant = " + result.group('tx_ant')
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					mib_found = True
+				except Exception as e:
+					logging.error(f'\033[91m MIB marker was not found \033[0m')
+			result = re.search("Initial sync: pbch decoded sucessfully", str(line))
+			if result is not None and (not frequency_found):
+				try:
+					mibMsg = f"UE decoded PBCH successfully"
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					frequency_found = True
+				except Exception as e:
+					logging.error(f'\033[91m UE did not find PBCH\033[0m')
+			result = re.search(r"PLMN MCC (?P<mcc>\d{1,3}), MNC (?P<mnc>\d{1,3}), TAC", str(line))
+			if result is not None and (not plmn_found):
+				try:
+					mibMsg = f"PLMN MCC = {result.group('mcc')} MNC = {result.group('mnc')}"
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					plmn_found = True
+				except Exception as e:
+					logging.error(f'\033[91m PLMN not found \033[0m')
+			result = re.search(r"Found (?P<operator>[\w,\s]{1,15}) \(name from internal table\)", str(line))
+			if result is not None:
+				try:
+					mibMsg = f"The operator is: {result.group('operator')}"
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
+				except Exception as e:
+					logging.error(f'\033[91m Operator name not found \033[0m')
+			result = re.search("SIB5 InterFreqCarrierFreq element (.{1,4})/(.{1,4})", str(line))
+			if result is not None:
+				try:
+					mibMsg = f'SIB5 InterFreqCarrierFreq element {result.group(1)}/{result.group(2)}'
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + ' -> '
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
+				except Exception as e:
+					logging.error(f'\033[91m SIB5 InterFreqCarrierFreq element not found \033[0m')
+			result = re.search(r"DL Carrier Frequency/ARFCN : \-*(?P<carrier_frequency>\d{1,15}/\d{1,4})", str(line))
+			if result is not None:
+				try:
+					freq = result.group('carrier_frequency')
+					new_freq = re.sub('/[0-9]+','',freq)
+					float_freq = float(new_freq) / 1000000
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + 'DL Freq: ' + ('%.1f' % float_freq) + ' MHz'
+					logging.debug(f'\033[94m    DL Carrier Frequency is:  {freq}\033[0m')
+				except Exception as e:
+					logging.error(f'\033[91m    DL Carrier Frequency not found \033[0m')
+			result = re.search(r"AllowedMeasBandwidth : (?P<allowed_bandwidth>\d{1,7})", str(line))
+			if result is not None:
+				try:
+					prb = result.group('allowed_bandwidth')
+					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + ' -- PRB: ' + prb + '\n'
+					logging.debug(f'\033[94m    AllowedMeasBandwidth: {prb}\033[0m')
+				except Exception as e:
+					logging.error(f'\033[91m    AllowedMeasBandwidth not found \033[0m')
+		ue_log_file.close()
+		if rrcConnectionRecfgComplete > 0:
+			statMsg = f'UE connected to eNB ({rrcConnectionRecfgComplete}) RRCConnectionReconfigurationComplete message(s) generated)'
+			logging.debug(f'\033[94m{statMsg}\033[0m')
+			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+		if nrUEFlag:
+			if nrDecodeMib > 0:
+				statMsg = f'UE showed {nrDecodeMib} "MIB decode" message(s)'
+				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+			if nrFoundDCI > 0:
+				statMsg = f'UE showed {nrFoundDCI} "DCI found" message(s)'
+				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+			if nrCRCOK > 0:
+				statMsg = f'UE showed {nrCRCOK} "PDSCH decoding" message(s)'
+				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+			if not frequency_found:
+				statMsg = 'NR-UE could NOT synch!'
+				logging.error(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+			if nbPduSessAccept > 0:
+				statMsg = f'UE showed {nbPduSessAccept} "Received PDU Session Establishment Accept" message(s)'
+				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+			if nbPduDiscard > 0:
+				statMsg = f'UE showed {nbPduDiscard} "warning: discard PDU, sn out of window" message(s)'
+				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+		if uciStatMsgCount > 0:
+			statMsg = f'UE showed {uciStatMsgCount} "uci->stat" message(s)'
+			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+		if pdcpDataReqFailedCount > 0:
+			statMsg = f'UE showed {pdcpDataReqFailedCount} "PDCP data request failed" message(s)'
+			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+		if badDciCount > 0:
+			statMsg = f'UE showed {badDciCount} "bad DCI 1(A)" message(s)'
+			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+		if f1aRetransmissionCount > 0:
+			statMsg = f'UE showed {f1aRetransmissionCount} "Format1A Retransmission but TBS are different" message(s)'
+			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+		if fatalErrorCount > 0:
+			statMsg = f'UE showed {fatalErrorCount} "FATAL ERROR:" message(s)'
+			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+		if macBsrTimerExpiredCount > 0:
+			statMsg = f'UE showed {fatalErrorCount} "MAC BSR Triggered ReTxBSR Timer expiry" message(s)'
+			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+		if RAN.eNBmbmsEnables[0]:
+			if mbms_messages > 0:
+				statMsg = f'UE showed {mbms_messages} "TRIED TO PUSH MBMS DATA" message(s)'
+				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+			else:
+				statMsg = 'UE did NOT SHOW "TRIED TO PUSH MBMS DATA" message(s)'
+				logging.debug(f'\u001B[1;30;41m{statMsg}\u001B[0m')
+				global_status = CONST.OAI_UE_PROCESS_NO_MBMS_MSGS
+			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
+		if foundSegFault:
+			logging.debug('\u001B[1;37;41m UE ended with a Segmentation Fault! \u001B[0m')
+			if not nrUEFlag:
+				global_status = CONST.OAI_UE_PROCESS_SEG_FAULT
+			else:
+				if not frequency_found:
+					global_status = CONST.OAI_UE_PROCESS_SEG_FAULT
+		if foundAssertion:
+			logging.debug('\u001B[1;30;43m UE showed an assertion! \u001B[0m')
+			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + 'UE showed an assertion!\n'
+			if not nrUEFlag:
+				if not mib_found or not frequency_found:
+					global_status = CONST.OAI_UE_PROCESS_ASSERTION
+			else:
+				if not frequency_found:
+					global_status = CONST.OAI_UE_PROCESS_ASSERTION
+		if foundRealTimeIssue:
+			logging.debug('\u001B[1;37;41m UE faced real time issues! \u001B[0m')
+			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + 'UE faced real time issues!\n'
+		if nrUEFlag:
+			if not frequency_found:
+				global_status = CONST.OAI_UE_PROCESS_COULD_NOT_SYNC
+		else:
+			if no_cell_sync_found and not mib_found:
+				logging.debug('\u001B[1;37;41m UE could not synchronize ! \u001B[0m')
+				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + 'UE could not synchronize!\n'
+				global_status = CONST.OAI_UE_PROCESS_COULD_NOT_SYNC
+		return global_status
+
 	def TerminateUE(self, ctx, node, HTML):
 		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
--- a/ci-scripts/cls_static_code_analysis.py
+++ b/ci-scripts/cls_static_code_analysis.py
@@ -89,7 +89,7 @@ class StaticCodeAnalysis():
 		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)
+		result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository)
 		if result is not None:
 			full_ran_repo_name = self.ranRepository.replace('git/', 'git')
 		else:
@@ -121,7 +121,7 @@ class StaticCodeAnalysis():
 				xmlStart = False
 				with open(filename, 'r') as logfile:
 					for line in logfile:
-						ret = re.search(r'cppcheck version="(?P<version>[0-9\.]+)"', str(line))
+						ret = re.search('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:
--- a/ci-scripts/conf_files/enb.band38.25prb.rfsim.conf
+++ b/ci-scripts/conf_files/enb.band38.25prb.rfsim.conf
@@ -200,11 +200,9 @@ RUs = (
    }
 );  

-rfsimulator = (
-  {
+rfsimulator: {
    serveraddr = "server";
-  }
-);
+};

 THREAD_STRUCT = (
  {
--- a/ci-scripts/conf_files/untested/enb.band38.nsa_2x2.100prb.usrpn310.conf
+++ b/ci-scripts/conf_files/untested/enb.band38.nsa_2x2.100prb.usrpn310.conf
--- a/ci-scripts/conf_files/enb.band7.100prb.rfsim.conf
+++ b/ci-scripts/conf_files/enb.band7.100prb.rfsim.conf
@@ -233,11 +233,9 @@ RUs =
  }
 );

-rfsimulator = (
-  {
+rfsimulator: {
    serveraddr = "server";
-  }
-);
+};

 THREAD_STRUCT =
 (
--- a/ci-scripts/conf_files/enb.band7.25prb.rfsim.conf
+++ b/ci-scripts/conf_files/enb.band7.25prb.rfsim.conf
@@ -233,11 +233,9 @@ RUs =
  }
 );

-rfsimulator = (
-  {
+rfsimulator: {
    serveraddr = "server";
-  }
-);
+};

 THREAD_STRUCT =
 (
--- a/ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf
+++ b/ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf
@@ -233,11 +233,9 @@ RUs =
  }
 );

-rfsimulator = (
-  {
+rfsimulator: {
    serveraddr = "server";
-  }
-);
+};

 THREAD_STRUCT =
 (
--- a/ci-scripts/conf_files/enb.band7.50prb.rfsim.conf
+++ b/ci-scripts/conf_files/enb.band7.50prb.rfsim.conf
@@ -233,11 +233,9 @@ RUs =
  }
 );

-rfsimulator = (
-  {
+rfsimulator: {
    serveraddr = "server";
-  }
-);
+};

 THREAD_STRUCT =
 (
--- a/ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf
+++ b/ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf
@@ -362,11 +362,9 @@ RUs = (
    }
 );

-rfsimulator = (
-  {
+rfsimulator: {
    serveraddr = "server";
-  }
-);
+};

 THREAD_STRUCT = (
  {
--- a/ci-scripts/conf_files/untested/enb.band7.tm1.50prb.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band7.tm1.50prb.usrpb210.conf
--- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
@@ -197,15 +197,13 @@ RUs = (
    }
 );  

-rfsimulator = (
-  {
-    serveraddr = "server";
+rfsimulator: {
+serveraddr = "server";
    serverport = 4043;
    options = (); #("saviq"); or/and "chanmod"
    modelname = "AWGN";
-    IQfile = "/tmp/rfsimulator.iqs";
-  }
-);
+    IQfile = "/tmp/rfsimulator.iqs"
+}

 log_config: {
  global_log_level = "info";
--- a/ci-scripts/conf_files/gnb-pnf.band66.rfsim.conf
+++ b/ci-scripts/conf_files/gnb-pnf.band66.rfsim.conf
@@ -27,15 +27,14 @@ RUs = ({
  eNB_instances  = [0];
 });

-rfsimulator = (
+rfsimulator :
 {
  serveraddr = "server";
  serverport = 4043;
  options = (); #("saviq"); or/and "chanmod"
  modelname = "AWGN";
  IQfile = "/tmp/rfsimulator.iqs";
-}
-);
+};

 log_config: {
  global_log_level = "info";
--- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
@@ -13,7 +13,16 @@ gNBs =

    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1; }) });
+    plmn_list = ({
+                  mcc = 208;
+                  mnc = 97;
+                  mnc_length = 2;
+                  snssaiList = (
+                    {
+                      sst = 1;
+                    }
+                  );
+                  });

    nr_cellid = 12345678L;

@@ -177,19 +186,19 @@ gNBs =

 MACRLCs = (
 {
-  num_cc             = 1;
-  remote_s_address   = "127.0.0.1"; // pnf addr [!]
-  local_s_address    = "127.0.0.2"; // vnf addr
-  local_s_portc      = 50001; // vnf p5 port
-  remote_s_portc     = 50000; // pnf p5 port [!]
-  local_s_portd      = 50011; // vnf p7 port [!]
-  remote_s_portd     = 50010; // pnf p7 port [!]
-  tr_s_preference    = "aerial";
-  tr_n_preference    = "local_RRC";
-  pusch_TargetSNRx10 = 280; # 150;
-  pucch_TargetSNRx10 = 200; #200;
-  dl_max_mcs         = 28;
-  ul_max_mcs         = 28;
+  num_cc           = 1;
+  remote_s_address = "127.0.0.1"; // pnf addr [!]
+  local_s_address  = "127.0.0.2"; // vnf addr
+  local_s_portc    = 50001; // vnf p5 port
+  remote_s_portc   = 50000; // pnf p5 port [!]
+  local_s_portd    = 50011; // vnf p7 port [!]
+  remote_s_portd   = 50010; // pnf p7 port [!]
+  tr_s_preference             = "aerial";
+  tr_n_preference             = "local_RRC";
+  pusch_TargetSNRx10          = 280; # 150;
+  pucch_TargetSNRx10          = 200; #200;
+  dl_max_mcs = 28;
+  ul_max_mcs = 28;
 }
 );

@@ -213,13 +222,13 @@ security = {

 log_config :
 {
-  global_log_level ="info";
-  hw_log_level     ="info";
-  phy_log_level    ="info";
-  mac_log_level    ="info";
-  rlc_log_level    ="info";
-  pdcp_log_level   ="info";
-  rrc_log_level    ="info";
-  ngap_log_level   ="debug";
-  f1ap_log_level   ="debug";
+  global_log_level                      ="info";
+  hw_log_level                          ="info";
+  phy_log_level                         ="info";
+  mac_log_level                         ="info";
+  rlc_log_level                         ="info";
+  pdcp_log_level                        ="info";
+  rrc_log_level                         ="info";
+  ngap_log_level                        ="debug";
+  f1ap_log_level                        ="debug";
 };
--- a/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf
@@ -191,11 +191,10 @@ RUs = (
    }
 );

-rfsimulator = (
-  {
+rfsimulator: {
    serveraddr = "server";
-  }
-);
+};
+

 security = {
  # preferred ciphering algorithms
--- a/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf
@@ -200,11 +200,10 @@ RUs = (
    }
 );  

-rfsimulator = (
-  {
+rfsimulator: {
    serveraddr = "server";
-  }
-);
+};
+

 security = {
  # preferred ciphering algorithms
--- a/ci-scripts/conf_files/untested/gnb.nsa.band78.106prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/untested/gnb.nsa.band78.106prb.usrpn310.2x2.conf
--- a/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn-leo.conf
+++ b/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn-leo.conf
@@ -234,15 +234,14 @@ RUs = (
    }
 );

-rfsimulator = (
+rfsimulator :
 {
  serveraddr = "server";
  serverport = 4043;
  options = ("chanmod"); #("saviq"); or/and "chanmod"
  prop_delay = 20;
  IQfile = "/tmp/rfsimulator.iqs";
-}
-);
+};

 channelmod = {
  max_chan=10;
--- a/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf
+++ b/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf
@@ -242,15 +242,14 @@ RUs = (
    }
 );

-rfsimulator = (
+rfsimulator :
 {
  serveraddr = "server";
  serverport = 4043;
  options = (); #("saviq"); or/and "chanmod"
  prop_delay = 238.74;
  IQfile = "/tmp/rfsimulator.iqs";
-}
-);
+};

 security = {
  # preferred ciphering algorithms
--- a/ci-scripts/conf_files/gnb.sa.band257.u3.66prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band257.u3.66prb.rfsim.conf
@@ -68,7 +68,7 @@ gNBs =
        initialULBWPsubcarrierSpacing                                           = 3;
      #rach-ConfigCommon
        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 70;
+          prach_ConfigurationIndex                                  = 52;
 #prach_msg1_FDM
 #0 = one, 1=two, 2=four, 3=eight
          prach_msg1_FDM                                            = 0;
@@ -110,7 +110,7 @@ gNBs =
        hoppingId                                                   = 40;
        p0_nominal                                                  = -90;

-      ssb_PositionsInBurst_Bitmap                                   = 85;
+      ssb_PositionsInBurst_Bitmap                                   = 1;

 # ssb_periodicityServingCell
 # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1 
@@ -175,10 +175,10 @@ MACRLCs = ({
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 200;
  pucch_TargetSNRx10          = 200;
-  set_analog_beamforming      = "lophy";
+  set_analog_beamforming      = 2;
  beam_duration               = 1;
  beams_per_period            = 1;
-  beam_weights = [0, 1, 2, 3]; // 4 SSBs -> 4 analog beams
+  beam_weights = [0]; // single SSB -> one analog beam
 });

 L1s = (
@@ -202,11 +202,9 @@ RUs = ({
  eNB_instances  = [0];
 });

-rfsimulator = (
-  {
+rfsimulator: {
    serveraddr = "server";
-  }
-);
+};

 security = {
  # preferred ciphering algorithms
--- a/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf
@@ -18,7 +18,7 @@ gNBs =
    ////////// Physical parameters:

    min_rxtxtime                                              = 6;
-    enable_sdap = 0;
+    enable_sdap = 1;

    servingCellConfigCommon = (
    {
@@ -205,15 +205,14 @@ RUs = (
 );


-rfsimulator = (
-  {
+rfsimulator :
+{
    serveraddr = "server";
    serverport = 4043;
    options = (); #("saviq"); or/and "chanmod"
    modelname = "AWGN";
    IQfile = "/tmp/rfsimulator.iqs";
-  }
-);
+};

 security = {
  # preferred ciphering algorithms
--- a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-4L-vvdn.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-4L-vvdn.conf
@@ -1,266 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
-    // 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; }); });
-
-    nr_cellid = 1;
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2;
-    pdsch_AntennaPorts_N1 = 2;
-    maxMIMO_layers        = 4;
-    pusch_AntennaPorts    = 4;
-    do_CSIRS              = 0;
-    do_SRS                = 0;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-      physCellId                                                    = 0;
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # center frequency = 4049.76 MHz
-      # selected SSB frequency = 4049.76 MHz
-      absoluteFrequencySSB                                          = 668640; #669984;
-      dl_frequencyBand                                              = 77;
-      # frequency point A = 4000.62 MHz
-      dl_absoluteFrequencyPointA                                    = 666708;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 273;
-     #initialDownlinkBWP
-      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 11;
-        initialDLBWPsearchSpaceZero                                 = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 77;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 273;
-      pMax                                                          = 23;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 159;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 0;
-          preambleReceivedTargetPower                               = -100;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 7;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 2;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
-        msg3_DeltaPreamble                                          = 2;
-        p0_NominalWithGrant                                         = -100;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 0;
-        p0_nominal                                                  = -96;
-
-      ssb_PositionsInBurst_Bitmap                                   = 0x1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 5;
-      nrofDownlinkSlots                                             = 3;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 1;
-      nrofUplinkSymbols                                             = 4;
-
-  ssPBCH_BlockPower                                                 = -11;
-  }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.6.5"; });
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.209";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.209";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 220;
-  pucch_TargetSNRx10          = 220;
-  pusch_FailureThres          = 100;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 120
-  pucch0_dtx_threshold = 80;
-  pusch_dtx_threshold = -100;
-  tx_amp_backoff_dB = 3;
-  L1_rx_thread_core = 8;
-  L1_tx_thread_core = 9;
-  max_ldpc_iterations = 20;
-  phase_compensation = 0; # needs to match O-RU configuration
-}
-);
-
-RUs = (
-{
-  local_rf       = "no";
-  nb_tx          = 4;
-  nb_rx          = 4;
-  att_tx         = 0;
-  att_rx         = 0;
-  bands          = [77];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 75;
-  sf_extension                  = 0;
-  eNB_instances  = [0];
-  ru_thread_core = 10;
-  sl_ahead       = 5;
-  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
-  do_precoding   = 0; # needs to match O-RU configuration
-}
-);
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level = "info";
-  hw_log_level     = "info";
-  phy_log_level    = "info";
-  mac_log_level    = "info";
-  rlc_log_level    = "info";
-  pdcp_log_level   = "info";
-  rrc_log_level    = "info";
-  ngap_log_level   = "info";
-  f1ap_log_level   = "info";
-};
-
-fhi_72 = {
-  dpdk_devices = ("0000:01:01.0");
-  dpdk_iova_mode = "VA";
-  system_core = 11;
-  io_core = 12;
-  worker_cores = (13);
-  ru_addr = ("98:ae:71:04:83:e3");
-  mtu = 9600;
-  fh_config = ({
-    T1a_cp_dl = (285, 470);
-    T1a_cp_ul = (285, 429);
-    T1a_up = (125, 350);
-    Ta4 = (110, 180);
-    ru_config = {
-      iq_width = 9;
-      iq_width_prach = 9;
-    };
-  });
-};
-
--- a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
@@ -251,7 +251,7 @@ fhi_72 = {
  io_core = 1;
  worker_cores = (2);
  ru_addr = ("98:ae:71:04:83:e3", "98:ae:71:04:83:e3");
-  mtu = 9216;
+  mtu = 9600;
  fh_config = ({
    T1a_cp_dl = (285, 470);
    T1a_cp_ul = (285, 429);
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf
@@ -208,11 +208,9 @@ RUs = (
 );


-rfsimulator = (
-  {
+rfsimulator: {
    serveraddr = "server";
-  }
-);
+};

 security = {
  # preferred ciphering algorithms
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf
@@ -197,11 +197,9 @@ RUs = (
    }
 );

-rfsimulator = (
-  {
+rfsimulator: {
    serveraddr = "server";
-  }
-);
+};

 security = {
  # preferred ciphering algorithms
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf
@@ -204,15 +204,13 @@ RUs = ({
 });


-rfsimulator = (
-{
+rfsimulator: {
  serveraddr = "server";
  serverport = 4043;
  options = (); #("saviq"); or/and "chanmod"
  modelname = "AWGN";
  IQfile = "/tmp/rfsimulator.iqs"
 }
-);

 security = {
 # preferred ciphering algorithms
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.prs.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.prs.conf
@@ -155,8 +155,8 @@ gNBs =
        NETWORK_INTERFACES :
        {

-           GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140";
-           GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140";
+           GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CI_GNB_IP_ADDR";
+           GNB_IPV4_ADDRESS_FOR_NGU                 = "CI_GNB_IP_ADDR";
           GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
        };

@@ -217,15 +217,14 @@ RUs = (
 );


-rfsimulator = (
+rfsimulator :
 {
  serveraddr = "server";
  serverport = 4043;
  options    = (); #("saviq"); or/and "chanmod"
  modelname  = "AWGN";
  IQfile     = "/tmp/rfsimulator.iqs";
-}
-);
+};

 security = {
  # preferred ciphering algorithms
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml
@@ -168,7 +168,7 @@ RUs:
    sdr_addrs: serial=XXXXXXX

 rfsimulator:
-  - serveraddr: server
+  serveraddr: server

 security:
  # preferred ciphering algorithms
--- a/ci-scripts/conf_files/untested/gnb.sa.band78.106prb.usrp310.2x2.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band78.106prb.usrp310.2x2.conf
--- a/ci-scripts/conf_files/untested/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf
--- a/ci-scripts/conf_files/untested/gnb.sa.band78.162prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band78.162prb.usrpn310.2x2.conf
--- a/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf
@@ -203,11 +203,10 @@ RUs = (
 }
 );

-rfsimulator = (
-  {
+rfsimulator: {
    serveraddr = "server";
-  }
-);
+};
+

 security = {
  # preferred ciphering algorithms
--- a/ci-scripts/conf_files/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf
@@ -258,7 +258,7 @@ fhi_72 = {
  io_core = 1;
  worker_cores = (2);
  ru_addr = ("70:b3:d5:e1:5b:81", "70:b3:d5:e1:5b:81");
-  mtu = 9216;
+  mtu = 9600;
  fh_config = ({
    T1a_cp_dl = (419, 470);
    T1a_cp_ul = (285, 336);
--- a/ci-scripts/conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf
@@ -203,15 +203,14 @@ RUs = (
 );


-rfsimulator = (
+rfsimulator :
 {
  serveraddr = "server";
  serverport = 4043;
  options = (); #("saviq"); or/and "chanmod"
  modelname = "AWGN";
  IQfile = "/tmp/rfsimulator.iqs";
-}
-);
+};

 security = {
  # preferred ciphering algorithms
--- a/ci-scripts/conf_files/lteue.rfsim.conf
+++ b/ci-scripts/conf_files/lteue.rfsim.conf
@@ -1,5 +0,0 @@
-rfsimulator = (
-  {
-    serveraddr = "127.0.0.1";
-  }
-);
--- a/ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf
+++ b/ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf
@@ -12,7 +12,8 @@ uicc0 = {
 imsi = "208990100001100";
 key = "fec86ba6eb707ed08905757b1bb44b8f";
 opc= "C42449363BBAD02B66D16BC975D77CC1";
-pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+dnn= "oai";
+nssai_sst=1;
 }

 MACRLCs = (
--- a/ci-scripts/conf_files/nrue.band78.106prb.prs.conf
+++ b/ci-scripts/conf_files/nrue.band78.106prb.prs.conf
@@ -87,9 +87,3 @@ PRSs =
    );
  }
 );
-
-rfsimulator = (
-  {
-    serveraddr = "127.0.0.1";
-  }
-);
--- a/ci-scripts/conf_files/nrue.uicc.2pdu.conf
+++ b/ci-scripts/conf_files/nrue.uicc.2pdu.conf
@@ -1,17 +0,0 @@
-uicc0 = {
-  imsi = "208990100001100";
-  key = "fec86ba6eb707ed08905757b1bb44b8f";
-  opc= "C42449363BBAD02B66D16BC975D77CC1";
-  pdu_sessions = (
-    { id = 1; dnn = "oai"; nssai_sst = 1; },
-    { id = 2; dnn = "oai"; nssai_sst = 1; }
-  )
-}
-
-thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
-
-rfsimulator = (
-  {
-    serveraddr = "127.0.0.1";
-  }
-);
--- a/ci-scripts/conf_files/nrue.uicc.conf
+++ b/ci-scripts/conf_files/nrue.uicc.conf
@@ -2,7 +2,8 @@ uicc0 = {
  imsi = "208990100001100";
  key = "fec86ba6eb707ed08905757b1bb44b8f";
  opc= "C42449363BBAD02B66D16BC975D77CC1";
-  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+  dnn= "oai";
+  nssai_sst=1;
 }

 position0 = {
@@ -13,12 +14,6 @@ position0 = {

 thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"

-rfsimulator = (
-  {
-    serveraddr = "127.0.0.1";
-  }
-);
-
 #/* configuration for channel modelisation */
 #/* To be included in main config file when */
 #/* channel modelisation is used (rfsimulator with chanmod options enabled) */
@@ -45,4 +40,4 @@ channelmod = {
      ds_tdl         = 0;
    }
  );
-};
+};
--- a/ci-scripts/conf_files/nrue.uicc.ntn-leo.conf
+++ b/ci-scripts/conf_files/nrue.uicc.ntn-leo.conf
@@ -2,7 +2,8 @@ uicc0 = {
  imsi = "208990100001100";
  key = "fec86ba6eb707ed08905757b1bb44b8f";
  opc= "C42449363BBAD02B66D16BC975D77CC1";
-  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+  dnn= "oai";
+  nssai_sst=1;
 }

 position0 = {
@@ -13,40 +14,6 @@ position0 = {

 thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"

-rfsimulator = (
-    {
-        prop_delay = 20;
-        options = ("chanmod");
-    }
-);
-
-RUs = (
-    {
-        nb_tx      = 1;
-        nb_rx      = 1;
-        att_tx     = 0;
-        att_rx     = 0;
-        max_rxgain = 114;
-        sdr_addrs  = "type=x300";
-        clock_src  = "internal";
-        time_src   = "internal";
-        # if_freq    = 3700000000L;
-        # if_offset  = 1000000;
-    }
-);
-
-cells = (
-    {
-        ru_id      = 0;
-        band       = 254;
-        rf_freq    = 2488400000L;
-        rf_offset  = -873500000L;
-        numerology = 0;
-        N_RB_DL    = 25;
-        ssb_start  = 60;
-    }
-);
-
 #/* configuration for channel modelisation */
 #/* To be included in main config file when */
 #/* channel modelisation is used (rfsimulator with chanmod options enabled) */
--- a/ci-scripts/conf_files/nrue.uicc.yaml
+++ b/ci-scripts/conf_files/nrue.uicc.yaml
@@ -2,15 +2,11 @@ uicc0:
  imsi: 208990100001100
  key: fec86ba6eb707ed08905757b1bb44b8f
  opc: C42449363BBAD02B66D16BC975D77CC1
-  pdu_sessions:
-    - dnn: oai
-      nssai_sst: 1
+  dnn: oai
+  nssai_sst: 1

 thread-pool: "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"

-rfsimulator:
-  - serveraddr: "127.0.0.1"
-
 #/* configuration for channel modelisation */
 #/* To be included in main config file when */
 #/* channel modelisation is used (rfsimulator with chanmod options enabled) */
--- a/ci-scripts/conf_files/nrue.vrtsim.chanmod.yaml
+++ b/ci-scripts/conf_files/nrue.vrtsim.chanmod.yaml
@@ -2,9 +2,8 @@ uicc0:
  imsi: 208990100001100
  key: fec86ba6eb707ed08905757b1bb44b8f
  opc: C42449363BBAD02B66D16BC975D77CC1
-  pdu_sessions:
-    - dnn: oai
-      nssai_sst: 1
+  dnn: oai
+  nssai_sst: 1

 thread-pool: "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"

--- a/ci-scripts/conf_files/ue.sa.conf
+++ b/ci-scripts/conf_files/ue.sa.conf
@@ -2,7 +2,8 @@ uicc0 = {
  imsi = "208970100001127";
  key = "fec86ba6eb707ed08905757b1bb44b8f";
  opc= "c42449363bbad02b66d16bc975d77cc1";
-  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+  dnn= "oai";
+  nssai_sst=1;
 }

 thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
--- a/ci-scripts/conf_files/untested/episci/episci_nr-ue.nfapi.conf
+++ b/ci-scripts/conf_files/untested/episci/episci_nr-ue.nfapi.conf
@@ -12,7 +12,9 @@ uicc0 = {
 imsi = "208950000000031";
 key = "0c0a34601d4f07677303652c0462535b";
 opc= "63bfa50ee6523365ff14c1f45f88737d";
-pdu_sessions = ({ dnn = "oai"; nssai_sst = 222; nssai_sd = 123; });
+dnn= "oai";
+nssai_sst=222;
+nssai_sd=123;
 }

 MACRLCs = (
--- a/ci-scripts/conf_files/untested/episci/proxy_nr-ue.nfapi.conf
+++ b/ci-scripts/conf_files/untested/episci/proxy_nr-ue.nfapi.conf
@@ -12,7 +12,9 @@ uicc0 = {
 imsi = "2089900007487";
 key = "fec86ba6eb707ed08905757b1bb44b8f";
 opc= "C42449363BBAD02B66D16BC975D77CC1";
-pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; nssai_sd = 1; });
+dnn= "oai";
+nssai_sst=1;
+nssai_sd=1;
 }

 MACRLCs = (
--- a/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf
@@ -18,7 +18,7 @@ gNBs =
    ////////// Physical parameters:

    min_rxtxtime                                              = 6;
-    enable_sdap = 0;
+    enable_sdap = 1;

    servingCellConfigCommon = (
    {
@@ -205,15 +205,14 @@ RUs = (
 );


-rfsimulator = (
-  {
+rfsimulator :
+{
    serveraddr = "server";
    serverport = 4043;
    options = (); #("saviq"); or/and "chanmod"
    modelname = "AWGN";
    IQfile = "/tmp/rfsimulator.iqs";
-  }
-);
+};

 security = {
  # preferred ciphering algorithms
--- a/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf
@@ -200,15 +200,14 @@ RUs = (
 );


-rfsimulator = (
+rfsimulator :
 {
  serveraddr = "server";
  serverport = 4043;
  options = (); #("saviq"); or/and "chanmod"
  modelname = "AWGN";
  IQfile = "/tmp/rfsimulator.iqs";
-}
-);
+};

 security = {
  # preferred ciphering algorithms
--- a/ci-scripts/datalog_rt_stats.100.4x4.fhi72.yaml
+++ b/ci-scripts/datalog_rt_stats.100.4x4.fhi72.yaml
@@ -1,28 +0,0 @@
-#this is a configuration file
-#used to build real time processing statistics
-#for 5G NR phy test (gNB terminate)
-Title : Processing Time (us) from datalog_rt_stats.4x4.fhi72.yaml
-ColNames :
-  - Metric
-  - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
-Ref :
-  tx_fhaul : 40.2
-  feptx_prec (per port, half_slot) : 12.3
-  L1 Tx processing : 221.0
-  DLSCH encoding : 141.0
-  L1 Rx processing : 332.5
-  UL segments decoding : 55.2
-  UL Indication : 0.4
-  Slot Indication : 14.3
-  PUSCH inner-receiver : 421.4
-DeviationThreshold :
-  tx_fhaul : 0.25
-  feptx_prec (per port, half_slot) : 0.25
-  L1 Tx processing : 0.25
-  DLSCH encoding : 0.25
-  L1 Rx processing : 0.25
-  UL segments decoding : 0.25
-  UL Indication : 1.00
-  Slot Indication : 0.50
-  PUSCH inner-receiver : 0.25
--- a/ci-scripts/docker/Dockerfile.channelsim.ubuntu
+++ b/ci-scripts/docker/Dockerfile.channelsim.ubuntu
@@ -1,52 +0,0 @@
-#/*
-# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# * contributor license agreements.  See the NOTICE file distributed with
-# * this work for additional information regarding copyright ownership.
-# * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# * except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# *      http://www.openairinterface.org/?page_id=698
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# *-------------------------------------------------------------------------------
-# * For more information about the OpenAirInterface (OAI) Software Alliance:
-# *      contact@openairinterface.org
-# */
-#---------------------------------------------------------------------
-#
-# Dockerfile for the Open-Air-Interface BUILD service
-#   Valid for Ubuntu 24.04
-#
-#---------------------------------------------------------------------
-FROM nvidia/cuda:12.9.1-devel-ubuntu22.04 AS cuda-image
-FROM ran-base:develop AS ran-tests
-
-RUN rm -Rf /oai-ran
-COPY --from=cuda-image /usr/local/cuda/ /usr/local/cuda/
-
-# Set the LD_LIBRARY_PATH to ensure the system can find the copied libraries.
-# This is crucial for applications that use CUDA.
-ENV LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda/targets/sbsa-linux/lib
-ENV PATH=/usr/local/cuda/bin:$PATH
-ENV C_INCLUDE_PATH=/usr/local/cuda/include
-
-WORKDIR /oai-ran
-COPY . .
-
-WORKDIR /oai-ran/build
-RUN cmake -GNinja -DENABLE_PHYSIM_TESTS=ON -DENABLE_TESTS=ON \
-        -DSANITIZE_UNDEFINED=OFF -DSANITIZE_ADDRESS=OFF \
-        -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror \
-        -DPHYSIM_CHECK_FILES="ThresholdsCuda.cmake" \
-        -DCUDA_ENABLE=ON \
-        -DUSE_UNIFIED_MEMORY=ON \
-        -DUSE_ATS_MEMORY=OFF \
-        -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=/oai-ran/cmake_targets/ran_build/build \
-        .. && \
-        ninja test_channel_scalability test_multipath test_noise
--- a/ci-scripts/docker/Dockerfile.physim.cuda.ubuntu
+++ b/ci-scripts/docker/Dockerfile.physim.cuda.ubuntu
@@ -1,52 +0,0 @@
-#/*
-# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# * contributor license agreements.  See the NOTICE file distributed with
-# * this work for additional information regarding copyright ownership.
-# * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# * except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# *      http://www.openairinterface.org/?page_id=698
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# *-------------------------------------------------------------------------------
-# * For more information about the OpenAirInterface (OAI) Software Alliance:
-# *      contact@openairinterface.org
-# */
-#---------------------------------------------------------------------
-#
-# Dockerfile for the Open-Air-Interface BUILD service
-#   Valid for Ubuntu 24.04
-#
-#---------------------------------------------------------------------
-FROM nvidia/cuda:12.9.1-devel-ubuntu22.04 AS cuda-image
-FROM ran-base:develop AS ran-tests
-
-RUN rm -Rf /oai-ran
-COPY --from=cuda-image /usr/local/cuda/ /usr/local/cuda/
-
-# Set the LD_LIBRARY_PATH to ensure the system can find the copied libraries.
-# This is crucial for applications that use CUDA.
-ENV LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda/targets/sbsa-linux/lib
-ENV PATH=/usr/local/cuda/bin:$PATH
-ENV C_INCLUDE_PATH=/usr/local/cuda/include
-
-WORKDIR /oai-ran
-COPY . .
-
-WORKDIR /oai-ran/build
-RUN cmake -GNinja -DENABLE_PHYSIM_TESTS=ON -DENABLE_TESTS=ON \
-        -DSANITIZE_UNDEFINED=OFF -DSANITIZE_ADDRESS=OFF \
-        -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror \
-        -DPHYSIM_CHECK_FILES="ThresholdsCuda.cmake" \
-        -DCUDA_ENABLE=ON \
-        -DUSE_UNIFIED_MEMORY=ON \
-        -DUSE_ATS_MEMORY=OFF \
-        -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=/oai-ran/cmake_targets/ran_build/build \
-        .. && \
-        ninja nr_ulsim nr_dlsim
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -62,6 +62,13 @@ import lxml.etree as ET
 import logging
 import signal
 import traceback
+logging.basicConfig(
+	level=logging.DEBUG,
+	stream=sys.stdout,
+	format="[%(asctime)s] %(levelname)8s: %(message)s"
+)
+
+


 #-----------------------------------------------------------
@@ -102,20 +109,41 @@ def ExecuteActionWithParam(action, ctx, node):
 			success = CONTAINERS.BuildRunTests(ctx, node, HTML)

 	elif action == 'Initialize_eNB':
+		datalog_rt_stats_file=test.findtext('rt_stats_cfg')
+		if datalog_rt_stats_file is None:
+			RAN.datalog_rt_stats_file='datalog_rt_stats.default.yaml'
+		else:
+			RAN.datalog_rt_stats_file=datalog_rt_stats_file
 		RAN.Initialize_eNB_args=test.findtext('Initialize_eNB_args')
+		USRPIPAddress = test.findtext('USRP_IPAddress') or ''
+
+		#local variable air_interface
+		air_interface = test.findtext('air_interface')		
+		if (air_interface is None) or (air_interface.lower() not in ['nr','lte']):
+			RAN.air_interface = 'lte-softmodem'
+		else:
+			RAN.air_interface = air_interface.lower() +'-softmodem'
+
 		cmd_prefix = test.findtext('cmd_prefix')
 		if cmd_prefix is not None: RAN.cmd_prefix = cmd_prefix
 		success = RAN.InitializeeNB(ctx, node, HTML)

 	elif action == 'Terminate_eNB':
-		services = []
-		analysis = test.find("analysis")
-		if analysis is not None:
-			# services: multiple services to analyse, separated by whitespace
-			services = analysis.findtext("services", default="").split()
-			# service: individual services to analyze, in case they have whitespace
-			services = services + [s.text for s in analysis.findall("service")]
-		success = RAN.TerminateeNB(ctx, node, HTML, services)
+		#retx checkers
+		string_field = test.findtext('d_retx_th')
+		if (string_field is not None):
+			RAN.ran_checkers['d_retx_th'] = [float(x) for x in string_field.split(',')]
+		string_field=test.findtext('u_retx_th')
+		if (string_field is not None):
+			RAN.ran_checkers['u_retx_th'] = [float(x) for x in string_field.split(',')]
+
+		#local variable air_interface
+		air_interface = test.findtext('air_interface')		
+		if (air_interface is None) or (air_interface.lower() not in ['nr','lte']):
+			RAN.air_interface = 'lte-softmodem'
+		else:
+			RAN.air_interface = air_interface.lower() +'-softmodem'
+		success = RAN.TerminateeNB(ctx, node, HTML)

 	elif action == 'Initialize_UE' or action == 'Attach_UE' or action == 'Detach_UE' or action == 'Terminate_UE' or action == 'CheckStatusUE' or action == 'DataEnable_UE' or action == 'DataDisable_UE':
 		CiTestObj.ue_ids = test.findtext('id').split(' ')
@@ -174,9 +202,9 @@ def ExecuteActionWithParam(action, ctx, node):
 		workdir = CLUSTER.eNBSourceCodePath
 		success = cls_oaicitest.Deploy_Physim(ctx, HTML, node, workdir, script, options)

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

 	elif action == 'Deploy_Object' or action == 'Undeploy_Object' or action == "Create_Workspace" or action == "Stop_Object":
 		CONTAINERS.yamlPath = test.findtext('yaml_path')
+		string_field=test.findtext('d_retx_th')
+		if (string_field is not None):
+			CONTAINERS.ran_checkers['d_retx_th'] = [float(x) for x in string_field.split(',')]
+		string_field=test.findtext('u_retx_th')
+		if (string_field is not None):
+			CONTAINERS.ran_checkers['u_retx_th'] = [float(x) for x in string_field.split(',')]
 		CONTAINERS.services = test.findtext('services')
 		CONTAINERS.num_attempts = int(test.findtext('num_attempts') or 1)
 		CONTAINERS.deploymentTag = cls_containerize.CreateTag(CONTAINERS.ranCommitID, CONTAINERS.ranBranch, CONTAINERS.ranAllowMerge)
@@ -196,14 +230,7 @@ def ExecuteActionWithParam(action, ctx, node):
 		elif action == 'Stop_Object':
 			success = CONTAINERS.StopObject(ctx, node, HTML)
 		elif action == 'Undeploy_Object':
-			analysis = test.find("analysis")
-			services = []
-			if analysis is not None:
-				# services: multiple services to analyse, separated by whitespace
-				services = analysis.findtext("services", default="").split()
-				# service: individual services to analyze, in case they have whitespace
-				services = services + [s.text for s in analysis.findall("service")]
-			success = CONTAINERS.UndeployObject(ctx, node, HTML, services)
+			success = CONTAINERS.UndeployObject(ctx, node, HTML, RAN)
 		elif action == 'Create_Workspace':
 			if force_local:
 				# Do not create a working directory when running locally. Current repo directory will be used
@@ -253,20 +280,21 @@ def ExecuteActionWithParam(action, ctx, node):
 		images = test.findtext('images').split()
 		success = CLUSTER.PullClusterImage(HTML, node, images, tag_prefix=tag_prefix)

-	elif action == 'AnalyzeRTStats':
-		yaml = test.findtext('stats_cfg')
-		success = RAN.AnalyzeRTStats(HTML, node, ctx, yaml)
-
-	elif action == 'AnalyzeRTStats_Object':
-		yaml = test.findtext('stats_cfg')
-		success = CONTAINERS.AnalyzeRTStatsObject(HTML, node, ctx, yaml)
-
 	else:
 		logging.warning(f"unknown action {action}, skip step")
 		success = True # by default, we skip the step and print a warning

 	return success

+#check if given test is in list
+#it is in list if one of the strings in 'list' is at the beginning of 'test'
+def test_in_list(test, list):
+	for check in list:
+		check=check.replace('+','')
+		if (test.startswith(check)):
+			return True
+	return False
+
 test_runner_abort = False
 def receive_signal(signum, frame):
    global test_runner_abort
@@ -321,12 +349,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)
-fmt = "%(levelname)8s: %(message)s"
-if date_fmt:
-    fmt = "[%(asctime)s] %(levelname)s %(message)s"
-logging.basicConfig(level=logging.DEBUG, stream=sys.stdout, format=fmt, datefmt=date_fmt,)
-
+mode, force_local = args_parse.ArgsParse(sys.argv,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER)

 #-----------------------------------------------------------
 # mode amd XML class (action) analysis
@@ -344,7 +367,18 @@ elif re.match('^TerminateSPGW$', mode, re.IGNORECASE):
 elif re.match('^LogCollectBuild$', mode, re.IGNORECASE):
 	logging.warning("Option LogCollectBuild ignored")
 elif re.match('^LogCollecteNB$', mode, re.IGNORECASE):
-	logging.warning("Option LogCollecteNB ignored")
+	if RAN.eNBSourceCodePath == '':
+		HELP.GenericHelp(CONST.Version)
+		sys.exit('Insufficient Parameter')
+	if os.path.isdir('cmake_targets/log'):
+		cmd = 'zip -r enb.log.' + RAN.BuildId + '.zip cmake_targets/log'
+		logging.info(cmd)
+		try:
+			zipStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=60)
+		except subprocess.CalledProcessError as e:
+			logging.error("Command '{}' returned non-zero exit status {}.".format(e.cmd, e.returncode))
+			logging.error("Error output:\n{}".format(e.output))
+		sys.exit(0)
 elif re.match('^LogCollectHSS$', mode, re.IGNORECASE):
 	logging.warning("Option LogCollectHSS ignored")
 elif re.match('^LogCollectMME$', mode, re.IGNORECASE):
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -31,16 +31,21 @@
 #-----------------------------------------------------------
 # Import
 #-----------------------------------------------------------
+import sys              # arg
 import re               # reg
 import logging
 import os
 import time
+import yaml
+import cls_cmd
+

 #-----------------------------------------------------------
 # OAI Testing modules
 #-----------------------------------------------------------
 import cls_cmd
-import cls_analysis
+import helpreadme as HELP
+import constants as CONST
 from cls_ci_helper import archiveArtifact

 #-----------------------------------------------------------
@@ -58,9 +63,16 @@ class RANManagement():
 		self.eNBSourceCodePath = ''
 		self.Initialize_eNB_args = ''
 		self.imageKind = ''
+		self.air_interface = ''
 		self.eNBOptions = ['', '', '']
+		self.eNBmbmsEnables = [False, False, False]
 		self.eNBstatuses = [-1, -1, -1]
 		self.runtime_stats= ''
+		self.datalog_rt_stats={}
+		self.datalog_rt_stats_file='datalog_rt_stats.default.yaml'
+		self.USRPIPAddress = ''
+		#checkers from xml
+		self.ran_checkers={}
 		self.cmd_prefix = '' # prefix before {lte,nr}-softmodem
 		self.node = ''
 		self.command = ''
@@ -90,7 +102,7 @@ class RANManagement():

 		logfile = f'{lSourcePath}/cmake_targets/enb.log'
 		cmd.cd(f"{lSourcePath}/cmake_targets/") # important: set wd so nrL1_stats.log etc are logged here
-		cmd.run(f'sudo -E stdbuf -o0 {self.cmd_prefix} {lSourcePath}/cmake_targets/ran_build/build/nr-softmodem -O {lSourcePath}/{full_config_file} {extra_options} > {logfile} 2>&1 &')
+		cmd.run(f'sudo -E stdbuf -o0 {self.cmd_prefix} {lSourcePath}/cmake_targets/ran_build/build/{self.air_interface} -O {lSourcePath}/{full_config_file} {extra_options} > {logfile} 2>&1 &')

 		if extra_options != '':
 			self.eNBOptions = extra_options
@@ -104,12 +116,12 @@ class RANManagement():
 				enbDidSync = True
 				break
 		if not enbDidSync:
-			cmd.run(f'sudo killall -9 nr-softmodem') # in case it did not stop automatically
+			cmd.run(f'sudo killall -9 {self.air_interface}') # in case it did not stop automatically
 			archiveArtifact(cmd, ctx, logfile)

 		cmd.close()

-		msg = f'{self.cmd_prefix} nr-softmodem -O {config_file} {extra_options}'
+		msg = f'{self.cmd_prefix} {self.air_interface} -O {config_file} {extra_options}'
 		if enbDidSync:
 			logging.debug('\u001B[1m Initialize eNB/gNB Completed\u001B[0m')
 			HTML.CreateHtmlTestRowQueue(msg, 'OK', [])
@@ -119,7 +131,7 @@ class RANManagement():

 		return enbDidSync

-	def TerminateeNB(self, ctx, node, HTML, to_analyze):
+	def TerminateeNB(self, ctx, node, HTML):
 		logging.debug('Stopping eNB/gNB on server: ' + node)
 		lSourcePath = self.eNBSourceCodePath
 		cmd = cls_cmd.getConnection(node)
@@ -134,13 +146,14 @@ class RANManagement():
 		if result is not None:
 			cmd.run('sudo -S killall --signal SIGKILL -r .*-softmodem')
 			time.sleep(5)
-		HTML.CreateHtmlTestRowQueue(node, 'OK', ['Undeployment successful'])

 		# see InitializeeNB()
 		logfile = f'{lSourcePath}/cmake_targets/enb.log'
 		logdir = os.path.dirname(logfile)

 		file = archiveArtifact(cmd, ctx, logfile)
+		archiveArtifact(cmd, ctx, f"{logdir}/nrL1_stats.log")
+		archiveArtifact(cmd, ctx, f"{logdir}/nrMAC_stats.log")
 		cmd.close()
 		if file is None:
 			logging.debug('\u001B[1;37;41m Could not copy xNB logfile to analyze it! \u001B[0m')
@@ -149,21 +162,633 @@ class RANManagement():
 			return False

 		logging.debug('\u001B[1m Analyzing xNB logfile \u001B[0m ' + file)
-		service_desc = {}
-		service_desc["nr-softmodem"] = {'returncode': 0, 'logfile': file}
-		success = cls_analysis.AnalyzeServices(HTML, service_desc, to_analyze)
-		return success
+		logStatus = self.AnalyzeLogFile_eNB(file, HTML, self.ran_checkers)
+		if logStatus < 0:
+			HTML.CreateHtmlTestRow('N/A', 'KO', logStatus)
+		else:
+			HTML.CreateHtmlTestRow(self.runtime_stats, 'OK', CONST.ALL_PROCESSES_OK)

-	def AnalyzeRTStats(self, HTML, node, ctx, thresholds):
-		logging.info(f'Analyzing realtime stats from server: {node}')
-		lSourcePath = self.eNBSourceCodePath
+		#display rt stats for gNB only
+		if len(self.datalog_rt_stats) != 0:
+			HTML.CreateHtmlDataLogTable(self.datalog_rt_stats)

-		logdir = f'{lSourcePath}/cmake_targets'
-		with cls_cmd.getConnection(node) as cmd:
-			l1_file = archiveArtifact(cmd, ctx, f"{logdir}/nrL1_stats.log")
-			mac_file = archiveArtifact(cmd, ctx, f"{logdir}/nrMAC_stats.log")
+		return logStatus >= 0

-		logging.info(f"check against thresholds from {thresholds}")
-		success, datalog_rt_stats = cls_analysis.Analysis.analyze_rt_stats(thresholds, l1_file, mac_file)
-		HTML.CreateHtmlDataLogTable(datalog_rt_stats)
-		return success
+	def _analyzeUeRetx(self, rounds, checkers, regex):
+		if len(rounds) == 0 or len(checkers) == 0:
+			logging.warning(f'warning: rounds={rounds} checkers={checkers}')
+			return []
+
+		perc = list(0 for i in checkers) # results in %
+		stats = list(False for i in checkers) # status if succeeded
+		tmp = re.match(regex, rounds)
+		if tmp is None:
+			logging.error('_analyzeUeRetx: did not match regex for DL retx analysis')
+			return stats
+		retx_data = [float(x) for x in tmp.groups()]
+		for i in range(0, len(perc)):
+			#case where numerator > denumerator with denum ==0 is disregarded, cannot hapen in principle, will lead to 0%
+			perc[i] = 0 if (retx_data[i] == 0) else 100 * retx_data[i + 1] / retx_data[i]
+			#treating % > 100 , % > requirement
+			stats[i] = perc[i] <= 100 and perc[i] <= checkers[i]
+		return stats
+
+	def AnalyzeLogFile_eNB(self, eNBlogFile, HTML, checkers={}):
+		if (not os.path.isfile(eNBlogFile)):
+			return -1
+		enb_log_file = open(eNBlogFile, 'r')
+		exitSignalReceived = False
+		foundAssertion = False
+		msgAssertion = ''
+		msgLine = 0
+		foundSegFault = False
+		foundRealTimeIssue = False
+		foundRealTimeIssue_cnt = 0
+		rrcSetupComplete = 0
+		rrcReleaseRequest = 0
+		rrcReconfigRequest = 0
+		rrcReconfigComplete = 0
+		rrcReestablishRequest = 0
+		rrcReestablishComplete = 0
+		rrcReestablishReject = 0
+		rlcDiscardBuffer = 0
+		rachCanceledProcedure = 0
+		uciStatMsgCount = 0
+		pdcpFailure = 0
+		ulschFailure = 0
+		ulschAllocateCCEerror = 0
+		uplinkSegmentsAborted = 0
+		ulschReceiveOK = 0
+		gnbRxTxWakeUpFailure = 0
+		gnbTxWriteThreadEnabled = False
+		cdrxActivationMessageCount = 0
+		dropNotEnoughRBs = 0
+		mbmsRequestMsg = 0
+		htmleNBFailureMsg = ''
+		isRRU = False
+		isSlave = False
+		slaveReceivesFrameResyncCmd = False
+		X2HO_state = CONST.X2_HO_REQ_STATE__IDLE
+		X2HO_inNbProcedures = 0
+		X2HO_outNbProcedures = 0
+		global_status = CONST.ALL_PROCESSES_OK
+		# Runtime statistics
+		runTime = ''
+		userTime = ''
+		systemTime = ''
+		maxPhyMemUsage = ''
+		nbContextSwitches = ''
+		#NSA FR1 check
+		NSA_RAPROC_PUSCH_check = 0
+		#dlsch and ulsch statistics (dictionary)
+		dlsch_ulsch_stats = {}
+		#real time statistics (dictionary)
+		real_time_stats = {}
+		#count "problem receiving samples" msg
+		pb_receiving_samples_cnt = 0
+		#count "removing UE" msg
+		removing_ue = 0
+		#count"X2AP-PDU"
+		x2ap_pdu = 0
+		#gnb specific log markers
+		gnb_markers ={'SgNBReleaseRequestAcknowledge': [],'FAILURE': [], 'scgFailureInformationNR-r15': [], 'SgNBReleaseRequest': [], 'Detected UL Failure on PUSCH':[]}
+		nodeB_prefix_found = False
+		RealTimeProcessingIssue = False
+		retx_status = {}
+		nrRrcRcfgComplete = 0
+		harqFeedbackPast = 0
+		showedByeMsg = False # last line is Bye. -> stopped properly
+	
+		line_cnt=0 #log file line counter
+		for line in enb_log_file.readlines():
+			line_cnt+=1
+			# Detection of eNB/gNB from a container log
+			result = re.search('Starting eNB soft modem', str(line))
+			if result is not None:
+				nodeB_prefix_found = True
+				nodeB_prefix = 'e'
+			result = re.search('Starting gNB soft modem', str(line))
+			if result is not None:
+				nodeB_prefix_found = True
+				nodeB_prefix = 'g'
+			result = re.search('Run time:' ,str(line))
+			# Runtime statistics
+			result = re.search('Run time:' ,str(line))
+			if result is not None:
+				runTime = str(line).strip()
+			if runTime != '':
+				result = re.search('Time executing user inst', str(line))
+				if result is not None:
+					fields=line.split(':')
+					userTime = 'userTime : ' + fields[1].replace('\n','')
+				result = re.search('Time executing system inst', str(line))
+				if result is not None:
+					fields=line.split(':')
+					systemTime = 'systemTime : ' + fields[1].replace('\n','')
+				result = re.search('Max. Phy. memory usage:', str(line))
+				if result is not None:
+					fields=line.split(':')
+					maxPhyMemUsage = 'maxPhyMemUsage : ' + fields[1].replace('\n','')
+				result = re.search('Number of context switch.*process origin', str(line))
+				if result is not None:
+					fields=line.split(':')
+					nbContextSwitches = 'nbContextSwitches : ' + fields[1].replace('\n','')
+			if X2HO_state == CONST.X2_HO_REQ_STATE__IDLE:
+				result = re.search('target eNB Receives X2 HO Req X2AP_HANDOVER_REQ', str(line))
+				if result is not None:
+					X2HO_state = CONST.X2_HO_REQ_STATE__TARGET_RECEIVES_REQ
+				result = re.search('source eNB receives the X2 HO ACK X2AP_HANDOVER_REQ_ACK', str(line))
+				if result is not None:
+					X2HO_state = CONST.X2_HO_REQ_STATE__SOURCE_RECEIVES_REQ_ACK
+			if X2HO_state == CONST.X2_HO_REQ_STATE__TARGET_RECEIVES_REQ:
+				result = re.search('Received LTE_RRCConnectionReconfigurationComplete from UE', str(line))
+				if result is not None:
+					X2HO_state = CONST.X2_HO_REQ_STATE__TARGET_RRC_RECFG_COMPLETE
+			if X2HO_state == CONST.X2_HO_REQ_STATE__TARGET_RRC_RECFG_COMPLETE:
+				result = re.search('issue rrc_eNB_send_PATH_SWITCH_REQ', str(line))
+				if result is not None:
+					X2HO_state = CONST.X2_HO_REQ_STATE__TARGET_SENDS_SWITCH_REQ
+			if X2HO_state == CONST.X2_HO_REQ_STATE__TARGET_SENDS_SWITCH_REQ:
+				result = re.search('received path switch ack S1AP_PATH_SWITCH_REQ_ACK', str(line))
+				if result is not None:
+					X2HO_state = CONST.X2_HO_REQ_STATE__IDLE
+					X2HO_inNbProcedures += 1
+			if X2HO_state == CONST.X2_HO_REQ_STATE__SOURCE_RECEIVES_REQ_ACK:
+				result = re.search('source eNB receives the X2 UE CONTEXT RELEASE X2AP_UE_CONTEXT_RELEASE', str(line))
+				if result is not None:
+					X2HO_state = CONST.X2_HO_REQ_STATE__IDLE
+					X2HO_outNbProcedures += 1
+
+			if self.eNBOptions[0] != '':
+				res1 = re.search('max_rxgain (?P<requested_option>[0-9]+)', self.eNBOptions[0])
+				res2 = re.search('max_rxgain (?P<applied_option>[0-9]+)',  str(line))
+				if res1 is not None and res2 is not None:
+					requested_option = int(res1.group('requested_option'))
+					applied_option = int(res2.group('applied_option'))
+					if requested_option == applied_option:
+						htmleNBFailureMsg += '<span class="glyphicon glyphicon-ok-circle"></span> Command line option(s) correctly applied <span class="glyphicon glyphicon-arrow-right"></span> ' + self.eNBOptions[0] + '\n\n'
+					else:
+						htmleNBFailureMsg += '<span class="glyphicon glyphicon-ban-circle"></span> Command line option(s) NOT applied <span class="glyphicon glyphicon-arrow-right"></span> ' + self.eNBOptions[0] + '\n\n'
+			result = re.search('Exiting OAI softmodem|Caught SIGTERM, shutting down', str(line))
+			if result is not None:
+				exitSignalReceived = True
+			result = re.search('[Ss]egmentation [Ff]ault', str(line))
+			if result is not None and not exitSignalReceived:
+				foundSegFault = True
+			result = re.search('[Cc]ore [dD]ump', str(line))
+			if result is not None and not exitSignalReceived:
+				foundSegFault = True
+			result = re.search('[Aa]ssertion', str(line))
+			if result is not None and not exitSignalReceived:
+				foundAssertion = True
+			result = re.search('LLL', str(line))
+			if result is not None and not exitSignalReceived:
+				foundRealTimeIssue = True
+				foundRealTimeIssue_cnt += 1
+			if foundAssertion and (msgLine < 3):
+				msgLine += 1
+				msgAssertion += str(line)
+			result = re.search('Setting function for RU', str(line))
+			if result is not None:
+				isRRU = True
+			if isRRU:
+				result = re.search('RU 0 is_slave=yes', str(line))
+				if result is not None:
+					isSlave = True
+				if isSlave:
+					result = re.search('Received RRU_frame_resynch command', str(line))
+					if result is not None:
+						slaveReceivesFrameResyncCmd = True
+			result = re.search('LTE_RRCConnectionSetupComplete from UE', str(line))
+			if result is not None:
+				rrcSetupComplete += 1
+			result = re.search('Generate LTE_RRCConnectionRelease|Generate RRCConnectionRelease', str(line))
+			if result is not None:				rrcReleaseRequest += 1
+			result = re.search('Generate LTE_RRCConnectionReconfiguration', str(line))
+			if result is not None:
+				rrcReconfigRequest += 1
+			result = re.search('LTE_RRCConnectionReconfigurationComplete from UE rnti', str(line))
+			if result is not None:
+				rrcReconfigComplete += 1
+			result = re.search('LTE_RRCConnectionReestablishmentRequest', str(line))
+			if result is not None:
+				rrcReestablishRequest += 1
+			result = re.search('LTE_RRCConnectionReestablishmentComplete', str(line))
+			if result is not None:
+				rrcReestablishComplete += 1
+			result = re.search('LTE_RRCConnectionReestablishmentReject', str(line))
+			if result is not None:
+				rrcReestablishReject += 1
+			result = re.search('CDRX configuration activated after RRC Connection', str(line))
+			if result is not None:
+				cdrxActivationMessageCount += 1
+			result = re.search('uci->stat', str(line))
+			if result is not None:
+				uciStatMsgCount += 1
+			result = re.search('PDCP.*Out of Resources.*reason', str(line))
+			if result is not None:
+				pdcpFailure += 1
+			result = re.search('could not wakeup gNB rxtx process', str(line))
+			if result is not None:
+				gnbRxTxWakeUpFailure += 1
+			result = re.search('tx write thread ready', str(line))
+			if result is not None:
+				gnbTxWriteThreadEnabled = True
+			result = re.search('ULSCH in error in round|ULSCH 0 in error', str(line))
+			if result is not None:
+				ulschFailure += 1
+			result = re.search('ERROR ALLOCATING CCEs', str(line))
+			if result is not None:
+				ulschAllocateCCEerror += 1
+			result = re.search('uplink segment error.*aborted [1-9] segments', str(line))
+			if result is not None:
+				uplinkSegmentsAborted += 1
+			result = re.search('ULSCH received ok', str(line))
+			if result is not None:
+				ulschReceiveOK += 1
+			result = re.search('BAD all_segments_received', str(line))
+			if result is not None:
+				rlcDiscardBuffer += 1
+			result = re.search('Canceled RA procedure for UE rnti', str(line))
+			if result is not None:
+				rachCanceledProcedure += 1
+			result = re.search('dropping, not enough RBs', str(line))
+			if result is not None:
+				dropNotEnoughRBs += 1
+			if self.eNBmbmsEnables[0]:
+				result = re.search('MBMS USER-PLANE.*Requesting.*bytes from RLC', str(line))
+				if result is not None:
+					mbmsRequestMsg += 1
+			#FR1 NSA test : add new markers to make sure gNB is used
+			result = re.search('\[gNB [0-9]+\]\[RAPROC\] PUSCH with TC_RNTI 0x[0-9a-fA-F]+ received correctly, adding UE MAC Context RNTI 0x[0-9a-fA-F]+', str(line))
+			if result is not None:
+				NSA_RAPROC_PUSCH_check = 1
+
+			# Collect information on UE DLSCH and ULSCH statistics
+			keys = {'dlsch_rounds','ulsch_rounds'}
+			for k in keys:
+				result = re.search(k, line)
+				if result is None:
+					continue
+				result = re.search('UE (?:RNTI )?([0-9a-f]{4})', line)
+				if result is None:
+					logging.error(f'did not find RNTI while matching key {k}')
+					continue
+				rnti = result.group(1)
+
+				#remove 1- all useless char before relevant info (ulsch or dlsch) 2- trailing char
+				if not rnti in dlsch_ulsch_stats: dlsch_ulsch_stats[rnti] = {}
+				dlsch_ulsch_stats[rnti][k]=re.sub(r'^.*\]\s+', r'' , line.rstrip())
+
+			result = re.search('Received NR_RRCReconfigurationComplete from UE', str(line))
+			if result is not None:
+				nrRrcRcfgComplete += 1
+			result = re.search('HARQ feedback is in the past', str(line))
+			if result is not None:
+				harqFeedbackPast += 1
+
+
+			#count "problem receiving samples" msg
+			result = re.search('\[PHY\]\s+problem receiving samples', str(line))
+			if result is not None:
+				pb_receiving_samples_cnt += 1
+			#count "Removing UE" msg
+			result = re.search('\[MAC\]\s+Removing UE', str(line))
+			if result is not None:
+				removing_ue += 1
+			#count "X2AP-PDU"
+			result = re.search('X2AP-PDU', str(line))
+			if result is not None:
+				x2ap_pdu += 1
+			#gnb markers logging
+			for k in gnb_markers:
+				result = re.search(k, line)
+				if result is not None:
+					gnb_markers[k].append(line_cnt)
+
+			# check whether e/gNB log finishes with "Bye." message
+			showedByeMsg |= re.search(r'^Bye.\n', str(line), re.MULTILINE) is not None
+
+		enb_log_file.close()
+
+
+		#the following part takes the *_stats.log files as source (not the stdout log file)
+
+		#the datalog config file has to be loaded
+		datalog_rt_stats_file=self.datalog_rt_stats_file
+		if (os.path.isfile(datalog_rt_stats_file)):
+			yaml_file=datalog_rt_stats_file
+		elif (os.path.isfile('ci-scripts/'+datalog_rt_stats_file)):
+			yaml_file='ci-scripts/'+datalog_rt_stats_file
+		else:
+			logging.error("Datalog RT stats yaml file cannot be found")
+			sys.exit("Datalog RT stats yaml file cannot be found")
+
+		with open(yaml_file,'r') as f:
+			datalog_rt_stats = yaml.load(f,Loader=yaml.FullLoader)
+		rt_keys = datalog_rt_stats['Ref'] #we use the keys from the Ref field  
+
+		# nrL1_stats.log/nrMAC_stats.log should be in the same directory as main log file
+		# currently the link is only implicit as below based on pattern matching
+		# I will rework this to give the file explicitly
+		l1_stats_fn = re.sub(r'-enb.log$', '-nrL1_stats.log', eNBlogFile)
+		mac_stats_fn = re.sub(r'-enb.log$', '-nrMAC_stats.log', eNBlogFile)
+		if os.path.isfile(l1_stats_fn) and os.path.isfile(mac_stats_fn):
+			# don't use CI-nrL1_stats.log, as this will increase the processing time for
+			# no reason, we just need the last occurence
+			nrL1_stats = open(l1_stats_fn, 'r')
+			nrMAC_stats = open(mac_stats_fn, 'r')
+			for line in nrL1_stats.readlines():
+				for k in rt_keys:
+					result = re.search(k, line)     
+					if result is not None:
+						#remove 1- all useless char before relevant info  2- trailing char
+						tmp=re.match(rf'^.*?(\b{k}\b.*)',line.rstrip()) #from python 3.6 we can use literal string interpolation for the variable k, using rf' in the regex
+						if tmp!=None: 
+							real_time_stats[k]=tmp.group(1)
+			for line in nrMAC_stats.readlines():
+				for k in rt_keys:
+					result = re.search(k, line)     
+					if result is not None:
+						#remove 1- all useless char before relevant info  2- trailing char
+						tmp=re.match(rf'^.*?(\b{k}\b.*)',line.rstrip()) #from python 3.6 we can use literal string interpolation for the variable k, using rf' in the regex
+						if tmp!=None: 
+							real_time_stats[k]=tmp.group(1)
+			nrL1_stats.close()
+			nrMAC_stats.close()
+		else:
+			logging.debug(f"NR Stats files for RT analysis not found: {l1_stats_fn}, {mac_stats_fn}")
+
+		#stdout log file and stat log files analysis completed
+		logging.debug('   File analysis (stdout, stats) completed')
+
+		#post processing depending on the node type
+		if not nodeB_prefix_found:
+			if self.air_interface == 'lte-softmodem':
+				nodeB_prefix = 'e'
+			else:
+				nodeB_prefix = 'g'
+
+		if nodeB_prefix == 'g':
+			if ulschReceiveOK > 0:
+				statMsg = nodeB_prefix + 'NB showed ' + str(ulschReceiveOK) + ' "ULSCH received ok" message(s)'
+				logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+				htmleNBFailureMsg += statMsg + '\n'
+			if gnbRxTxWakeUpFailure > 0:
+				statMsg = nodeB_prefix + 'NB showed ' + str(gnbRxTxWakeUpFailure) + ' "could not wakeup gNB rxtx process" message(s)'
+				logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+				htmleNBFailureMsg += statMsg + '\n'
+			if gnbTxWriteThreadEnabled:
+				statMsg = nodeB_prefix + 'NB ran with TX Write thread enabled'
+				logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+				htmleNBFailureMsg += statMsg + '\n'
+			if nrRrcRcfgComplete > 0:
+				statMsg = nodeB_prefix + 'NB showed ' + str(nrRrcRcfgComplete) + ' "Received NR_RRCReconfigurationComplete from UE" message(s)'
+				logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+				htmleNBFailureMsg += statMsg + '\n'
+			if harqFeedbackPast > 0:
+				statMsg = nodeB_prefix + 'NB showed ' + str(harqFeedbackPast) + ' "HARQ feedback is in the past" message(s)'
+				logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+				htmleNBFailureMsg += statMsg + '\n'
+			#FR1 NSA test : add new markers to make sure gNB is used
+			if NSA_RAPROC_PUSCH_check:
+				statMsg = '[RAPROC] PUSCH with TC_RNTI message check for ' + nodeB_prefix + 'NB : PASS '
+				htmlMsg = statMsg+'\n'
+			else:
+				statMsg = '[RAPROC] PUSCH with TC_RNTI message check for ' + nodeB_prefix + 'NB : FAIL or not relevant'
+				htmlMsg = statMsg+'\n'
+			logging.debug(statMsg)
+			htmleNBFailureMsg += htmlMsg
+			#problem receiving samples log
+			statMsg = '[PHY] problem receiving samples msg count =  '+str(pb_receiving_samples_cnt)
+			htmlMsg = statMsg+'\n'
+			logging.debug(statMsg)
+			htmleNBFailureMsg += htmlMsg
+			#gnb markers
+			statMsg = 'logfile line count = ' + str(line_cnt)			
+			htmlMsg = statMsg+'\n'
+			logging.debug(statMsg)
+			htmleNBFailureMsg += htmlMsg
+			if len(gnb_markers['SgNBReleaseRequestAcknowledge'])!=0:
+				statMsg = 'SgNBReleaseRequestAcknowledge = ' + str(len(gnb_markers['SgNBReleaseRequestAcknowledge'])) + ' occurences , starting line ' + str(gnb_markers['SgNBReleaseRequestAcknowledge'][0])
+			else:
+				statMsg = 'SgNBReleaseRequestAcknowledge = ' + str(len(gnb_markers['SgNBReleaseRequestAcknowledge'])) + ' occurences' 
+			htmlMsg = statMsg+'\n'
+			logging.debug(statMsg)
+			htmleNBFailureMsg += htmlMsg
+			statMsg = 'FAILURE = ' + str(len(gnb_markers['FAILURE'])) + ' occurences'
+			htmlMsg = statMsg+'\n'
+			logging.debug(statMsg)
+			htmleNBFailureMsg += htmlMsg
+			statMsg = 'Detected UL Failure on PUSCH = ' + str(len(gnb_markers['Detected UL Failure on PUSCH'])) + ' occurences'
+			htmlMsg = statMsg+'\n'
+			logging.debug(statMsg)
+			htmleNBFailureMsg += htmlMsg
+
+			#ulsch and dlsch statistics and checkers
+			for ue in dlsch_ulsch_stats:
+				dlulstat = dlsch_ulsch_stats[ue]
+				#print statistics into html
+				statMsg=''
+				for key in dlulstat:
+					statMsg += dlulstat[key] + '\n'
+					logging.debug(dlulstat[key])
+				htmleNBFailureMsg += statMsg
+
+				retx_status[ue] = {}
+				dlcheckers = [] if 'd_retx_th' not in checkers else checkers['d_retx_th']
+				retx_status[ue]['dl'] = self._analyzeUeRetx(dlulstat['dlsch_rounds'], dlcheckers, r'^.*dlsch_rounds\s+(\d+)\/(\d+)\/(\d+)\/(\d+),\s+dlsch_errors\s+(\d+)')
+				ulcheckers = [] if 'u_retx_th' not in checkers else checkers['u_retx_th']
+				retx_status[ue]['ul'] = self._analyzeUeRetx(dlulstat['ulsch_rounds'], ulcheckers, r'^.*ulsch_rounds\s+(\d+)\/(\d+)\/(\d+)\/(\d+),\s+ulsch_errors\s+(\d+)')
+
+
+			#real time statistics
+			datalog_rt_stats['Data']={}
+			if len(real_time_stats)!=0: #check if dictionary is not empty
+				for k in real_time_stats:
+					tmp=re.match(r'^(?P<metric>.*):\s+(?P<avg>\d+\.\d+) us;\s+(?P<count>\d+);\s+(?P<max>\d+\.\d+) us;',real_time_stats[k])
+					if tmp is not None:
+						metric=tmp.group('metric')
+						avg=float(tmp.group('avg'))
+						max=float(tmp.group('max'))
+						count=int(tmp.group('count'))
+						datalog_rt_stats['Data'][metric]=["{:.0f}".format(avg),"{:.0f}".format(max),"{:d}".format(count),"{:.2f}".format(avg/datalog_rt_stats['Ref'][metric])]
+				#once all metrics are collected, store the data as a class attribute to build a dedicated HTML table afterward
+				self.datalog_rt_stats=datalog_rt_stats
+				#check if there is a fail => will render the test as failed
+				for k in datalog_rt_stats['Data']:
+					valnorm = float(datalog_rt_stats['Data'][k][3])
+					dev = datalog_rt_stats['DeviationThreshold'][k]
+					if valnorm > 1.0 + dev or valnorm < 1.0 - dev: # condition for fail : avg/ref deviates by more than "deviation threshold"
+						logging.debug(f'\u001B[1;30;43m normalized datalog_rt_stats metric {k}={valnorm} deviates by more than {dev}\u001B[0m')
+						RealTimeProcessingIssue = True
+			else:
+				statMsg = 'No real time stats found in the log file\n'
+				logging.debug('No real time stats found in the log file')
+				htmleNBFailureMsg += statMsg
+
+			if not showedByeMsg:
+				logging.debug('\u001B[1;37;41m ' + nodeB_prefix + 'NB did not show "Bye." message at end, it likely did not stop properly! \u001B[0m')
+				htmleNBFailureMsg += 'No Bye. message found, did not stop properly\n'
+				global_status = CONST.ENB_SHUTDOWN_NO_BYE
+			else:
+				logging.debug('"Bye." message found at end.')
+
+		else:
+			#Removing UE log
+			statMsg = '[MAC] Removing UE msg count =  '+str(removing_ue)
+			htmlMsg = statMsg+'\n'
+			logging.debug(statMsg)
+			htmleNBFailureMsg += htmlMsg
+			#X2AP-PDU log
+			statMsg = 'X2AP-PDU msg count =  '+str(x2ap_pdu)
+			htmlMsg = statMsg+'\n'
+			logging.debug(statMsg)
+			htmleNBFailureMsg += htmlMsg
+			#nsa markers
+			statMsg = 'logfile line count = ' + str(line_cnt)			
+			htmlMsg = statMsg+'\n'
+			logging.debug(statMsg)
+			htmleNBFailureMsg += htmlMsg
+			if len(gnb_markers['SgNBReleaseRequest'])!=0:
+				statMsg = 'SgNBReleaseRequest = ' + str(len(gnb_markers['SgNBReleaseRequest'])) + ' occurences , starting line ' + str(gnb_markers['SgNBReleaseRequest'][0])
+			else:
+				statMsg = 'SgNBReleaseRequest = ' + str(len(gnb_markers['SgNBReleaseRequest'])) + ' occurences'
+			htmlMsg = statMsg+'\n'
+			logging.debug(statMsg)
+			htmleNBFailureMsg += htmlMsg
+			statMsg = 'scgFailureInformationNR-r15 = ' + str(len(gnb_markers['scgFailureInformationNR-r15'])) + ' occurences'
+			htmlMsg = statMsg+'\n'
+			logging.debug(statMsg)
+			htmleNBFailureMsg += htmlMsg			
+
+		for ue in retx_status:
+			msg = f"retransmissions for UE {ue}: DL {retx_status[ue]['dl']} UL {retx_status[ue]['ul']}"
+			if False in retx_status[ue]['dl'] or False in retx_status[ue]['ul']:
+				msg = 'Failure: ' + msg
+				logging.error(f'\u001B[1;37;41m {msg}\u001B[0m')
+				htmleNBFailureMsg += f'{msg}\n'
+				global_status = CONST.ENB_RETX_ISSUE
+			else:
+				logging.debug(msg)
+
+		if RealTimeProcessingIssue:
+			logging.debug('\u001B[1;37;41m ' + nodeB_prefix + 'NB ended with real time processing issue! \u001B[0m')
+			htmleNBFailureMsg += 'Fail due to real time processing issue\n'
+			global_status = CONST.ENB_REAL_TIME_PROCESSING_ISSUE
+		if uciStatMsgCount > 0:
+			statMsg = nodeB_prefix + 'NB showed ' + str(uciStatMsgCount) + ' "uci->stat" message(s)'
+			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+			htmleNBFailureMsg += statMsg + '\n'
+		if pdcpFailure > 0:
+			statMsg = nodeB_prefix + 'NB showed ' + str(pdcpFailure) + ' "PDCP Out of Resources" message(s)'
+			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+			htmleNBFailureMsg += statMsg + '\n'
+		if ulschFailure > 0:
+			statMsg = nodeB_prefix + 'NB showed ' + str(ulschFailure) + ' "ULSCH in error in round" message(s)'
+			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+			htmleNBFailureMsg += statMsg + '\n'
+		if ulschAllocateCCEerror > 0:
+			statMsg = nodeB_prefix + 'NB showed ' + str(ulschAllocateCCEerror) + ' "eNB_dlsch_ulsch_scheduler(); ERROR ALLOCATING CCEs" message(s)'
+			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+			htmleNBFailureMsg += statMsg + '\n'
+		if uplinkSegmentsAborted > 0:
+			statMsg = nodeB_prefix + 'NB showed ' + str(uplinkSegmentsAborted) + ' "uplink segment error 0/2, aborted * segments" message(s)'
+			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+			htmleNBFailureMsg += statMsg + '\n'
+		if dropNotEnoughRBs > 0:
+			statMsg = 'eNB showed ' + str(dropNotEnoughRBs) + ' "dropping, not enough RBs" message(s)'
+			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+			htmleNBFailureMsg += statMsg + '\n'
+		if rrcSetupComplete > 0:
+			rrcMsg = nodeB_prefix + 'NB completed ' + str(rrcSetupComplete) + ' RRC Connection Setup(s)'
+			logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+			htmleNBFailureMsg += rrcMsg + '\n'
+			rrcMsg = ' -- ' + str(rrcSetupComplete) + ' were completed'
+			logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+			htmleNBFailureMsg += rrcMsg + '\n'
+		if rrcReleaseRequest > 0:
+			rrcMsg = nodeB_prefix + 'NB requested ' + str(rrcReleaseRequest) + ' RRC Connection Release(s)'
+			logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+			htmleNBFailureMsg += rrcMsg + '\n'
+		if rrcReconfigRequest > 0 or rrcReconfigComplete > 0:
+			rrcMsg = nodeB_prefix + 'NB requested ' + str(rrcReconfigRequest) + ' RRC Connection Reconfiguration(s)'
+			logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+			htmleNBFailureMsg += rrcMsg + '\n'
+			rrcMsg = ' -- ' + str(rrcReconfigComplete) + ' were completed'
+			logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+			htmleNBFailureMsg += rrcMsg + '\n'
+		if rrcReestablishRequest > 0 or rrcReestablishComplete > 0 or rrcReestablishReject > 0:
+			rrcMsg = nodeB_prefix + 'NB requested ' + str(rrcReestablishRequest) + ' RRC Connection Reestablishment(s)'
+			logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+			htmleNBFailureMsg += rrcMsg + '\n'
+			rrcMsg = ' -- ' + str(rrcReestablishComplete) + ' were completed'
+			logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+			htmleNBFailureMsg += rrcMsg + '\n'
+			rrcMsg = ' -- ' + str(rrcReestablishReject) + ' were rejected'
+			logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+			htmleNBFailureMsg += rrcMsg + '\n'
+		if self.eNBmbmsEnables[0]:
+			if mbmsRequestMsg > 0:
+				rrcMsg = 'eNB requested ' + str(mbmsRequestMsg) + ' times the RLC for MBMS USER-PLANE'
+				logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+				htmleNBFailureMsg += rrcMsg + '\n'
+		if X2HO_inNbProcedures > 0:
+			rrcMsg = 'eNB completed ' + str(X2HO_inNbProcedures) + ' X2 Handover Connection procedure(s)'
+			logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+			htmleNBFailureMsg += rrcMsg + '\n'
+		if X2HO_outNbProcedures > 0:
+			rrcMsg = 'eNB completed ' + str(X2HO_outNbProcedures) + ' X2 Handover Release procedure(s)'
+			logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+			htmleNBFailureMsg += rrcMsg + '\n'
+		if self.eNBOptions[0] != '':
+			res1 = re.search('drx_Config_present prSetup', self.eNBOptions[0])
+			if res1 is not None:
+				if cdrxActivationMessageCount > 0:
+					rrcMsg = 'eNB activated the CDRX Configuration for ' + str(cdrxActivationMessageCount) + ' time(s)'
+					logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+					htmleNBFailureMsg += rrcMsg + '\n'
+				else:
+					rrcMsg = 'eNB did NOT ACTIVATE the CDRX Configuration'
+					logging.debug('\u001B[1;37;43m ' + rrcMsg + ' \u001B[0m')
+					htmleNBFailureMsg += rrcMsg + '\n'
+		if rachCanceledProcedure > 0:
+			rachMsg = nodeB_prefix + 'NB cancelled ' + str(rachCanceledProcedure) + ' RA procedure(s)'
+			logging.debug('\u001B[1;30;43m ' + rachMsg + ' \u001B[0m')
+			htmleNBFailureMsg += rachMsg + '\n'
+		if isRRU:
+			if isSlave:
+				if slaveReceivesFrameResyncCmd:
+					rruMsg = 'Slave RRU received the RRU_frame_resynch command from RAU'
+					logging.debug('\u001B[1;30;43m ' + rruMsg + ' \u001B[0m')
+					htmleNBFailureMsg += rruMsg + '\n'
+				else:
+					rruMsg = 'Slave RRU DID NOT receive the RRU_frame_resynch command from RAU'
+					logging.debug('\u001B[1;37;41m ' + rruMsg + ' \u001B[0m')
+					htmleNBFailureMsg += rruMsg + '\n'
+					global_status = CONST.ENB_PROCESS_SLAVE_RRU_NOT_SYNCED
+		if foundSegFault:
+			logging.debug('\u001B[1;37;41m ' + nodeB_prefix + 'NB ended with a Segmentation Fault! \u001B[0m')
+			global_status = CONST.ENB_PROCESS_SEG_FAULT
+		if foundAssertion:
+			logging.debug('\u001B[1;37;41m ' + nodeB_prefix + 'NB ended with an assertion! \u001B[0m')
+			htmleNBFailureMsg += msgAssertion
+			global_status = CONST.ENB_PROCESS_ASSERTION
+		if foundRealTimeIssue:
+			logging.debug('\u001B[1;37;41m ' + nodeB_prefix + 'NB faced real time issues! \u001B[0m')
+			htmleNBFailureMsg += nodeB_prefix + 'NB faced real time issues! COUNT = '+ str(foundRealTimeIssue_cnt) +' lines\n'
+		if rlcDiscardBuffer > 0:
+			rlcMsg = nodeB_prefix + 'NB RLC discarded ' + str(rlcDiscardBuffer) + ' buffer(s)'
+			logging.debug('\u001B[1;37;41m ' + rlcMsg + ' \u001B[0m')
+			htmleNBFailureMsg += rlcMsg + '\n'
+			global_status = CONST.ENB_PROCESS_REALTIME_ISSUE
+		HTML.htmleNBFailureMsg=htmleNBFailureMsg
+		# Runtime statistics for console output and HTML
+		if runTime != '':
+			logging.debug(runTime)
+			logging.debug(userTime)
+			logging.debug(systemTime)
+			logging.debug(maxPhyMemUsage)
+			logging.debug(nbContextSwitches)
+			self.runtime_stats='<pre>'+runTime + '\n'+ userTime + '\n' + systemTime + '\n' + maxPhyMemUsage + '\n' + nbContextSwitches+'</pre>'
+		return global_status
--- a/ci-scripts/run_locally.sh
+++ b/ci-scripts/run_locally.sh
@@ -1,5 +1,6 @@
 #!/bin/bash

+set -e
 SHORT_COMMIT_SHA=$(git rev-parse --short=8 HEAD)
 COMMIT_SHA=$(git rev-parse HEAD)
 CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
@@ -12,8 +13,6 @@ if [ $# -eq 0 ]
    exit 1
 fi

-set -x
-
 # The script assumes you've build the following images:
 #
 # docker build . -f docker/Dockerfile.gNB.ubuntu -t oai-gnb
@@ -32,15 +31,15 @@ docker tag oai-nr-cuup oai-ci/oai-nr-cuup:develop-${SHORT_COMMIT_SHA}
 python3 main.py --mode=InitiateHtml --ranRepository=NONE --ranBranch=${CURRENT_BRANCH} \
    --ranCommitID=${COMMIT_SHA} --ranAllowMerge=false \
    --ranTargetBranch=NONE \
-    --XMLTestFile=xml_files/${TESTCASE} --local --datefmt="%H:%M:%S"
+    --XMLTestFile=xml_files/${TESTCASE} --local

 python3 main.py --mode=TesteNB --ranRepository=NONE --ranBranch=${CURRENT_BRANCH} \
    --ranCommitID=${COMMIT_SHA} --ranAllowMerge=false \
    --ranTargetBranch=NONE \
    --eNBSourceCodePath=${REPO_PATH} \
-    --XMLTestFile=${TESTCASE} --local --datefmt="%H:%M:%S"
+    --XMLTestFile=${TESTCASE} --local
 RET=$?

-python3 main.py --mode=FinalizeHtml --local --datefmt="%H:%M:%S"
+python3 main.py --mode=FinalizeHtml --local

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

 To run individual unit tests, start them like so:

-    python tests/analysis.py -v
    python tests/build.py -v
    python tests/cmd.py -v
    python tests/corenetwork.py -v
    python tests/deployment.py -v
    python tests/iperf-analysis.py -v
-    python tests/log-analysis.py -v
    python tests/ping-iperf.py -v
-    python tests/pull-clean-int-registry.py -v

 The logs will indicate if all tests passed. `tests/deployment.py` requires
 these images to be present:
--- a/ci-scripts/tests/analysis.py
+++ b/ci-scripts/tests/analysis.py
@@ -1,71 +0,0 @@
-import sys
-import logging
-logging.basicConfig(
-	level=logging.DEBUG,
-	stream=sys.stdout,
-	format="[%(asctime)s] %(levelname)8s: %(message)s"
-)
-import os
-import unittest
-import yaml
-
-sys.path.append('./') # to find OAI imports below
-import cls_analysis
-import cls_oai_html
-import constants
-
-class TestAnalysis(unittest.TestCase):
-	def setUp(self):
-		self.html = cls_oai_html.HTMLManagement()
-		self.html.testCaseId = "000000"
-		self.maxDiff = 10000 # to compare long files below
-
-	def test_gnb_phytest(self):
-		rtsf = "datalog_rt_stats.100.2x2.yaml"
-		l1f = "tests/analysis/gnb_phytest.success.nrL1.log"
-		macf = "tests/analysis/gnb_phytest.success.nrMAC.log"
-		status, s = cls_analysis.Analysis.analyze_rt_stats(rtsf, l1f, macf)
-		self.assertTrue(status)
-		self.assertEqual(s['Title'], "Processing Time (us) from datalog_rt_stats.100.2x2.yaml")
-		self.assertEqual(s['ColNames'], ["Metric", "Average; Max; Count", "Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)"])
-		with open(rtsf, 'r') as f:
-			rt_stats = yaml.load(f, Loader=yaml.FullLoader)
-		# check that analyze_rt_stats() picked up all Ref/DeviationThreshold values from yaml file, e.g.
-		# s['Ref']['L1 Tx processing'] == corresponding value in yaml
-		# s['DeviationThreshold']['L1 Tx processing'] == corresponding value in yaml
-		for k, v in rt_stats['Ref'].items():
-			self.assertEqual(s['Ref'][k], v)
-		for k, v in rt_stats['DeviationThreshold'].items():
-			self.assertEqual(s['DeviationThreshold'][k], v)
-		for k, v in s['Ref'].items():
-			self.assertEqual(v, rt_stats['Ref'][k])
-		for k, v in s['DeviationThreshold'].items():
-			self.assertEqual(v, rt_stats['DeviationThreshold'][k])
-		self.assertEqual(s['Data']['L1 Tx processing'], ['476', '872', '102933', '1.00'])
-		self.assertEqual(s['Data']['DLSCH encoding'], ['216', '544', '77201', '1.08'])
-		self.assertEqual(s['Data']['L1 Rx processing'], ['488', '868', '38598', '0.92'])
-		self.assertEqual(s['Data']['UL Indication'], ['1', '10', '38598', '0.76'])
-		self.assertEqual(s['Data']['Slot Indication'], ['18', '94', '128667', '1.38'])
-		self.assertEqual(s['Data']['PUSCH inner-receiver'], ['307', '530', '25730', '0.85'])
-		self.assertEqual(s['Data']['feprx'], ['169', '310', '38600', '1.12'])
-		self.assertEqual(s['Data']['feptx_ofdm (per port, half_slot)'], ['56', '88', '102933', '0.98'])
-		self.assertEqual(s['Data']['feptx_total'], ['148', '299', '102933', '1.00'])
-		# TODO this one is not found, the CI does not recover this??
-		#self.assertEqual(s['Data']['DL & UL scheduling timing'], ['17', '97', '159371', '1.14'])
-
-	def test_analze_services_no_service(self):
-		service_desc = {} # nothing to analyze
-		to_analyze = ["testserv"] # some service requested to be analyze that does not exist
-		status = cls_analysis.AnalyzeServices(self.html, service_desc, to_analyze)
-		self.assertFalse(status)
-
-	# TODO this does not work: we don't evaluate return codes yet
-	#def test_analze_service_exit_nonnull(self):
-	#	service_desc = {}
-	#	service_desc["testserv"] = {'returncode': 129, 'logfile': 'tests/log-analysis/empty.log'}
-	#	to_analyze = ["testserv"] # some service requested to be analyze that does not exist
-	#	status = cls_analysis.AnalyzeServices(self.html, service_desc, to_analyze)
-	#	self.assertFalse(status)
-
-if __name__ == '__main__':
-	unittest.main()
--- a/ci-scripts/tests/analysis/gnb_phytest.success.nrL1.log
+++ b/ci-scripts/tests/analysis/gnb_phytest.success.nrL1.log
@@ -1,37 +0,0 @@
-Blacklisted PRBs 0/273
-5.-6.-4.-4.-4.-6.-6.-6.-8.-6.-6.-4.-4.-4.-3.-6.-6.-11.-8.-8.-5.-4.-5.-4.-5.
-6.-11.-11.-8.-8.-5.-5.-4.-4.-6.-8.-11.-11.-8.-8.-6.-5.-6.-6.-8.-11.-11.-11.-8.-6.
-6.-6.-6.-11.-11.-11.-11.-11.-11.-6.-6.-6.-8.-3.-11.-11.-11.-8.-8.-6.-6.-6.-11.-11.-11.
-11.-8.-6.-5.-6.-6.-8.-11.-11.-11.-6.-6.-5.-4.-4.-5.-8.-8.-8.-6.-5.-4.-3.-3.-4.
-4.-6.-6.-5.-3.-3.-2.-2.-2.-3.-3.-4.-5.-5.-3.-2.-1.-1.-2.-5.-4.-4.-4.-3.-2.
- 0.-1.-1.-1.-2.-2.-3.-2.-1. 0. 2.-11.13. 8. 7. 6. 5. 0. 0.-1. 0. 0. 0.-1.-3.
-3.-3.-3.-1.-1.-1.-1.-1.-1.-2.-3.-1.-1.-1.-1.-2.-1.-3.-4.-5.-8.-6.-3.-3.-3.
-3.-3.-5.-8.-8.-8.-6.-4.-4.-3.-4.-6.-6.-8.-8.-8.-6.-5.-6.-5.-6.-8.-11.-11.-11.
-8.-5.-5.-8.-6.-6.-8.-11.-11.-11.-8.-6.-6.-6.-8.-11.-11.-11.-8.-8.-6.-6.-5.-5.-8.
-11.-11.-8.-11.-6.-5.-5.-5.-5.-6.-11.-11.-8.-6.-3.-4.-5.-5.-6.-8.-6.-6.-5.-4.-4.
-4.-5.-6.-6.-11.-8.-6.-4.-3.-4.-3.-4.-5.-6.-8.-6.-5.-4.-3.-4.-3.-6.-5.
-max_IO = 24 (137), min_I0 = 0 (17), avg_I0 = 11 dB(8.8.)
-PRACH I0 = 0.0 dB
-DLSCH RNTI 1234: current_Qm 6, current_RI 2, total_bytes TX -1130807110
-ULSCH RNTI 1234, 389: ulsch_power[0] 41,5 ulsch_noise_power[0] 7.8, sync_pos 0
-                  ulsch_power[1] 26.7, ulsch_noise_power[1] 7.8
-                 round_trials 6434(1.0e+00):6432(1.0e+00):6432(1.0e+00):6432, DTX 0, current_Qm 6, current_RI 1, total_bytes RX/SCHED 0/385630560
-                L1 Tx job:          401.013 us;          128667;         895.809 us;
-                L1 Rx job:          183.883 us;          128667;         980.814 us;
-         L1 Tx processing:          476.247 us;          102933;         872.099 us;
-           DLSCH encoding:          216.371 us;           77201;         544.272 us;
-         DLSCH scrambling:            5.524 us;           77201;          19.192 us;
-         DLSCH modulation:           21.137 us;           77201;          36.428 us;
-   DLSCH resource mapping:            1.127 us;         1003613;          12.027 us;
-          DLSCH precoding:            3.667 us;         1003613;          17.411 us;
-         L1 Rx processing:          488.478 us;           38598;         867.672 us;
-UL segment deinterleaving:            5.063 us;          488870;          27.005 us;
- UL segment rate recovery:           11.554 us;          488870;         517.998 us;
-     UL segments decoding:          134.035 us;          488870;         759.164 us;
-            UL Indication:            0.763 us;           38598;           9.588 us;
-          Slot Indication:           17.891 us;          128667;          94.446 us;
-     PUSCH inner-receiver:          307.193 us;           25730;         529.580 us;
-                    feprx:          169.305 us;           38600;         310.489 us;
-feptx_ofdm (per port, half_slot):           56.093 us;          102933;          88.125 us;
-              feptx_total:          147.889 us;          102933;         299.307 us;
-
--- a/ci-scripts/tests/analysis/gnb_phytest.success.nrMAC.log
+++ b/ci-scripts/tests/analysis/gnb_phytest.success.nrMAC.log
--- a/ci-scripts/tests/deployment.py
+++ b/ci-scripts/tests/deployment.py
@@ -16,6 +16,7 @@ import cls_oai_html
 import cls_oaicitest
 import cls_containerize
 from cls_ci_helper import TestCaseCtx
+import ran
 import cls_cmd

 class TestDeploymentMethods(unittest.TestCase):
@@ -38,6 +39,7 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.html.testCaseId = "000000"
 		self.ci = cls_oaicitest.OaiCiTest()
 		self.cont = cls_containerize.Containerize()
+		self.ran = ran.RANManagement()
 		self.cont.yamlPath = ''
 		self.cont.ranAllowMerge = True
 		self.cont.ranBranch = ''
@@ -54,7 +56,7 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.cont.yamlPath = 'tests/simple-dep/'
 		self.cont.deploymentTag = "noble"
 		deploy = self.cont.DeployObject(self.ctx, self.node, self.html)
-		undeploy = self.cont.UndeployObject(self.ctx, self.node, self.html, [])
+		undeploy = self.cont.UndeployObject(self.ctx, self.node, self.html, self.ran)
 		self.assertTrue(deploy)
 		self.assertTrue(undeploy)

@@ -77,7 +79,7 @@ class TestDeploymentMethods(unittest.TestCase):
 		stopB = self.cont.StopObject(self.ctx, self.node, self.html)
 		# should not undeploy anything (everything already stopped)
 		self.cont.services = None
-		undeployAll = self.cont.UndeployObject(self.ctx, self.node, self.html, [])
+		undeployAll = self.cont.UndeployObject(self.ctx, self.node, self.html, self.ran)
 		self.assertTrue(deploy)
 		self.assertFalse(stopC)
 		self.assertTrue(stopA)
@@ -90,7 +92,7 @@ class TestDeploymentMethods(unittest.TestCase):
 		old = self.cont.yamlPath
 		self.cont.yamlPath = 'tests/simple-fail/'
 		deploy = self.cont.DeployObject(self.ctx, self.node, self.html)
-		self.cont.UndeployObject(self.ctx, self.node, self.html, [])
+		self.cont.UndeployObject(self.ctx, self.node, self.html, self.ran)
 		self.assertFalse(deploy)
 		self.cont.yamlPath = old

@@ -99,7 +101,7 @@ class TestDeploymentMethods(unittest.TestCase):
 		old = self.cont.yamlPath
 		self.cont.yamlPath = 'tests/simple-fail-2svc/'
 		deploy = self.cont.DeployObject(self.ctx, self.node, self.html)
-		self.cont.UndeployObject(self.ctx, self.node, self.html, [])
+		self.cont.UndeployObject(self.ctx, self.node, self.html, self.ran)
 		self.assertFalse(deploy)
 		self.cont.yamlPath = old

@@ -108,7 +110,7 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.cont.services = "oai-gnb"
 		self.cont.deploymentTag = 'develop-12345678'
 		deploy = self.cont.DeployObject(self.ctx, self.node, self.html)
-		undeploy = self.cont.UndeployObject(self.ctx, self.node, self.html, [])
+		undeploy = self.cont.UndeployObject(self.ctx, self.node, self.html, self.ran)
 		self.assertTrue(deploy)
 		self.assertTrue(undeploy)

@@ -117,7 +119,7 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.cont.services = "oai-gnb oai-nr-ue"
 		self.cont.deploymentTag = 'develop-12345678'
 		deploy = self.cont.DeployObject(self.ctx, self.node, self.html)
-		undeploy = self.cont.UndeployObject(self.ctx, self.node, self.html, [])
+		undeploy = self.cont.UndeployObject(self.ctx, self.node, self.html, self.ran)
 		self.assertTrue(deploy)
 		self.assertTrue(undeploy)

@@ -128,7 +130,7 @@ class TestDeploymentMethods(unittest.TestCase):
 		deploy1 = self.cont.DeployObject(self.ctx, self.node, self.html)
 		self.cont.services = "oai-nr-ue"
 		deploy2 = self.cont.DeployObject(self.ctx, self.node, self.html)
-		undeploy = self.cont.UndeployObject(self.ctx, self.node, self.html, [])
+		undeploy = self.cont.UndeployObject(self.ctx, self.node, self.html, self.ran)
 		self.assertTrue(deploy1)
 		self.assertTrue(deploy2)
 		self.assertTrue(undeploy)
@@ -143,37 +145,5 @@ class TestDeploymentMethods(unittest.TestCase):
 			cmd.run(f"rm -rf {self.cont.eNBSourceCodePath}")
 		self.assertTrue(ws)

-	def test_undeploy_loganalysis(self):
-		self.cont.yamlPath = 'yaml_files/5g_rfsimulator_tdd_dora'
-		self.cont.services = "oai-gnb"
-		self.cont.deploymentTag = 'develop-12345678'
-		deploy = self.cont.DeployObject(self.ctx, self.node, self.html)
-		analyze = ["oai-gnb"]
-		undeploy = self.cont.UndeployObject(self.ctx, self.node, self.html, analyze)
-		self.assertTrue(deploy)
-		self.assertTrue(undeploy)
-
-	def test_undeploy_multi_loganalysis(self):
-		self.cont.yamlPath = 'yaml_files/5g_rfsimulator_tdd_dora'
-		self.cont.services = "oai-gnb"
-		self.cont.deploymentTag = 'develop-12345678'
-		deploy = self.cont.DeployObject(self.ctx, self.node, self.html)
-		analyze = ["oai-gnb", "oai-gnb=ContainsString=NOTFOUND"]
-		undeploy = self.cont.UndeployObject(self.ctx, self.node, self.html, analyze)
-		self.assertTrue(deploy)
-		self.assertFalse(undeploy)
-
-	# TODO this does not work: we don't evaluate return codes yet
-	#def test_undeploy_rc_nonnull(self):
-	#	# fails reliably
-	#	old = self.cont.yamlPath
-	#	self.cont.yamlPath = 'tests/simple-fail/'
-	#	deploy = self.cont.DeployObject(self.ctx, self.node, self.html)
-	#	# should be false because wrong exit code
-	#	undeploy = self.cont.UndeployObject(self.ctx, self.node, self.html, ["test"])
-	#	self.assertFalse(deploy)
-	#	self.assertFalse(undeploy)
-	#	self.cont.yamlPath = old
-
 if __name__ == '__main__':
 	unittest.main()
--- a/ci-scripts/tests/log-analysis.py
+++ b/ci-scripts/tests/log-analysis.py
@@ -1,131 +0,0 @@
-import sys
-import logging
-logging.basicConfig(
-	level=logging.DEBUG,
-	stream=sys.stdout,
-	format="[%(asctime)s] %(levelname)8s: %(message)s"
-)
-import os
-import unittest
-
-sys.path.append('./') # to find OAI imports below
-import cls_loganalysis
-
-class TestLogAnalysis(unittest.TestCase):
-    def setUp(self):
-        self.maxDiff = None
-
-    #def test_no_file(self):
-    #    f = "/total/fantasy/path/file.log"
-    #    result, _ = cls_loganalysis.Default.run(f, None)
-    #    self.assertFalse(result)
-
-    def test_no_error(self):
-        f = "tests/log-analysis/empty.log"
-        result, _ = cls_loganalysis.Default.run(f, None)
-        self.assertTrue(result)
-
-    def test_retx_check_good(self):
-        f = "tests/log-analysis/retx-check-good.log"
-        opt = "dl=1,0,0,0;ul=1,0,0,0"
-        result, log = cls_loganalysis.RetxCheck.run(f, opt)
-        expected = """UE f40a: dlsch_rounds 86/0/0/0, dlsch_errors 0, pucch0_DTX 0, BLER 0.00052 MCS (0) 0 CCE fail 3
-UE f40a: ulsch_rounds 518/0/0/0, ulsch_errors 0, ulsch_DTX 0, BLER 0.00000 MCS (0) 0 (Qm 2 deltaMCS 0 dB) NPRB 5  SNR 51.0 dB CCE fail 0"""
-        self.assertTrue(result)
-        self.assertEqual(log, expected)
-
-    def test_retx_check_good_single_val(self):
-        f = "tests/log-analysis/retx-check-good.log"
-        opt = "1,0,0,0"
-        result, log = cls_loganalysis.RetxCheck.run(f, opt)
-        expected = """UE f40a: dlsch_rounds 86/0/0/0, dlsch_errors 0, pucch0_DTX 0, BLER 0.00052 MCS (0) 0 CCE fail 3
-UE f40a: ulsch_rounds 518/0/0/0, ulsch_errors 0, ulsch_DTX 0, BLER 0.00000 MCS (0) 0 (Qm 2 deltaMCS 0 dB) NPRB 5  SNR 51.0 dB CCE fail 0"""
-        self.assertTrue(result)
-        self.assertEqual(log, expected)
-
-    def test_retx_check_good_ul_only(self):
-        f = "tests/log-analysis/retx-check-good.log"
-        opt = "ul=1,0,0,0"
-        result, log = cls_loganalysis.RetxCheck.run(f, opt)
-        expected = """UE f40a: dlsch_rounds 86/0/0/0, dlsch_errors 0, pucch0_DTX 0, BLER 0.00052 MCS (0) 0 CCE fail 3
-UE f40a: ulsch_rounds 518/0/0/0, ulsch_errors 0, ulsch_DTX 0, BLER 0.00000 MCS (0) 0 (Qm 2 deltaMCS 0 dB) NPRB 5  SNR 51.0 dB CCE fail 0"""
-        self.assertTrue(result)
-        self.assertEqual(log, expected)
-
-    def test_retx_check_bad(self):
-        f = "tests/log-analysis/retx-check-bad.log"
-        opt = "dl=10,100,100,100;ul=10,100,100,100"
-        result, log = cls_loganalysis.RetxCheck.run(f, opt)
-        expected = """UE a491: dlsch_rounds 13/1/0/0, dlsch_errors 0, pucch0_DTX 0, BLER 0.11000 MCS (0) 0 CCE fail 0
-UE a491: ulsch_rounds 23/1/0/0, ulsch_errors 0, ulsch_DTX 1, BLER 0.08447 MCS (0) 0 (Qm 2 deltaMCS 0 dB) NPRB 5  SNR 34.0 dB CCE fail 0
-UE bf9b: dlsch_rounds 370/368/368/368, dlsch_errors 368, pucch0_DTX 1377, BLER 1.00000 MCS (0) 0 CCE fail 64
-UE bf9b: ulsch_rounds 150/148/147/147, ulsch_errors 147, ulsch_DTX 589, BLER 1.00000 MCS (0) 0 (Qm 2 deltaMCS 0 dB) NPRB 104  SNR 38.0 dB CCE fail 0
-!!! Failure: UE bf9b: retx rounds DL [1] UL [1] exceeded threshold
-UE 257a: dlsch_rounds 68071/142/14/0, dlsch_errors 0, pucch0_DTX 10, BLER 0.00427 MCS (1) 25 CCE fail 0
-UE 257a: ulsch_rounds 41777/2863/10/0, ulsch_errors 0, ulsch_DTX 17, BLER 0.11456 MCS (1) 10 (Qm 4 deltaMCS 0 dB) NPRB 5  SNR 29.0 dB CCE fail 0"""
-        self.assertFalse(result)
-        self.assertEqual(log, expected)
-
-    def test_retx_check_dl_only_bad(self):
-        f = "tests/log-analysis/retx-check-bad.log"
-        opt = "dl=10,80,100,100"
-        result, log = cls_loganalysis.RetxCheck.run(f, opt)
-        expected = """UE a491: dlsch_rounds 13/1/0/0, dlsch_errors 0, pucch0_DTX 0, BLER 0.11000 MCS (0) 0 CCE fail 0
-UE a491: ulsch_rounds 23/1/0/0, ulsch_errors 0, ulsch_DTX 1, BLER 0.08447 MCS (0) 0 (Qm 2 deltaMCS 0 dB) NPRB 5  SNR 34.0 dB CCE fail 0
-UE bf9b: dlsch_rounds 370/368/368/368, dlsch_errors 368, pucch0_DTX 1377, BLER 1.00000 MCS (0) 0 CCE fail 64
-UE bf9b: ulsch_rounds 150/148/147/147, ulsch_errors 147, ulsch_DTX 589, BLER 1.00000 MCS (0) 0 (Qm 2 deltaMCS 0 dB) NPRB 104  SNR 38.0 dB CCE fail 0
-!!! Failure: UE bf9b: retx rounds DL [1, 2] exceeded threshold
-UE 257a: dlsch_rounds 68071/142/14/0, dlsch_errors 0, pucch0_DTX 10, BLER 0.00427 MCS (1) 25 CCE fail 0
-UE 257a: ulsch_rounds 41777/2863/10/0, ulsch_errors 0, ulsch_DTX 17, BLER 0.11456 MCS (1) 10 (Qm 4 deltaMCS 0 dB) NPRB 5  SNR 29.0 dB CCE fail 0"""
-        self.assertFalse(result)
-        self.assertEqual(log, expected)
-
-    def test_retx_check_ul_bad(self):
-        f = "tests/log-analysis/retx-check-bad.log"
-        opt = "dl=100,100,100,100;ul=10,100,100,100"
-        result, log = cls_loganalysis.RetxCheck.run(f, opt)
-        expected = """UE a491: dlsch_rounds 13/1/0/0, dlsch_errors 0, pucch0_DTX 0, BLER 0.11000 MCS (0) 0 CCE fail 0
-UE a491: ulsch_rounds 23/1/0/0, ulsch_errors 0, ulsch_DTX 1, BLER 0.08447 MCS (0) 0 (Qm 2 deltaMCS 0 dB) NPRB 5  SNR 34.0 dB CCE fail 0
-UE bf9b: dlsch_rounds 370/368/368/368, dlsch_errors 368, pucch0_DTX 1377, BLER 1.00000 MCS (0) 0 CCE fail 64
-UE bf9b: ulsch_rounds 150/148/147/147, ulsch_errors 147, ulsch_DTX 589, BLER 1.00000 MCS (0) 0 (Qm 2 deltaMCS 0 dB) NPRB 104  SNR 38.0 dB CCE fail 0
-!!! Failure: UE bf9b: retx rounds UL [1] exceeded threshold
-UE 257a: dlsch_rounds 68071/142/14/0, dlsch_errors 0, pucch0_DTX 10, BLER 0.00427 MCS (1) 25 CCE fail 0
-UE 257a: ulsch_rounds 41777/2863/10/0, ulsch_errors 0, ulsch_DTX 17, BLER 0.11456 MCS (1) 10 (Qm 4 deltaMCS 0 dB) NPRB 5  SNR 29.0 dB CCE fail 0"""
-        self.assertFalse(result)
-        self.assertEqual(log, expected)
-
-    def test_last_line_contains_false(self):
-        f = "tests/log-analysis/arbitrary.log"
-        opt = "Bye."
-        result, log = cls_loganalysis.LastLineContains.run(f, opt)
-        expected = f"could not find '{opt}' in last line"
-        self.assertFalse(result)
-        self.assertEqual(log, expected)
-
-    def test_last_line_contains_false(self):
-        f = "tests/log-analysis/arbitrary.log"
-        opt = "got sync"
-        result, log = cls_loganalysis.LastLineContains.run(f, opt)
-        expected = ""
-        self.assertTrue(result)
-        self.assertEqual(log, expected)
-
-    def test_ends_no_bye(self):
-        f = "tests/log-analysis/arbitrary.log"
-        opt = None
-        result, log = cls_loganalysis.EndsWithBye.run(f, opt)
-        expected = "No Bye. message found, did not stop properly"
-        self.assertFalse(result)
-        self.assertEqual(log, expected)
-
-    def test_ends_with_bye(self):
-        f = "tests/log-analysis/with-bye.log"
-        opt = None
-        result, log = cls_loganalysis.EndsWithBye.run(f, opt)
-        expected = ""
-        self.assertTrue(result)
-        self.assertEqual(log, expected)
-
-
-if __name__ == '__main__':
-	unittest.main()
--- a/ci-scripts/tests/log-analysis/arbitrary.log
+++ b/ci-scripts/tests/log-analysis/arbitrary.log
@@ -1,9 +0,0 @@
-[UTIL]   threadCreate() for L1_rx_thread: creating thread (no affinity, default priority)
-[UTIL]   threadCreate() for L1_tx_thread: creating thread (no affinity, default priority)
-[UTIL]   threadCreate() for L1_stats: creating thread (no affinity, default priority)
-TYPE <CTRL-C> TO TERMINATE
-[PHY]    got sync (ru_thread)
-[PHY]    RU 0 rf device ready
-[PHY]    RU 0 RF started cpu_meas_enabled 0
-[HW]     No connected device, generating void samples...
-[PHY]    got sync (L1_stats_thread)
--- a/ci-scripts/tests/log-analysis/empty.log
+++ b/ci-scripts/tests/log-analysis/empty.log
--- a/ci-scripts/tests/log-analysis/retx-check-bad.log
+++ b/ci-scripts/tests/log-analysis/retx-check-bad.log
@@ -1,54 +0,0 @@
-9185541.336575 [NR_RRC] I UE 1 Logical Channel DL-DCCH, Generate SecurityModeCommand (bytes 3)
-9185541.356794 [NR_RRC] A [UL] (cellID bc614e, UE ID 1 RNTI a491) Received Security Mode Complete
-9185541.357264 [NR_RRC] I UE 1: Logical Channel DL-DCCH, Generate NR UECapabilityEnquiry (bytes 8, xid 2)
-9185541.373199 [NR_RRC] A [UL] (cellID bc614e, UE ID 1 RNTI a491) Received UE capabilities
-9185541.373330 [NR_RRC] I Send message to ngap: NGAP_UE_CAPABILITIES_IND
-9185541.373356 [NR_RRC] A [DL] (cellID bc614e, UE ID 1 RNTI a491) Send DL Information Transfer [53 bytes]
-9185541.373368 [NR_RRC] I Send message to sctp: NGAP_InitialContextSetupResponse
-9185541.390034 [NR_MAC] I Frame.Slot 384.0
-UE RNTI a491 CU-UE-ID 1 in-sync PH 59 dB PCMAX 21 dBm, average RSRP -101 (4 meas)
-UE a491: CQI 2, RI 2, PMI (0,0)
-UE a491: dlsch_rounds 13/1/0/0, dlsch_errors 0, pucch0_DTX 0, BLER 0.11000 MCS (0) 0 CCE fail 0
-UE a491: ulsch_rounds 23/1/0/0, ulsch_errors 0, ulsch_DTX 1, BLER 0.08447 MCS (0) 0 (Qm 2 deltaMCS 0 dB) NPRB 5  SNR 34.0 dB CCE fail 0
-UE a491: MAC:    TX            367 RX           3664 bytes
-UE a491: LCID 1: TX            213 RX           1649 bytes
-
-9185559.310044 [NR_MAC] I Frame.Slot 128.0
-UE RNTI bf9b CU-UE-ID 1 in-sync PH 48 dB PCMAX 21 dBm
-UE bf9b: dlsch_rounds 370/368/368/368, dlsch_errors 368, pucch0_DTX 1377, BLER 1.00000 MCS (0) 0 CCE fail 64
-UE bf9b: ulsch_rounds 150/148/147/147, ulsch_errors 147, ulsch_DTX 589, BLER 1.00000 MCS (0) 0 (Qm 2 deltaMCS 0 dB) NPRB 104  SNR 38.0 dB CCE fail 0
-UE bf9b: MAC:    TX          10145 RX             82 bytes
-UE bf9b: LCID 1: TX           5283 RX             53 bytes
-
-9185582.350069 [NR_MAC] I Frame.Slot 384.0
-UE RNTI 257a CU-UE-ID 2 in-sync PH 48 dB PCMAX 21 dBm, average RSRP -83 (16 meas)
-UE 257a: CQI 15, RI 2, PMI (0,1)
-UE 257a: UL-RI 2, TPMI 0
-UE 257a: dlsch_rounds 153/1/0/0, dlsch_errors 0, pucch0_DTX 0, BLER 0.00000 MCS (1) 0 CCE fail 0
-UE 257a: ulsch_rounds 562/2/1/0, ulsch_errors 0, ulsch_DTX 3, BLER 0.00000 MCS (1) 0 (Qm 2 deltaMCS 0 dB) NPRB 5  SNR 29.5 dB CCE fail 0
-UE 257a: MAC:    TX          13416 RX          26519 bytes
-UE 257a: LCID 1: TX            523 RX           2046 bytes
-UE 257a: LCID 2: TX              0 RX              0 bytes
-UE 257a: LCID 4: TX           9800 RX           9945 bytes
-
-9185687.310202 [NR_MAC] I Frame.Slot 640.0
-UE RNTI 257a CU-UE-ID 2 in-sync PH 61 dB PCMAX 21 dBm, average RSRP -83 (16 meas)
-UE 257a: CQI 15, RI 2, PMI (0,1)
-UE 257a: UL-RI 2, TPMI 0
-UE 257a: dlsch_rounds 64992/129/13/0, dlsch_errors 0, pucch0_DTX 10, BLER 0.00242 MCS (1) 27 CCE fail 0
-UE 257a: ulsch_rounds 39328/2610/8/0, ulsch_errors 0, ulsch_DTX 14, BLER 0.11139 MCS (1) 9 (Qm 4 deltaMCS 0 dB) NPRB 273  SNR 25.5 dB CCE fail 0
-UE 257a: MAC:    TX     3344707955 RX      818603547 bytes
-UE 257a: LCID 1: TX            832 RX           4312 bytes
-UE 257a: LCID 2: TX              0 RX              0 bytes
-UE 257a: LCID 4: TX     3322610250 RX      815642955 bytes
-
-9185692.430254 [NR_MAC] I Frame.Slot 128.0
-UE RNTI 257a CU-UE-ID 2 in-sync PH 48 dB PCMAX 21 dBm, average RSRP -84 (16 meas)
-UE 257a: CQI 15, RI 2, PMI (0,1)
-UE 257a: UL-RI 2, TPMI 0
-UE 257a: dlsch_rounds 68071/142/14/0, dlsch_errors 0, pucch0_DTX 10, BLER 0.00427 MCS (1) 25 CCE fail 0
-UE 257a: ulsch_rounds 41777/2863/10/0, ulsch_errors 0, ulsch_DTX 17, BLER 0.11456 MCS (1) 10 (Qm 4 deltaMCS 0 dB) NPRB 5  SNR 29.0 dB CCE fail 0
-UE 257a: MAC:    TX     3424886787 RX      879242724 bytes
-UE 257a: LCID 1: TX            847 RX           4422 bytes
-UE 257a: LCID 2: TX              0 RX              0 bytes
-UE 257a: LCID 4: TX     3401067134 RX      875911216 bytes
--- a/ci-scripts/tests/log-analysis/retx-check-good.log
+++ b/ci-scripts/tests/log-analysis/retx-check-good.log
@@ -1,8 +0,0 @@
-7799905.793901 [NR_MAC] I Frame.Slot 256.0
-UE RNTI f40a CU-UE-ID 2 in-sync PH 48 dB PCMAX 20 dBm, average RSRP -44 (16 meas)
-UE f40a: dlsch_rounds 86/0/0/0, dlsch_errors 0, pucch0_DTX 0, BLER 0.00052 MCS (0) 0 CCE fail 3
-UE f40a: ulsch_rounds 518/0/0/0, ulsch_errors 0, ulsch_DTX 0, BLER 0.00000 MCS (0) 0 (Qm 2 deltaMCS 0 dB) NPRB 5  SNR 51.0 dB CCE fail 0
-UE f40a: MAC:    TX           3836 RX          13684 bytes
-UE f40a: LCID 1: TX            530 RX            281 bytes
-UE f40a: LCID 2: TX              3 RX             35 bytes
-UE f40a: LCID 4: TX           1886 RX           2100 bytes
--- a/ci-scripts/tests/log-analysis/with-bye.log
+++ b/ci-scripts/tests/log-analysis/with-bye.log
@@ -1,3 +0,0 @@
-Some other logs
-Bye.
-process exited.
--- a/ci-scripts/xml_class_list.yml
+++ b/ci-scripts/xml_class_list.yml
@@ -24,7 +24,8 @@
  - Undeploy_Object
  - Cppcheck_Analysis
  - Deploy_Run_OC_PhySim
-  - Build_Deploy_PhySim
+  - Build_Deploy_Docker_PhySim
+  - Build_Deploy_Source_PhySim
  - LicenceAndFormattingCheck
  - Push_Local_Registry
  - Pull_Local_Registry
@@ -32,5 +33,3 @@
  - Custom_Command
  - Custom_Script
  - Create_Workspace
-  - AnalyzeRTStats
-  - AnalyzeRTStats_Object
--- a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml
+++ b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml
@@ -129,9 +129,6 @@
    <node>localhost</node>
    <desc>Undeploy all OAI 4G stack</desc>
    <yaml_path>ci-scripts/yaml_files/4g_l2sim_fdd</yaml_path>
-    <analysis>
-      <services>oai_enb=EndsWithBye oai_ue1</services>
-    </analysis>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
@@ -147,9 +147,6 @@
    <desc>Undeploy all OAI 4G stack</desc>
    <node>localhost</node>
    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
-    <analysis>
-      <services>oai_enb0=EndsWithBye oai_ue0</services>
-    </analysis>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
@@ -118,9 +118,6 @@
    <desc>Undeploy all OAI 4G stack</desc>
    <node>localhost</node>
    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1</yaml_path>
-    <analysis>
-      <services>oai_enb0=EndsWithBye oai_ue0</services>
-    </analysis>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
@@ -147,9 +147,6 @@
    <desc>Undeploy all OAI 4G stack</desc>
    <node>localhost</node>
    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
-    <analysis>
-      <services>oai_enb0=EndsWithBye oai_ue0</services>
-    </analysis>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
@@ -147,9 +147,6 @@
    <desc>Undeploy all OAI 4G stack</desc>
    <node>localhost</node>
    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
-    <analysis>
-      <services>oai_enb0=EndsWithBye oai_ue0</services>
-    </analysis>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_4g_rfsim_fembms.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fembms.xml
@@ -84,9 +84,6 @@
    <desc>Undeploy all OAI 4G stack</desc>
    <node>localhost</node>
    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fembms</yaml_path>
-    <analysis>
-      <services>oai_enb0=EndsWithBye oai_ue0</services>
-    </analysis>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_4g_rfsim_mbms.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_mbms.xml
@@ -84,9 +84,6 @@
    <desc>Undeploy all OAI 4G stack</desc>
    <node>localhost</node>
    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_mbms</yaml_path>
-    <analysis>
-      <services>oai_enb0=EndsWithBye oai_ue0</services>
-    </analysis>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
@@ -146,9 +146,6 @@
    <desc>Undeploy all OAI 4G stack</desc>
    <node>localhost</node>
    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
-    <analysis>
-      <services>oai_enb0=EndsWithBye oai_ue0</services>
-    </analysis>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_5g_e1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_e1_rfsim.xml
@@ -86,9 +86,8 @@
    <node>localhost</node>
    <desc>Undeploy all OAI 5G stack</desc>
    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_e1</yaml_path>
-    <analysis>
-      <services>oai-cucp=EndsWithBye oai-cuup=EndsWithBye oai-cuup2=EndsWithBye oai-cuup3=EndsWithBye oai-du=RetxCheck=1,0,0,0 oai-du=EndsWithBye oai-du2=RetxCheck=1,0,0,0 oai-du2=EndsWithBye oai-du3=RetxCheck=1,0,0,0 oai-du3=EndsWithBye oai-nr-ue oai-nr-ue2 oai-nr-ue3</services>
-    </analysis>
+    <d_retx_th>1,0,0,0</d_retx_th>
+    <u_retx_th>1,0,0,0</u_retx_th>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
@@ -240,7 +240,7 @@
    <class>Custom_Command</class>
    <desc>UE (1) connected to DU-PCI 1?</desc>
    <node>localhost</node>
-    <command>echo ci fetch_du_by_ue_id | ncat 192.168.71.150 9090 | grep "3585"</command>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3585"</command>
  </testCase>

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

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

  <testCase>
@@ -311,9 +311,8 @@
    <desc>Undeploy all OAI 5G stack</desc>
    <node>localhost</node>
    <yaml_path>ci-scripts/yaml_files/5g_f1_rfsimulator</yaml_path>
-    <analysis>
-      <services>oai-cu=EndsWithBye oai-du-pci0=RetxCheck=30,100,100,100 oai-du-pci0=EndsWithBye oai-du-pci1=RetxCheck=30,100,100,100 oai-du-pci1=EndsWithBye oai-nr-ue</services>
-    </analysis>
+    <d_retx_th>30,100,100,100</d_retx_th>
+    <u_retx_th>30,100,100,100</u_retx_th>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
@@ -113,9 +113,8 @@
    <desc>Undeploy all OAI 5G stack</desc>
    <node>localhost</node>
    <yaml_path>ci-scripts/yaml_files/5g_fdd_rfsimulator</yaml_path>
-    <analysis>
-      <services>oai-gnb=EndsWithBye oai-nr-ue</services>
-    </analysis>
+    <d_retx_th>1,0,0,0</d_retx_th>
+    <u_retx_th>1,0,0,0</u_retx_th>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_5g_flexric_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_flexric_rfsim.xml
@@ -197,14 +197,6 @@
    <node>localhost</node>
    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
    <always_exec>true</always_exec>
-    <analysis>
-      <service>nearRT-RIC=LastLineContains=Removing E2 Node</service>
-      <service>xapp-rc-moni=LastLineContains=Test xApp run SUCCESSFULLY</service>
-      <service>xapp-kpm-moni=LastLineContains=Test xApp run SUCCESSFULLY</service>
-      <service>xapp-kpm-rc=LastLineContains=Test xApp run SUCCESSFULLY</service>
-      <service>xapp-gtp-mac-rlc-pdcp-moni=LastLineContains=Test xApp run SUCCESSFULLY</service>
-      <services>oai-gnb=EndsWithBye oai-nr-ue oai-nr-ue2</services>
-    </analysis>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim.xml
@@ -243,9 +243,8 @@
    <desc>Undeploy all OAI 5G stack</desc>
    <node>localhost</node>
    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
-    <analysis>
-      <services>oai-gnb=RetxCheck=1,0,0,0 oai-gnb=EndsWithBye oai-nr-ue oai-nr-ue2 oai-nr-ue3 oai-nr-ue4 oai-nr-ue5 oai-nr-ue6 oai-nr-ue7 oai-nr-ue8 oai-nr-ue9 oai-nr-ue10</services>
-    </analysis>
+    <d_retx_th>1,0,0,0</d_retx_th>
+    <u_retx_th>1,0,0,0</u_retx_th>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
@@ -257,9 +257,6 @@
    <desc>Undeploy all OAI 5G stack</desc>
    <node>localhost</node>
    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_24prb</yaml_path>
-    <analysis>
-      <services>oai-gnb=EndsWithBye oai-nr-ue</services>
-    </analysis>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
@@ -113,9 +113,8 @@
    <desc>Undeploy all OAI 5G stack</desc>
    <node>localhost</node>
    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_2x2</yaml_path>
-    <analysis>
-      <services>oai-gnb=RetxCheck=1,0,0,0 oai-gnb=EndsWithBye oai-nr-ue</services>
-    </analysis>
+    <d_retx_th>1,0,0,0</d_retx_th>
+    <u_retx_th>1,0,0,0</u_retx_th>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
@@ -113,9 +113,8 @@
    <desc>Undeploy all OAI 5G stack</desc>
    <node>localhost</node>
    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest</yaml_path>
-    <analysis>
-      <services>oai-gnb=RetxCheck=10,100,100,100 oai-gnb=EndsWithBye oai-nr-ue</services>
-    </analysis>
+    <d_retx_th>10,100,100,100</d_retx_th>
+    <u_retx_th>10,100,100,100</u_retx_th>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_fr2_66prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fr2_66prb.xml
@@ -89,9 +89,8 @@
    <desc>Undeploy all OAI 5G stack</desc>
    <node>localhost</node>
    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_66prb</yaml_path>
-    <analysis>
-      <services>oai-gnb=RetxCheck=10,0,0,0 oai-gnb=EndsWithBye oai-nr-ue</services>
-    </analysis>
+    <d_retx_th>10,0,0,0</d_retx_th>
+    <u_retx_th>10,0,0,0</u_retx_th>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_multiue.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_multiue.xml
@@ -159,11 +159,10 @@
    <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_rfsimulator_multiue</yaml_path>
-    <analysis>
-      <services>oai-gnb=RetxCheck=1,0,0,0 oai-gnb=EndsWithBye oai-nr-ue</services>
-    </analysis>
+    <d_retx_th>1,0,0,0</d_retx_th>
+    <u_retx_th>1,0,0,0</u_retx_th>
+    <node>localhost</node>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml
@@ -120,7 +120,7 @@
    <class>Custom_Command</class>
    <desc>UE (1) connected to DU-PCI 1?</desc>
    <node>localhost</node>
-    <command>echo ci fetch_du_by_ue_id | ncat 192.168.71.180 9090 | grep "1234"</command>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.180 9090 | grep "1234"</command>
  </testCase>

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

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

  <testCase>
@@ -227,9 +227,8 @@
    <desc>Undeploy all OAI 5G stack</desc>
    <node>localhost</node>
    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
-    <analysis>
-      <services>oai-cucp-0=EndsWithBye oai-cuup-0=EndsWithBye oai-du-0=RetxCheck=10,100,100,100 oai-du-0=EndsWithBye oai-nr-ue oai-cucp-1=EndsWithBye oai-cuup-1=EndsWithBye oai-du-1=RetxCheck=10,100,100,100 oai-du-1=EndsWithBye oai-nr-ue</services>
-    </analysis>
+    <d_retx_th>10,100,100,100</d_retx_th>
+    <u_retx_th>10,100,100,100</u_retx_th>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml
@@ -138,9 +138,6 @@
    <desc>Undeploy all OAI 5G stack</desc>
    <node>localhost</node>
    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
-    <analysis>
-      <services>oai-gnb=EndsWithBye oai-nr-ue</services>
-    </analysis>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_ntn_leo.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_ntn_leo.xml
@@ -138,9 +138,6 @@
    <desc>Undeploy all OAI 5G stack</desc>
    <node>localhost</node>
    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_leo</yaml_path>
-    <analysis>
-      <services>oai-gnb=EndsWithBye oai-nr-ue</services>
-    </analysis>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_prs.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_prs.xml
@@ -74,9 +74,8 @@
    <desc>Undeploy all OAI 5G stack</desc>
    <node>localhost</node>
    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_prs</yaml_path>
-    <analysis>
-      <services>oai-gnb=RetxCheck=30,100,100,100 oai-gnb=EndsWithBye oai-nr-ue</services>
-    </analysis>
+    <d_retx_th>30,100,100,100</d_retx_th>
+    <u_retx_th>30,100,100,100</u_retx_th>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_sidelink.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_sidelink.xml
@@ -60,16 +60,21 @@
    <idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
  </testCase>

+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Check that UE synched</desc>
+    <node>localhost</node>
+    <command>docker logs rfsim5g-oai-nr-ue-2 | grep -m 1 "PSBCH RX:OK"</command>
+  </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_rfsimulator_sidelink</yaml_path>
-    <analysis>
-      <services>oai-nr-ue-1</services>
-      <service>oai-nr-ue-2=ContainsString=PSBCH RX:OK</service>
-    </analysis>
+    <d_retx_th>1,0,0,0</d_retx_th>
+    <u_retx_th>1,0,0,0</u_retx_th>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_simple.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_simple.xml
@@ -80,9 +80,8 @@
    <desc>Undeploy all OAI 5G stack</desc>
    <node>localhost</node>
    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
-    <analysis>
-      <services>oai-gnb=RetxCheck=1,0,0,0 oai-gnb=EndsWithBye oai-nr-ue oai-nr-ue2 oai-nr-ue3 oai-nr-ue4 oai-nr-ue5 oai-nr-ue6 oai-nr-ue7 oai-nr-ue8 oai-nr-ue9 oai-nr-ue10</services>
-    </analysis>
+    <d_retx_th>1,0,0,0</d_retx_th>
+    <u_retx_th>1,0,0,0</u_retx_th>
  </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
@@ -95,9 +95,8 @@
    <desc>Undeploy all OAI 5G stack</desc>
    <node>localhost</node>
    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_tdd_dora</yaml_path>
-    <analysis>
-      <services>oai-gnb=RetxCheck=0,0,0,0 oai-gnb=EndsWithBye oai-nr-ue</services>
-    </analysis>
+    <d_retx_th>0,0,0,0</d_retx_th>
+    <u_retx_th>0,0,0,0</u_retx_th>
  </testCase>

  <testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
@@ -174,9 +174,8 @@
    <desc>Undeploy all OAI 5G stack</desc>
    <node>localhost</node>
    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-    <analysis>
-      <services>oai-vnf=RetxCheck=0,0,0,0 oai-vnf=EndsWithBye oai-pnf=EndsWithBye oai-nr-ue</services>
-    </analysis>
+    <d_retx_th>1,0,0,0</d_retx_th>
+    <u_retx_th>1,0,0,0</u_retx_th>
  </testCase>

  <testCase>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
francescomani	269955aa7c	assertion in case sn_FieldLength is absent at setup	2026-01-27 11:47:35 +01:00
francescomani	89ba38bcb7	improve handling of integrityProtAlgorithm, including rejecting the scenario where it is not present	2026-01-27 09:45:48 +01:00
francescomani	3c5f3a9076	fix potential segfaults according to issue #1049	2026-01-26 17:43:35 +01:00